From bcf57c4173f6f7dd34c01e1e3ba606c753c937cd Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 24 Feb 2015 13:40:13 -0600 Subject: [PATCH 01/18] Build the project using Maven This introduces a pom.xml which tells Maven how the project is structured. To avoid a boatload of disruptive renames, we override some of Maven's default settings. It also removes the Ant build files to avoid maintaining multiple build systems. --- .gitignore | 4 +++ README-FIRST.txt | 2 -- README-build.html | 61 ---------------------------------- build.xml | 59 --------------------------------- pom.xml | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 122 deletions(-) create mode 100644 .gitignore delete mode 100644 README-build.html delete mode 100644 build.xml create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..10d81e8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/.classpath +/.project +/.settings/ +/target/ diff --git a/README-FIRST.txt b/README-FIRST.txt index a687e9b..c78aba2 100644 --- a/README-FIRST.txt +++ b/README-FIRST.txt @@ -8,5 +8,3 @@ The source code license information for this project is in LICENSE.txt Additional information and license restrictions for third party source code are found in the THIRDPARTY-LICENSE-*.txt files. - -Instructions for building this project are in README-build.html diff --git a/README-build.html b/README-build.html deleted file mode 100644 index 7d7e663..0000000 --- a/README-build.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - README-build: build instructions for the j3d-core-utils project - - -

Building -j3d-core-utils

-

The j3d-core-utils project is built as part of the j3d-core -project. See the README-build.html -file in the "j3d-core" directory for instructions.
-

- - diff --git a/build.xml b/build.xml deleted file mode 100644 index bd4608f..0000000 --- a/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - NOTE: You must run ant from the j3d-core directory - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..463ab7f --- /dev/null +++ b/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + com.github.hharrison + j3dutils + 1.6.0-SNAPSHOT + + + + GPLv2 + http://www.gnu.org/licenses/gpl-2.0.txt + repo + + + + + + hharrison + Harvey Harrison + https://github.com/hharrison + + + + + 2.3.0 + + + UTF-8 + UTF-8 + + + + + ${project.groupId} + j3dcore + ${project.version} + + + ${project.groupId} + vecmath + ${project.version} + + + + + install + + ${basedir}/src/classes/share + + + ${project.basedir}/src/classes/share + + **/*.java + **/package.html + + + + + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + maven-jar-plugin + 2.5 + + + + true + + + + + + + + From bdd3399d39918799f6611da01c35a6e41a1332bd Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 14:06:18 -0500 Subject: [PATCH 02/18] Change the groupId to org.scijava This change is only for the lifetime of the SciJava fork; I am really hoping the Mavenization will be merged upstream. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 463ab7f..7b77cdc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.github.hharrison + org.scijava j3dutils 1.6.0-SNAPSHOT From d0dbfb4c8104076606a893007055b59907d30fa0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 14:32:45 -0500 Subject: [PATCH 03/18] Add a README explaining this fork --- README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..356075e --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +# Java 3D Utils + +This is a Mavenized version of the latest +[Java 3D](https://en.wikipedia.org/wiki/Java_3D) `j3dutils` component, +[built on JOGL 2.3](http://forum.jogamp.org/Java3D-now-works-with-JOGL-2-0-td3732206.html). + +## Project status + +This is a temporary fork, until the upstream project accepts +[hharrison/java3d-utils#2](https://github.com/hharrison/java3d-utils/pull/2) and +[follow-up patches](https://github.com/hharrison/java3d-utils/compare/master...ctrueden:maven). + +## How to use it + +To use from your Maven project, add the following dependency to your POM: + +```xml + + org.scijava + j3dutils + 1.6.0-scijava-1 + +``` + +## See also + +* https://github.com/scijava/java3d-core +* https://github.com/scijava/vecmath From 098f0532f6e439d9411ddcbb7d36fe4c746dab19 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 14:49:11 -0500 Subject: [PATCH 04/18] Add profile for deploying to OSS Sonatype --- pom.xml | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pom.xml b/pom.xml index 7b77cdc..a1f0769 100644 --- a/pom.xml +++ b/pom.xml @@ -80,4 +80,88 @@ + + + + sonatype-oss-release + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.2 + true + + sonatype-nexus-releases + https://oss.sonatype.org/ + true + 15 + 12 + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + 2.8.1 + + true + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + true + + + + maven-release-plugin + 2.5 + + + org.apache.maven.plugins + maven-source-plugin + 2.3 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + + + From 213699e97e1b72daa29c346ca8f82a964a1f64aa Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 15:01:46 -0500 Subject: [PATCH 05/18] Add numbered 'scijava' suffix to the version This hopefully avoids any possible confusion with official versions. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1f0769..04d43a5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.scijava j3dutils - 1.6.0-SNAPSHOT + 1.6.0-scijava-1-SNAPSHOT From 35966fd81e0ef4b9917de57bbdba87f1e370cfd1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 15:06:20 -0500 Subject: [PATCH 06/18] Add SCM section --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 04d43a5..a2cc27f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,13 @@ + + scm:git:git://github.com/scijava/java3d-utils + scm:git:git@github.com:scijava/java3d-utils + HEAD + https://github.com/scijava/java3d-utils + + 2.3.0 From e5ed1285d3e6c780e5f611d61015f282c6edd7d8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 16:31:14 -0500 Subject: [PATCH 07/18] Add project name, description and URL These sections are required for OSS Sonatype. --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index a2cc27f..a30ba3f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,10 @@ j3dutils 1.6.0-scijava-1-SNAPSHOT + Java 3D Utils + Utility functions for the Java 3D Graphics API + https://github.com/scijava/java3d-utils + GPLv2 From 99445c68a3f667de51ff7e0c8b98ccac6d2c8874 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 20:21:40 -0500 Subject: [PATCH 08/18] Explicitly pin to release versions Unfortunately, the maven-release-plugin does not seem to like the soft ${project.version} references, since they appear to be SNAPSHOTs until after the project version is actually bumped to the release version. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a30ba3f..7fa40ce 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ ${project.groupId} j3dcore - ${project.version} + 1.6.0-scijava-1 ${project.groupId} vecmath - ${project.version} + 1.6.0-scijava-1 From 0eed84009fcd9a037dbea4d9a925645872629455 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Oct 2015 20:25:01 -0500 Subject: [PATCH 09/18] Bump to next development cycle Signed-off-by: Jenkins --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7fa40ce..87b3939 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.scijava j3dutils - 1.6.0-scijava-1-SNAPSHOT + 1.6.0-scijava-2-SNAPSHOT Java 3D Utils Utility functions for the Java 3D Graphics API From 09b0d3dc731d9d38683fbc5817cc970ea10dd036 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 18 Nov 2015 10:05:41 -0600 Subject: [PATCH 10/18] POM: bump JOGL version to 2.3.2 --- README.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 356075e..39d33eb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is a Mavenized version of the latest [Java 3D](https://en.wikipedia.org/wiki/Java_3D) `j3dutils` component, -[built on JOGL 2.3](http://forum.jogamp.org/Java3D-now-works-with-JOGL-2-0-td3732206.html). +[built on JOGL 2.3.2](http://forum.jogamp.org/Java3D-now-works-with-JOGL-2-0-td3732206.html). ## Project status diff --git a/pom.xml b/pom.xml index 87b3939..bf91bb0 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ - 2.3.0 + 2.3.2 UTF-8 From 34ba665da3638cd6d88f4fd1ee5cd20553d57641 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 18 Nov 2015 10:10:33 -0600 Subject: [PATCH 11/18] POM: fix license Unlike vecmath and j3dcore, j3dutils is not licensed under the GPLv2 + Classpath exception, but rather a BSD 2-clause license. --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bf91bb0..8ecf0d3 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,7 @@ - GPLv2 - http://www.gnu.org/licenses/gpl-2.0.txt + Simplified BSD License repo From 5b3d49907ec578b55d6095f724358d83911250d9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 18 Nov 2015 11:42:32 -0600 Subject: [PATCH 12/18] Update vecmath and j3dcore to 1.6.0-scijava-2 This version has renamed package prefixes: * javax.vecmath -> org.scijava.vecmath * javax.media.j3d -> org.scijava.java3d For a rationale, see: * https://github.com/scijava/vecmath/commit/f9291bcac1ad02ea7fde6698116280818e0928c1 * https://github.com/scijava/java3d-core/commit/925def36f84207ed78c9557522688f89dae3ec9e --- pom.xml | 4 +- ...ice => org.scijava.java3d.GeometryService} | 0 .../com/sun/j3d/audioengines/AudioEngine.java | 6 +- .../sun/j3d/audioengines/AudioEngine3D.java | 14 +- .../sun/j3d/audioengines/AudioEngine3DL2.java | 8 +- .../com/sun/j3d/audioengines/Sample.java | 16 +- .../javasound/JSDirectionalSample.java | 4 +- .../javasound/JSPositionalSample.java | 12 +- .../j3d/audioengines/javasound/JSSample.java | 4 +- .../javasound/JavaSoundMixer.java | 14 +- .../com/sun/j3d/exp/swing/JCanvas3D.java | 8 +- .../exp/swing/impl/AutoOffScreenCanvas3D.java | 2 +- .../com/sun/j3d/internal/BufferWrapper.java | 2 +- .../sun/j3d/internal/ByteBufferWrapper.java | 4 +- .../share/com/sun/j3d/internal/Distance.java | 4 +- .../sun/j3d/internal/DoubleBufferWrapper.java | 4 +- .../sun/j3d/internal/FloatBufferWrapper.java | 6 +- .../share/com/sun/j3d/loaders/Scene.java | 14 +- .../share/com/sun/j3d/loaders/SceneBase.java | 14 +- .../loaders/lw3d/FloatValueInterpolator.java | 4 +- .../sun/j3d/loaders/lw3d/J3dLwoParser.java | 32 ++-- .../lw3d/LightIntensityPathInterpolator.java | 2 +- .../com/sun/j3d/loaders/lw3d/Lw3dLoader.java | 18 +- .../sun/j3d/loaders/lw3d/LwLightObject.java | 4 +- .../com/sun/j3d/loaders/lw3d/LwoSurface.java | 4 +- .../com/sun/j3d/loaders/lw3d/LwoTexture.java | 8 +- .../sun/j3d/loaders/lw3d/LwsBackground.java | 8 +- .../com/sun/j3d/loaders/lw3d/LwsCamera.java | 8 +- .../com/sun/j3d/loaders/lw3d/LwsEnvelope.java | 4 +- .../lw3d/LwsEnvelopeLightIntensity.java | 10 +- .../com/sun/j3d/loaders/lw3d/LwsFog.java | 10 +- .../com/sun/j3d/loaders/lw3d/LwsFrame.java | 6 +- .../com/sun/j3d/loaders/lw3d/LwsLight.java | 26 +-- .../com/sun/j3d/loaders/lw3d/LwsMotion.java | 18 +- .../com/sun/j3d/loaders/lw3d/LwsObject.java | 14 +- .../sun/j3d/loaders/lw3d/LwsPrimitive.java | 2 +- .../sun/j3d/loaders/lw3d/SequenceLine.java | 22 +-- .../sun/j3d/loaders/lw3d/SequenceReader.java | 10 +- .../com/sun/j3d/loaders/lw3d/ShapeHolder.java | 2 +- .../loaders/lw3d/SwitchPathInterpolator.java | 4 +- .../j3d/loaders/objectfile/ObjectFile.java | 10 +- .../objectfile/ObjectFileMaterials.java | 16 +- .../j3d/utils/audio/DistanceAttenuation.java | 4 +- .../interpolators/CubicSplineSegment.java | 6 +- .../interpolators/KBCubicSplineSegment.java | 4 +- .../behaviors/interpolators/KBKeyFrame.java | 2 +- .../KBRotPosScaleSplinePathInterpolator.java | 18 +- .../KBSplinePathInterpolator.java | 14 +- .../RotPosScaleTCBSplinePathInterpolator.java | 22 +-- .../behaviors/interpolators/TCBKeyFrame.java | 4 +- .../TCBSplinePathInterpolator.java | 14 +- .../behaviors/keyboard/KeyNavigator.java | 12 +- .../keyboard/KeyNavigatorBehavior.java | 16 +- .../utils/behaviors/mouse/MouseBehavior.java | 14 +- .../mouse/MouseBehaviorCallback.java | 2 +- .../utils/behaviors/mouse/MouseRotate.java | 14 +- .../utils/behaviors/mouse/MouseTranslate.java | 12 +- .../utils/behaviors/mouse/MouseWheelZoom.java | 12 +- .../j3d/utils/behaviors/mouse/MouseZoom.java | 12 +- .../utils/behaviors/picking/Intersect.java | 14 +- .../behaviors/picking/PickMouseBehavior.java | 16 +- .../utils/behaviors/picking/PickObject.java | 32 ++-- .../behaviors/picking/PickRotateBehavior.java | 10 +- .../picking/PickTranslateBehavior.java | 10 +- .../behaviors/picking/PickZoomBehavior.java | 10 +- .../behaviors/picking/PickingCallback.java | 2 +- .../sensor/Mouse6DPointerBehavior.java | 18 +- .../behaviors/sensor/SensorBeamEcho.java | 22 +-- .../utils/behaviors/sensor/SensorEvent.java | 4 +- .../behaviors/sensor/SensorEventAgent.java | 4 +- .../behaviors/sensor/SensorGnomonEcho.java | 18 +- .../j3d/utils/behaviors/vp/OrbitBehavior.java | 10 +- .../behaviors/vp/ViewPlatformAWTBehavior.java | 10 +- .../behaviors/vp/ViewPlatformBehavior.java | 6 +- .../utils/behaviors/vp/WandViewBehavior.java | 40 ++-- .../compression/CompressedGeometryFile.java | 6 +- .../utils/compression/CompressionStream.java | 56 +++--- .../compression/CompressionStreamColor.java | 4 +- .../compression/CompressionStreamNormal.java | 2 +- .../compression/CompressionStreamVertex.java | 8 +- .../utils/compression/GeometryCompressor.java | 6 +- .../sun/j3d/utils/compression/MeshBuffer.java | 8 +- .../com/sun/j3d/utils/geometry/Basic.java | 4 +- .../share/com/sun/j3d/utils/geometry/Box.java | 10 +- .../com/sun/j3d/utils/geometry/Clean.java | 2 +- .../com/sun/j3d/utils/geometry/ColorCube.java | 4 +- .../com/sun/j3d/utils/geometry/Cone.java | 8 +- .../com/sun/j3d/utils/geometry/Cylinder.java | 8 +- .../com/sun/j3d/utils/geometry/Desperate.java | 2 +- .../sun/j3d/utils/geometry/GeomBuffer.java | 18 +- .../sun/j3d/utils/geometry/GeometryInfo.java | 72 ++++---- .../utils/geometry/GeometryInfoGenerator.java | 46 ++--- .../utils/geometry/GeometryServiceImpl.java | 6 +- .../j3d/utils/geometry/NormalGenerator.java | 4 +- .../com/sun/j3d/utils/geometry/Numerics.java | 4 +- .../com/sun/j3d/utils/geometry/Primitive.java | 10 +- .../com/sun/j3d/utils/geometry/Project.java | 8 +- .../com/sun/j3d/utils/geometry/Simple.java | 2 +- .../com/sun/j3d/utils/geometry/Sphere.java | 14 +- .../sun/j3d/utils/geometry/Stripifier.java | 6 +- .../com/sun/j3d/utils/geometry/Text2D.java | 24 +-- .../sun/j3d/utils/geometry/Triangulator.java | 6 +- .../compression/CompressedGeometryData.java | 8 +- .../compression/CompressedGeometryFile.java | 2 +- .../CompressedGeometryRetained.java | 2 +- .../compression/CompressionStream.java | 54 +++--- .../compression/CompressionStreamColor.java | 4 +- .../compression/CompressionStreamNormal.java | 2 +- .../compression/CompressionStreamVertex.java | 8 +- .../compression/GeneralizedVertexList.java | 22 +-- .../compression/GeometryCompressor.java | 2 +- .../compression/GeometryDecompressor.java | 8 +- .../GeometryDecompressorShape3D.java | 26 +-- .../geometry/compression/MeshBuffer.java | 8 +- .../utils/geometry/compression/package.html | 2 +- .../sun/j3d/utils/image/TextureLoader.java | 10 +- .../sun/j3d/utils/pickfast/PickCanvas.java | 22 +-- .../j3d/utils/pickfast/PickIntersection.java | 22 +-- .../com/sun/j3d/utils/pickfast/PickTool.java | 46 ++--- .../pickfast/behaviors/PickMouseBehavior.java | 16 +- .../behaviors/PickRotateBehavior.java | 12 +- .../behaviors/PickTranslateBehavior.java | 12 +- .../pickfast/behaviors/PickZoomBehavior.java | 12 +- .../pickfast/behaviors/PickingCallback.java | 2 +- .../com/sun/j3d/utils/picking/PickCanvas.java | 22 +-- .../j3d/utils/picking/PickIntersection.java | 26 +-- .../com/sun/j3d/utils/picking/PickResult.java | 102 +++++------ .../com/sun/j3d/utils/picking/PickTool.java | 46 ++--- .../picking/behaviors/PickMouseBehavior.java | 16 +- .../picking/behaviors/PickRotateBehavior.java | 10 +- .../behaviors/PickTranslateBehavior.java | 10 +- .../picking/behaviors/PickZoomBehavior.java | 10 +- .../picking/behaviors/PickingCallback.java | 2 +- .../scenegraph/io/SceneGraphFileReader.java | 6 +- .../scenegraph/io/SceneGraphFileWriter.java | 4 +- .../io/SceneGraphObjectReferenceControl.java | 4 +- .../scenegraph/io/SceneGraphStreamReader.java | 4 +- .../scenegraph/io/SceneGraphStreamWriter.java | 4 +- .../scenegraph/io/UnresolvedBehavior.java | 2 +- .../io/doc-files/extensibility.html | 6 +- .../scenegraph/io/retained/Controller.java | 172 +++++++++--------- .../io/retained/RandomAccessFileControl.java | 6 +- .../scenegraph/io/retained/StreamControl.java | 4 +- .../scenegraph/io/retained/SymbolTable.java | 12 +- .../io/retained/SymbolTableData.java | 2 +- ...otPosScaleSplinePathInterpolatorState.java | 10 +- ...osScaleTCBSplinePathInterpolatorState.java | 10 +- .../behaviors/mouse/MouseBehaviorState.java | 2 +- .../com/sun/j3d/utils/geometry/BoxState.java | 6 +- .../j3d/utils/geometry/ColorCubeState.java | 6 +- .../com/sun/j3d/utils/geometry/ConeState.java | 6 +- .../sun/j3d/utils/geometry/CylinderState.java | 6 +- .../sun/j3d/utils/geometry/SphereState.java | 8 +- .../sun/j3d/utils/geometry/Text2DState.java | 8 +- .../j3d/utils/image/ImageComponent2DURL.java | 2 +- .../utils/image/ImageComponent2DURLState.java | 4 +- .../utils/universe/PlatformGeometryState.java | 2 +- .../utils/universe/SimpleUniverseState.java | 18 +- .../j3d/utils/universe/ViewerAvatarState.java | 2 +- .../io/state/javax/media/j3d/AlphaState.java | 4 +- .../media/j3d/AlternateAppearanceState.java | 10 +- .../javax/media/j3d/AmbientLightState.java | 4 +- .../javax/media/j3d/AppearanceState.java | 26 +-- .../javax/media/j3d/AuralAttributesState.java | 4 +- .../javax/media/j3d/BackgroundSoundState.java | 4 +- .../javax/media/j3d/BackgroundState.java | 12 +- .../state/javax/media/j3d/BehaviorState.java | 6 +- .../state/javax/media/j3d/BillboardState.java | 10 +- .../javax/media/j3d/BoundingLeafState.java | 4 +- .../javax/media/j3d/BranchGroupState.java | 4 +- .../io/state/javax/media/j3d/ClipState.java | 4 +- .../media/j3d/ColorInterpolatorState.java | 12 +- .../media/j3d/ColoringAttributesState.java | 6 +- .../media/j3d/CompressedGeometryState.java | 8 +- .../state/javax/media/j3d/ConeSoundState.java | 6 +- .../javax/media/j3d/DecalGroupState.java | 4 +- .../media/j3d/DepthComponentFloatState.java | 6 +- .../media/j3d/DepthComponentIntState.java | 6 +- .../media/j3d/DepthComponentNativeState.java | 6 +- .../media/j3d/DirectionalLightState.java | 6 +- .../javax/media/j3d/DistanceLODState.java | 8 +- .../javax/media/j3d/ExponentialFogState.java | 4 +- .../io/state/javax/media/j3d/FogState.java | 8 +- .../io/state/javax/media/j3d/Font3DState.java | 6 +- .../javax/media/j3d/GeometryArrayState.java | 26 +-- .../media/j3d/GeometryStripArrayState.java | 2 +- .../io/state/javax/media/j3d/GroupState.java | 6 +- .../media/j3d/ImageComponent2DState.java | 6 +- .../media/j3d/ImageComponent3DState.java | 6 +- .../javax/media/j3d/ImageComponentState.java | 2 +- .../media/j3d/IndexedGeometryArrayState.java | 6 +- .../j3d/IndexedGeometryStripArrayState.java | 2 +- .../media/j3d/IndexedLineArrayState.java | 6 +- .../media/j3d/IndexedLineStripArrayState.java | 6 +- .../media/j3d/IndexedPointArrayState.java | 6 +- .../media/j3d/IndexedQuadArrayState.java | 6 +- .../media/j3d/IndexedTriangleArrayState.java | 6 +- .../j3d/IndexedTriangleFanArrayState.java | 6 +- .../j3d/IndexedTriangleStripArrayState.java | 6 +- .../javax/media/j3d/InterpolatorState.java | 4 +- .../io/state/javax/media/j3d/LODState.java | 4 +- .../io/state/javax/media/j3d/LightState.java | 8 +- .../state/javax/media/j3d/LineArrayState.java | 6 +- .../javax/media/j3d/LineAttributesState.java | 4 +- .../javax/media/j3d/LineStripArrayState.java | 6 +- .../state/javax/media/j3d/LinearFogState.java | 4 +- .../io/state/javax/media/j3d/LinkState.java | 6 +- .../state/javax/media/j3d/MaterialState.java | 6 +- .../javax/media/j3d/MediaContainerState.java | 4 +- .../state/javax/media/j3d/ModelClipState.java | 10 +- .../io/state/javax/media/j3d/MorphState.java | 8 +- .../javax/media/j3d/NodeComponentState.java | 2 +- .../io/state/javax/media/j3d/NodeState.java | 2 +- .../media/j3d/NullSceneGraphObjectState.java | 4 +- .../javax/media/j3d/OrderedGroupState.java | 4 +- .../javax/media/j3d/OrientedShape3DState.java | 8 +- .../media/j3d/PathInterpolatorState.java | 2 +- .../javax/media/j3d/PointAttributesState.java | 4 +- .../javax/media/j3d/PointLightState.java | 6 +- .../javax/media/j3d/PointSoundState.java | 6 +- .../media/j3d/PolygonAttributesState.java | 4 +- .../media/j3d/PositionInterpolatorState.java | 10 +- .../j3d/PositionPathInterpolatorState.java | 14 +- .../state/javax/media/j3d/QuadArrayState.java | 6 +- .../io/state/javax/media/j3d/RasterState.java | 10 +- .../media/j3d/RenderingAttributesState.java | 4 +- .../j3d/RotPosPathInterpolatorState.java | 16 +- .../j3d/RotPosScalePathInterpolatorState.java | 16 +- .../media/j3d/RotationInterpolatorState.java | 10 +- .../j3d/RotationPathInterpolatorState.java | 14 +- .../media/j3d/ScaleInterpolatorState.java | 10 +- .../media/j3d/SceneGraphObjectState.java | 2 +- .../state/javax/media/j3d/Shape3DState.java | 8 +- .../javax/media/j3d/SharedGroupState.java | 4 +- .../io/state/javax/media/j3d/SoundState.java | 6 +- .../javax/media/j3d/SoundscapeState.java | 8 +- .../state/javax/media/j3d/SpotLightState.java | 10 +- .../io/state/javax/media/j3d/SwitchState.java | 4 +- .../j3d/SwitchValueInterpolatorState.java | 12 +- .../media/j3d/TexCoordGenerationState.java | 6 +- .../io/state/javax/media/j3d/Text3DState.java | 8 +- .../state/javax/media/j3d/Texture2DState.java | 8 +- .../state/javax/media/j3d/Texture3DState.java | 6 +- .../media/j3d/TextureAttributesState.java | 10 +- .../javax/media/j3d/TextureCubeMapState.java | 10 +- .../state/javax/media/j3d/TextureState.java | 10 +- .../media/j3d/TextureUnitStateState.java | 10 +- .../javax/media/j3d/TransformGroupState.java | 6 +- .../media/j3d/TransformInterpolatorState.java | 4 +- .../j3d/TransparencyAttributesState.java | 4 +- .../j3d/TransparencyInterpolatorState.java | 12 +- .../javax/media/j3d/TriangleArrayState.java | 6 +- .../media/j3d/TriangleFanArrayState.java | 6 +- .../media/j3d/TriangleStripArrayState.java | 6 +- .../javax/media/j3d/ViewPlatformState.java | 4 +- .../SimpleDistanceComparator.java | 2 +- .../TransparencySortController.java | 6 +- .../sun/j3d/utils/universe/ConfigCommand.java | 4 +- .../sun/j3d/utils/universe/ConfigDevice.java | 2 +- .../utils/universe/ConfigPhysicalBody.java | 8 +- .../universe/ConfigPhysicalEnvironment.java | 10 +- .../sun/j3d/utils/universe/ConfigScreen.java | 8 +- .../sun/j3d/utils/universe/ConfigSensor.java | 4 +- .../j3d/utils/universe/ConfigSexpression.java | 16 +- .../sun/j3d/utils/universe/ConfigView.java | 8 +- .../utils/universe/ConfigViewPlatform.java | 12 +- .../universe/ConfigViewPlatformBehavior.java | 6 +- .../utils/universe/ConfiguredUniverse.java | 8 +- .../sun/j3d/utils/universe/LocaleFactory.java | 6 +- .../utils/universe/MultiTransformGroup.java | 2 +- .../j3d/utils/universe/PlatformGeometry.java | 2 +- .../j3d/utils/universe/SimpleUniverse.java | 14 +- .../com/sun/j3d/utils/universe/ViewInfo.java | 22 +-- .../com/sun/j3d/utils/universe/Viewer.java | 16 +- .../sun/j3d/utils/universe/ViewerAvatar.java | 2 +- .../j3d/utils/universe/ViewingPlatform.java | 14 +- .../universe/doc-files/config-syntax.html | 20 +- 277 files changed, 1430 insertions(+), 1430 deletions(-) rename src/classes/share/META-INF/services/{javax.media.j3d.GeometryService => org.scijava.java3d.GeometryService} (100%) diff --git a/pom.xml b/pom.xml index 8ecf0d3..00113b7 100644 --- a/pom.xml +++ b/pom.xml @@ -44,12 +44,12 @@ ${project.groupId} j3dcore - 1.6.0-scijava-1 + 1.6.0-scijava-2 ${project.groupId} vecmath - 1.6.0-scijava-1 + 1.6.0-scijava-2 diff --git a/src/classes/share/META-INF/services/javax.media.j3d.GeometryService b/src/classes/share/META-INF/services/org.scijava.java3d.GeometryService similarity index 100% rename from src/classes/share/META-INF/services/javax.media.j3d.GeometryService rename to src/classes/share/META-INF/services/org.scijava.java3d.GeometryService diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java index f81fe4f..bd5512a 100644 --- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java +++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java @@ -39,9 +39,9 @@ package com.sun.j3d.audioengines; -import javax.media.j3d.AudioDevice; -import javax.media.j3d.PhysicalEnvironment; -import javax.media.j3d.Sound; +import org.scijava.java3d.AudioDevice; +import org.scijava.java3d.PhysicalEnvironment; +import org.scijava.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/com/sun/j3d/audioengines/AudioEngine3D.java index dcf334a..f9e555b 100644 --- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java +++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java @@ -41,13 +41,13 @@ 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.scijava.java3d.AudioDevice3D; +import org.scijava.java3d.MediaContainer; +import org.scijava.java3d.PhysicalEnvironment; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.View; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Vector3d; /** diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java index 1bffd52..5ab4e8f 100644 --- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java +++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java @@ -39,10 +39,10 @@ package com.sun.j3d.audioengines; -import javax.media.j3d.AudioDevice3DL2; -import javax.media.j3d.AuralAttributes; -import javax.media.j3d.PhysicalEnvironment; -import javax.media.j3d.Sound; +import org.scijava.java3d.AudioDevice3DL2; +import org.scijava.java3d.AuralAttributes; +import org.scijava.java3d.PhysicalEnvironment; +import org.scijava.java3d.Sound; /** diff --git a/src/classes/share/com/sun/j3d/audioengines/Sample.java b/src/classes/share/com/sun/j3d/audioengines/Sample.java index 3506dc8..2645133 100644 --- a/src/classes/share/com/sun/j3d/audioengines/Sample.java +++ b/src/classes/share/com/sun/j3d/audioengines/Sample.java @@ -39,14 +39,14 @@ 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; +import org.scijava.java3d.MediaContainer; +import org.scijava.java3d.Sound; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.View; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3d; +import org.scijava.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/JSDirectionalSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java index 05796c5..86695e2 100644 --- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java +++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java @@ -46,8 +46,8 @@ package com.sun.j3d.audioengines.javasound; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.audioengines.AuralParameters; diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java index 70519cc..79a61cd 100644 --- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java +++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java @@ -46,12 +46,12 @@ package com.sun.j3d.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.scijava.java3d.PhysicalBody; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.View; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.audioengines.AuralParameters; diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java index c904b8c..91e91f9 100644 --- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java +++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java @@ -49,8 +49,8 @@ import java.io.InputStream; import java.net.URL; -import javax.media.j3d.MediaContainer; -import javax.media.j3d.View; +import org.scijava.java3d.MediaContainer; +import org.scijava.java3d.View; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.DataLine; diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java index 1e96fee..cad2bd9 100644 --- a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java +++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java @@ -46,13 +46,13 @@ 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 org.scijava.java3d.AudioDevice3D; +import org.scijava.java3d.MediaContainer; +import org.scijava.java3d.PhysicalEnvironment; +import org.scijava.java3d.Sound; +import org.scijava.java3d.Transform3D; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Vector3d; import com.sun.j3d.audioengines.AudioEngine3DL2; import com.sun.j3d.audioengines.Sample; diff --git a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java b/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java index e089626..e6ffed1 100644 --- a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java +++ b/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java @@ -49,8 +49,8 @@ import java.awt.image.BufferedImage; import java.lang.reflect.InvocationTargetException; -import javax.media.j3d.Canvas3D; -import javax.media.j3d.GraphicsConfigTemplate3D; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.GraphicsConfigTemplate3D; import javax.swing.JPanel; import javax.swing.event.AncestorListener; @@ -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.scijava.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 @@ private void createOffScreenBuffer(int width, int height) { // 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.scijava.java3d.ImageComponent2D image = new org.scijava.java3d.ImageComponent2D(org.scijava.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/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java index 140de33..299c1b6 100644 --- a/src/classes/share/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java +++ b/src/classes/share/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java @@ -51,4 +51,4 @@ * * @since Java 3D 1.5 */ -public interface AutoOffScreenCanvas3D extends javax.media.j3d.AutoOffScreenCanvas3D {} +public interface AutoOffScreenCanvas3D extends org.scijava.java3d.AutoOffScreenCanvas3D {} diff --git a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java b/src/classes/share/com/sun/j3d/internal/BufferWrapper.java index 4dd43b1..b280641 100644 --- a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java +++ b/src/classes/share/com/sun/j3d/internal/BufferWrapper.java @@ -41,7 +41,7 @@ import java.nio.Buffer; -import javax.media.j3d.J3DBuffer; +import org.scijava.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/com/sun/j3d/internal/ByteBufferWrapper.java index 9d30fa9..912531a 100644 --- a/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java +++ b/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java @@ -42,7 +42,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; -import javax.media.j3d.J3DBuffer; +import org.scijava.java3d.J3DBuffer; /** * NIO Buffers are new in Java 1.4 but we need to run on 1.3 @@ -69,7 +69,7 @@ public ByteBufferWrapper(ByteBuffer buffer) { /** * Constructor initializes buffer with a - * javax.media.j3d.J3DBuffer object. + * org.scijava.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/com/sun/j3d/internal/Distance.java index bb60d31..0f3fa64 100644 --- a/src/classes/share/com/sun/j3d/internal/Distance.java +++ b/src/classes/share/com/sun/j3d/internal/Distance.java @@ -55,8 +55,8 @@ package com.sun.j3d.internal; -import javax.vecmath.Point3d; -import javax.vecmath.Vector3d; +import org.scijava.vecmath.Point3d; +import org.scijava.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/com/sun/j3d/internal/DoubleBufferWrapper.java index 0ef14f0..898a21b 100644 --- a/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java +++ b/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java @@ -41,7 +41,7 @@ import java.nio.DoubleBuffer; -import javax.media.j3d.J3DBuffer; +import org.scijava.java3d.J3DBuffer; /** * NIO Buffers are new in Java 1.4 but we need to run on 1.3 @@ -68,7 +68,7 @@ public DoubleBufferWrapper(DoubleBuffer buffer) { /** * Constructor initializes buffer with a - * javax.media.j3d.J3DBuffer object. + * org.scijava.java3d.J3DBuffer object. */ public DoubleBufferWrapper(J3DBuffer b) { buffer = (DoubleBuffer)(b.getBuffer()); diff --git a/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java b/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java index 6c7badf..ee06748 100644 --- a/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java +++ b/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java @@ -41,7 +41,7 @@ import java.nio.FloatBuffer; -import javax.media.j3d.J3DBuffer; +import org.scijava.java3d.J3DBuffer; /** * NIO Buffers are new in Java 1.4 but we need to run on 1.3 @@ -68,9 +68,9 @@ public FloatBufferWrapper(FloatBuffer buffer) { /** * Constructor initializes buffer with a - * javax.media.j3d.J3DBuffer object. + * org.scijava.java3d.J3DBuffer object. */ - public FloatBufferWrapper(javax.media.j3d.J3DBuffer b) { + public FloatBufferWrapper(org.scijava.java3d.J3DBuffer b) { this.buffer = (FloatBuffer)(b.getBuffer()); } diff --git a/src/classes/share/com/sun/j3d/loaders/Scene.java b/src/classes/share/com/sun/j3d/loaders/Scene.java index 901a9ca..b4a08f5 100644 --- a/src/classes/share/com/sun/j3d/loaders/Scene.java +++ b/src/classes/share/com/sun/j3d/loaders/Scene.java @@ -41,13 +41,13 @@ 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.scijava.java3d.Background; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Fog; +import org.scijava.java3d.Light; +import org.scijava.java3d.Sound; +import org.scijava.java3d.TransformGroup; /** diff --git a/src/classes/share/com/sun/j3d/loaders/SceneBase.java b/src/classes/share/com/sun/j3d/loaders/SceneBase.java index bb3794d..ac75946 100644 --- a/src/classes/share/com/sun/j3d/loaders/SceneBase.java +++ b/src/classes/share/com/sun/j3d/loaders/SceneBase.java @@ -42,13 +42,13 @@ 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.scijava.java3d.Background; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Fog; +import org.scijava.java3d.Light; +import org.scijava.java3d.Sound; +import org.scijava.java3d.TransformGroup; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java index 2b52e07..3b2e746 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java @@ -39,8 +39,8 @@ package com.sun.j3d.loaders.lw3d; -import javax.media.j3d.Alpha; -import javax.media.j3d.Interpolator; +import org.scijava.java3d.Alpha; +import org.scijava.java3d.Interpolator; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java index ea8e048..1044343 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java @@ -44,17 +44,17 @@ 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.scijava.java3d.Appearance; +import org.scijava.java3d.ColoringAttributes; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.Material; +import org.scijava.java3d.PointAttributes; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Texture; +import org.scijava.java3d.TextureAttributes; +import org.scijava.java3d.TransparencyAttributes; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.utils.geometry.GeometryInfo; @@ -115,7 +115,7 @@ void createJava3dGeometry() throws IncorrectFormatException { for (Enumeration e = shapeList.elements(); e.hasMoreElements() ;) { - int vertexFormat = javax.media.j3d.GeometryArray.COORDINATES; + int vertexFormat = org.scijava.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 @@ void createJava3dGeometry() throws IncorrectFormatException { // This case happens if the objects are points // Note that points are colored, not lit object = new - javax.media.j3d.PointArray(vertexCount, vertexFormat); + org.scijava.java3d.PointArray(vertexCount, vertexFormat); object.setCoordinates(0, shape.coordsArray); ColoringAttributes colorAtt = new ColoringAttributes(surf.getColor(), @@ -173,7 +173,7 @@ else if (shape.facetSizes[0] == 2) { // 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.scijava.java3d.LineArray(vertexCount, vertexFormat); object.setCoordinates(0, shape.coordsArray); ColoringAttributes colorAtt = @@ -185,7 +185,7 @@ else if (shape.facetSizes[0] == 2) { // This is the case for any polygonal objects debugOutputLn(LINE_TRACE, "Creating IndexedTriFanArray"); // create triFanArray - vertexFormat |= javax.media.j3d.GeometryArray.NORMALS; + vertexFormat |= org.scijava.java3d.GeometryArray.NORMALS; debugOutputLn(LINE_TRACE, "about to process vertices/indices, facetIndices = " + shape.facetIndices); @@ -242,7 +242,7 @@ else if (shape.facetSizes[0] == 2) { vertexCount + ", " + shape.facetSizes.length); object = new - javax.media.j3d.TriangleFanArray(vertexCount, + org.scijava.java3d.TriangleFanArray(vertexCount, vertexFormat, shape.facetSizes); object.setCoordinates(0, shape.coordsArray); diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java index aa5a4ff..2efce26 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java @@ -41,7 +41,7 @@ import java.util.Enumeration; -import javax.media.j3d.Alpha; +import org.scijava.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/com/sun/j3d/loaders/lw3d/Lw3dLoader.java index 300e0e2..62b03b0 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java @@ -52,15 +52,15 @@ 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.scijava.java3d.AmbientLight; +import org.scijava.java3d.Background; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Fog; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Point3d; import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.Loader; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java index a1affc5..6a820f3 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java @@ -41,8 +41,8 @@ -import javax.media.j3d.Light; -import javax.vecmath.Color3f; +import org.scijava.java3d.Light; +import org.scijava.vecmath.Color3f; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java index fd23902..2d6bbdc 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java @@ -44,8 +44,8 @@ import java.io.IOException; import java.util.Vector; -import javax.vecmath.Color3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.J3dUtilsI18N; import com.sun.j3d.loaders.IncorrectFormatException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java index 9249b02..7895eae 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java @@ -45,10 +45,10 @@ 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.scijava.java3d.Texture; +import org.scijava.java3d.Texture2D; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.loaders.ParsingErrorException; import com.sun.j3d.utils.image.TextureLoader; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java index cf548ea..0bd7ebe 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java @@ -44,10 +44,10 @@ 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.scijava.java3d.Background; +import org.scijava.java3d.BoundingSphere; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Point3d; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java index bef9f5d..a4d680f 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java @@ -45,10 +45,10 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Matrix4d; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java index 1e9fb86..1732ec2 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java @@ -42,8 +42,8 @@ import java.io.IOException; import java.io.StreamTokenizer; -import javax.media.j3d.Behavior; -import javax.media.j3d.TransformGroup; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.internal.J3dUtilsI18N; import com.sun.j3d.loaders.IncorrectFormatException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java index b8ff1b8..06ca660 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java @@ -43,11 +43,11 @@ 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.scijava.java3d.Alpha; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Point3d; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java index 9c90ef5..85f5dd0 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java @@ -44,11 +44,11 @@ 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.scijava.java3d.BoundingSphere; +import org.scijava.java3d.Fog; +import org.scijava.java3d.LinearFog; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Point3d; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java index 48ba728..d2f7362 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java @@ -43,9 +43,9 @@ import java.io.StreamTokenizer; -import javax.vecmath.Matrix4d; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3d; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Point3f; +import org.scijava.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/com/sun/j3d/loaders/lw3d/LwsLight.java index bd800dd..4df1f46 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java @@ -45,19 +45,19 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.DirectionalLight; +import org.scijava.java3d.Light; +import org.scijava.java3d.PointLight; +import org.scijava.java3d.SpotLight; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java index 0aa7304..d5c61b0 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java @@ -43,15 +43,15 @@ 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 org.scijava.java3d.Alpha; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Quat4f; import com.sun.j3d.internal.J3dUtilsI18N; import com.sun.j3d.loaders.IncorrectFormatException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java index 555655e..a736645 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java @@ -50,13 +50,13 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.Group; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java index f80d795..15c7816 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java @@ -43,7 +43,7 @@ import java.util.Vector; -import javax.media.j3d.TransformGroup; +import org.scijava.java3d.TransformGroup; /** * This is an interface which is implemented by LwsObject, diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java index 8629c7e..c107f04 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java @@ -46,17 +46,17 @@ 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.scijava.java3d.Alpha; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.Group; +import org.scijava.java3d.Link; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.SharedGroup; +import org.scijava.java3d.Switch; +import org.scijava.java3d.SwitchValueInterpolator; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Point3d; import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java index ac79dff..3d62ce1 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java @@ -47,11 +47,11 @@ 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.scijava.java3d.Alpha; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.Switch; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Point3d; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java b/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java index 70d2d5f..283e9d0 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java @@ -41,7 +41,7 @@ import java.util.Vector; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Vector3f; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java index b52e1bf..aa1c2c6 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java @@ -42,8 +42,8 @@ import java.util.Enumeration; -import javax.media.j3d.Alpha; -import javax.media.j3d.Switch; +import org.scijava.java3d.Alpha; +import org.scijava.java3d.Switch; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java index ac2aeef..c8b943c 100644 --- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java +++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java @@ -51,11 +51,11 @@ 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.scijava.java3d.BranchGroup; +import org.scijava.java3d.Shape3D; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.TexCoord2f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.Loader; diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java index d294795..5c60076 100644 --- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java +++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java @@ -55,14 +55,14 @@ 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 org.scijava.java3d.Appearance; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.Material; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.TexCoordGeneration; +import org.scijava.java3d.Texture2D; +import org.scijava.java3d.TransparencyAttributes; +import org.scijava.vecmath.Color3f; import com.sun.j3d.loaders.ParsingErrorException; import com.sun.j3d.utils.image.ImageException; diff --git a/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java b/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java index 5572ea3..6388a96 100644 --- a/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java +++ b/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java @@ -46,8 +46,8 @@ package com.sun.j3d.utils.audio; -import javax.media.j3d.SoundException; -import javax.vecmath.Point2f; +import org.scijava.java3d.SoundException; +import org.scijava.vecmath.Point2f; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java index 63199af..96ce8f7 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java @@ -39,9 +39,9 @@ package com.sun.j3d.utils.behaviors.interpolators; -import javax.vecmath.Point3f; -import javax.vecmath.Quat4f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Quat4f; +import org.scijava.vecmath.Vector3f; /** diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java index 62471c5..8b4ca3e 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java @@ -39,8 +39,8 @@ package com.sun.j3d.utils.behaviors.interpolators; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; /** diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java index 46b1980..d91fee4 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.behaviors.interpolators; -import javax.vecmath.Point3f; +import org.scijava.vecmath.Point3f; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java index 457a2ef..102667e 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java @@ -39,15 +39,15 @@ 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; +import org.scijava.java3d.Alpha; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.java3d.RestrictedAccessException; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; /** diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java index 5782a41..ae02dff 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java @@ -39,13 +39,13 @@ 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.media.j3d.TransformInterpolator; +import org.scijava.java3d.Alpha; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.java3d.RestrictedAccessException; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.TransformInterpolator; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java index ab856b2..315026d 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java @@ -39,17 +39,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.Quat4f; -import javax.vecmath.Vector3d; -import javax.vecmath.Vector3f; +import org.scijava.java3d.Alpha; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.java3d.RestrictedAccessException; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Quat4f; +import org.scijava.vecmath.Vector3d; +import org.scijava.vecmath.Vector3f; /** diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java index 2b5db45..e13bed9 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java @@ -39,8 +39,8 @@ package com.sun.j3d.utils.behaviors.interpolators; -import javax.vecmath.Point3f; -import javax.vecmath.Quat4f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Quat4f; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java index b8fe090..e9cffb3 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java @@ -39,13 +39,13 @@ 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.media.j3d.TransformInterpolator; +import org.scijava.java3d.Alpha; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.java3d.RestrictedAccessException; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.TransformInterpolator; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java b/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java index 1df3d62..46c303e 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java @@ -41,12 +41,12 @@ 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.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Quat4d; +import org.scijava.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/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java index 4d38238..0082485 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java @@ -46,14 +46,14 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCondition; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOnBehaviorPost; +import org.scijava.java3d.WakeupOnElapsedFrames; +import org.scijava.java3d.WakeupOr; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java index 73b2b25..c47dd7e 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java @@ -48,13 +48,13 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOnBehaviorPost; +import org.scijava.java3d.WakeupOr; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java index 29854a0..b494e7a 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.behaviors.mouse; -import javax.media.j3d.Transform3D; +import org.scijava.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/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java index 33aaba8..ff2f3fb 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java @@ -44,13 +44,13 @@ 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.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOnBehaviorPost; +import org.scijava.vecmath.Matrix4d; +import org.scijava.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/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java index f81366a..3dabfae 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java @@ -44,12 +44,12 @@ 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.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOnBehaviorPost; +import org.scijava.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/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java index 8d360b2..97904f8 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java @@ -45,12 +45,12 @@ 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.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOnBehaviorPost; +import org.scijava.vecmath.Vector3d; /** diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java index 86471a5..5fbe951 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java @@ -44,12 +44,12 @@ 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.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOnBehaviorPost; +import org.scijava.vecmath.Vector3d; /** diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java index 6df1e7e..09b7778 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java @@ -39,13 +39,13 @@ package com.sun.j3d.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.scijava.java3d.PickPoint; +import org.scijava.java3d.PickRay; +import org.scijava.java3d.PickSegment; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Tuple3d; +import org.scijava.vecmath.Vector3d; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java index c64f731..174cf56 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java @@ -44,14 +44,14 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOr; /* diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java index 9eae2ec..c482cc3 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java @@ -78,22 +78,22 @@ bool intersect(SceneGraphPath, PickShape) 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 org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Group; +import org.scijava.java3d.Link; +import org.scijava.java3d.Morph; +import org.scijava.java3d.Node; +import org.scijava.java3d.PickRay; +import org.scijava.java3d.PickShape; +import org.scijava.java3d.SceneGraphPath; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Switch; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.View; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Vector3d; import com.sun.j3d.utils.geometry.Primitive; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java index 7e491e0..b1f9145 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java @@ -39,11 +39,11 @@ package com.sun.j3d.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.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; import com.sun.j3d.utils.behaviors.mouse.MouseRotate; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java index 89b307a..7f561d0 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java @@ -39,11 +39,11 @@ package com.sun.j3d.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.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehavior; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java index c405451..32cae2a 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java @@ -39,11 +39,11 @@ package com.sun.j3d.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.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehavior; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java index f2b625e..1ff176e 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.behaviors.picking; -import javax.media.j3d.TransformGroup; +import org.scijava.java3d.TransformGroup; /** * @deprecated As of Java 3D version 1.2, replaced by diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java index 188840a..27bcca0 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java @@ -41,15 +41,15 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.Sensor; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCondition; +import org.scijava.java3d.WakeupOnElapsedFrames; +import org.scijava.vecmath.Point3d; +import org.scijava.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/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java index 7a98660..3762bd4 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java @@ -39,17 +39,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.TriangleStripArray; -import javax.vecmath.AxisAngle4f; -import javax.vecmath.Point3d; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.java3d.Appearance; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.Material; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransparencyAttributes; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.AxisAngle4f; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.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/SensorEvent.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java index 980cda3..db22659 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java @@ -39,8 +39,8 @@ package com.sun.j3d.utils.behaviors.sensor ; -import javax.media.j3d.Sensor; -import javax.media.j3d.Transform3D; +import org.scijava.java3d.Sensor; +import org.scijava.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/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java index dac15e3..c540ca5 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java @@ -43,8 +43,8 @@ import java.util.Iterator; import java.util.List; -import javax.media.j3d.Sensor; -import javax.media.j3d.Transform3D; +import org.scijava.java3d.Sensor; +import org.scijava.java3d.Transform3D; import com.sun.j3d.utils.timer.J3DTimer; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java index 90ba7cf..c26b882 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java @@ -39,15 +39,15 @@ 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; +import org.scijava.java3d.Appearance; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.Material; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransparencyAttributes; +import org.scijava.java3d.TriangleArray; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; /** * A Shape3D representing a gnomon pointing along each coordinate diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java index b046096..c023ee4 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java @@ -42,11 +42,11 @@ 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.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.vecmath.Matrix3d; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Vector3d; import com.sun.j3d.internal.J3dUtilsI18N; import com.sun.j3d.utils.universe.ViewingPlatform; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java index 5c2a5e1..598f38f 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java @@ -47,11 +47,11 @@ 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.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.WakeupCondition; +import org.scijava.java3d.WakeupOnBehaviorPost; +import org.scijava.java3d.WakeupOnElapsedFrames; import com.sun.j3d.utils.universe.Viewer; import com.sun.j3d.utils.universe.ViewingPlatform; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java index 5518eeb..3d3fa0b 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java @@ -39,9 +39,9 @@ package com.sun.j3d.utils.behaviors.vp; -import javax.media.j3d.Behavior; -import javax.media.j3d.Transform3D; -import javax.media.j3d.TransformGroup; +import org.scijava.java3d.Behavior; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.universe.ViewingPlatform; diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java index c84ab0c..5872e0c 100644 --- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java @@ -43,26 +43,26 @@ 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 org.scijava.java3d.Appearance; +import org.scijava.java3d.BadTransformException; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Group; +import org.scijava.java3d.Material; +import org.scijava.java3d.Sensor; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.TransparencyAttributes; +import org.scijava.java3d.View; +import org.scijava.java3d.WakeupCondition; +import org.scijava.java3d.WakeupOnElapsedFrames; +import org.scijava.vecmath.AxisAngle4d; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Matrix3d; +import org.scijava.vecmath.Matrix4d; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Vector3d; import com.sun.j3d.utils.behaviors.sensor.SensorBeamEcho; import com.sun.j3d.utils.behaviors.sensor.SensorButtonListener; diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java b/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java index 87d0d75..3cf23d1 100644 --- a/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java +++ b/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java @@ -43,9 +43,9 @@ 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.scijava.java3d.CapabilityNotSetException; +import org.scijava.java3d.CompressedGeometry; +import org.scijava.java3d.CompressedGeometryHeader; // // The compressed geometry file format supported by this class has a 32 diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java b/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java index 10e12ba..f9ded4c 100644 --- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java +++ b/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java @@ -46,34 +46,34 @@ 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 org.scijava.java3d.Appearance; +import org.scijava.java3d.CompressedGeometryHeader; +import org.scijava.java3d.Geometry; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.GeometryStripArray; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.java3d.IndexedGeometryStripArray; +import org.scijava.java3d.IndexedLineArray; +import org.scijava.java3d.IndexedLineStripArray; +import org.scijava.java3d.IndexedQuadArray; +import org.scijava.java3d.IndexedTriangleArray; +import org.scijava.java3d.IndexedTriangleFanArray; +import org.scijava.java3d.IndexedTriangleStripArray; +import org.scijava.java3d.J3DBuffer; +import org.scijava.java3d.LineArray; +import org.scijava.java3d.LineStripArray; +import org.scijava.java3d.Material; +import org.scijava.java3d.QuadArray; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleFanArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Point3i; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.BufferWrapper; import com.sun.j3d.utils.geometry.GeometryInfo; diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java b/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java index 674eb96..2c9e1b8 100644 --- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java +++ b/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java @@ -39,8 +39,8 @@ package com.sun.j3d.utils.compression; -import javax.vecmath.Color3f; -import javax.vecmath.Color4f; +import org.scijava.vecmath.Color3f; +import org.scijava.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/CompressionStreamNormal.java b/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamNormal.java index b43939a..78d2c1e 100644 --- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamNormal.java +++ b/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamNormal.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.compression; -import javax.vecmath.Vector3f; +import org.scijava.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/com/sun/j3d/utils/compression/CompressionStreamVertex.java index 906c107..31b578d 100644 --- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamVertex.java +++ b/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamVertex.java @@ -39,10 +39,10 @@ package com.sun.j3d.utils.compression; -import javax.vecmath.Color3f; -import javax.vecmath.Color4f; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3f; +import org.scijava.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/com/sun/j3d/utils/compression/GeometryCompressor.java index d3fda17..8b3df1b 100644 --- a/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java +++ b/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java @@ -41,9 +41,9 @@ import java.io.IOException; -import javax.media.j3d.CompressedGeometry; -import javax.media.j3d.CompressedGeometryHeader; -import javax.vecmath.Point3d; +import org.scijava.java3d.CompressedGeometry; +import org.scijava.java3d.CompressedGeometryHeader; +import org.scijava.vecmath.Point3d; /** * A GeometryCompressor takes a stream of geometric elements and diff --git a/src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java b/src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java index 59701d1..25c430e 100644 --- a/src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java +++ b/src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java @@ -39,10 +39,10 @@ package com.sun.j3d.utils.compression; -import javax.vecmath.Color3f; -import javax.vecmath.Color4f; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3f; +import org.scijava.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/Basic.java b/src/classes/share/com/sun/j3d/utils/geometry/Basic.java index 77b3553..eecdadf 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Basic.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Basic.java @@ -54,8 +54,8 @@ package com.sun.j3d.utils.geometry; -import javax.vecmath.Tuple2f; -import javax.vecmath.Tuple3f; +import org.scijava.vecmath.Tuple2f; +import org.scijava.vecmath.Tuple3f; class Basic { diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Box.java b/src/classes/share/com/sun/j3d/utils/geometry/Box.java index 02124d7..f871d5a 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Box.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Box.java @@ -39,11 +39,11 @@ 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.Vector3f; +import org.scijava.java3d.Appearance; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.java3d.Shape3D; +import org.scijava.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/Clean.java b/src/classes/share/com/sun/j3d/utils/geometry/Clean.java index d4137df..654031e 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Clean.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Clean.java @@ -54,7 +54,7 @@ package com.sun.j3d.utils.geometry; -import javax.vecmath.Point2f; +import org.scijava.vecmath.Point2f; class Clean { diff --git a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java b/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java index c41c32e..bbd11d0 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java @@ -39,8 +39,8 @@ package com.sun.j3d.utils.geometry; -import javax.media.j3d.QuadArray; -import javax.media.j3d.Shape3D; +import org.scijava.java3d.QuadArray; +import org.scijava.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/com/sun/j3d/utils/geometry/Cone.java index 39d9729..7e0d466 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Cone.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Cone.java @@ -39,10 +39,10 @@ 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 org.scijava.java3d.Appearance; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.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/com/sun/j3d/utils/geometry/Cylinder.java index b40b27b..6983003 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java @@ -39,10 +39,10 @@ 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 org.scijava.java3d.Appearance; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.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/Desperate.java b/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java index 4bbcc66..1f324f4 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java @@ -54,7 +54,7 @@ package com.sun.j3d.utils.geometry; -import javax.vecmath.Point2f; +import org.scijava.vecmath.Point2f; class Desperate { diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java b/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java index 57e4d96..78c6342 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java @@ -39,15 +39,15 @@ 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; +import org.scijava.java3d.Geometry; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.QuadArray; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleFanArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.TexCoord2f; +import org.scijava.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/com/sun/j3d/utils/geometry/GeometryInfo.java index d012176..5c32d58 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java @@ -44,31 +44,31 @@ 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 org.scijava.java3d.GeometryArray; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.java3d.IndexedQuadArray; +import org.scijava.java3d.IndexedTriangleArray; +import org.scijava.java3d.IndexedTriangleFanArray; +import org.scijava.java3d.IndexedTriangleStripArray; +import org.scijava.java3d.J3DBuffer; +import org.scijava.java3d.QuadArray; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleFanArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Color3b; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4b; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point2f; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.TexCoord2f; +import org.scijava.vecmath.TexCoord3f; +import org.scijava.vecmath.TexCoord4f; +import org.scijava.vecmath.Tuple2f; +import org.scijava.vecmath.Tuple3f; +import org.scijava.vecmath.Tuple4f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.J3dUtilsI18N; @@ -85,7 +85,7 @@ * CompressionSteam and generate a CompressedGeometry object from the * geometry.

* Geometry is loaded into a GeometryInfo in a manner similar to the - * + * * GeometryArray methods. The constructor for the GeometryInfo takes a flag * that specifies the kind of data being loaded. The vertex data is * specified using methods that are similar to the GeometryArray methods, but @@ -136,7 +136,7 @@ * @see Stripifier * @see com.sun.j3d.utils.compression.CompressionStream * @see com.sun.j3d.utils.compression.GeometryCompressor - * @see javax.media.j3d.GeometryArray + * @see org.scijava.java3d.GeometryArray */ public class GeometryInfo { @@ -950,7 +950,7 @@ public int getNumTexCoordComponents() /** * Sets the mapping between texture coordinate sets and texture units. * See the - * + * * GeometryArray constructor for further details. *

Note: If the texCoordSetMap is not set, multi-texturing is * turned off. Only the texture coordinate set at index 0 (if set) will be @@ -966,7 +966,7 @@ public void setTexCoordSetMap(int map[]) { /** * Returns a reference to the texture coordinate set map. * See the - * + * * GeometryArray constructor for further details. */ public int[] getTexCoordSetMap() { @@ -1803,19 +1803,19 @@ public void indexify() */ Object[] allocateArray(Object data[], int num) { Object newData[] = null; - if (data instanceof javax.vecmath.Point3f[]) { + if (data instanceof org.scijava.vecmath.Point3f[]) { newData = new Point3f[num]; - } else if (data instanceof javax.vecmath.Vector3f[]) { + } else if (data instanceof org.scijava.vecmath.Vector3f[]) { newData = new Vector3f[num]; - } else if (data instanceof javax.vecmath.Color3f[]) { + } else if (data instanceof org.scijava.vecmath.Color3f[]) { newData = new Color3f[num]; - } else if (data instanceof javax.vecmath.Color4f[]) { + } else if (data instanceof org.scijava.vecmath.Color4f[]) { newData = new Color4f[num]; - } else if (data instanceof javax.vecmath.TexCoord2f[]) { + } else if (data instanceof org.scijava.vecmath.TexCoord2f[]) { newData = new TexCoord2f[num]; - } else if (data instanceof javax.vecmath.TexCoord3f[]) { + } else if (data instanceof org.scijava.vecmath.TexCoord3f[]) { newData = new TexCoord3f[num]; - } else if (data instanceof javax.vecmath.TexCoord4f[]) { + } else if (data instanceof org.scijava.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/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java index e0178b7..dfd9ed5 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java @@ -43,29 +43,29 @@ 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 org.scijava.java3d.GeometryArray; +import org.scijava.java3d.GeometryStripArray; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.java3d.IndexedGeometryStripArray; +import org.scijava.java3d.IndexedQuadArray; +import org.scijava.java3d.IndexedTriangleArray; +import org.scijava.java3d.IndexedTriangleFanArray; +import org.scijava.java3d.IndexedTriangleStripArray; +import org.scijava.java3d.J3DBuffer; +import org.scijava.java3d.QuadArray; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleFanArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Color3b; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4b; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.TexCoord2f; +import org.scijava.vecmath.TexCoord3f; +import org.scijava.vecmath.TexCoord4f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.BufferWrapper; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java b/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java index 32f3e71..e833295 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java @@ -3,9 +3,9 @@ import java.util.ArrayList; -import javax.media.j3d.GeometryArray; -import javax.media.j3d.GeometryService; -import javax.vecmath.Point3f; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.GeometryService; +import org.scijava.vecmath.Point3f; /** * Default implementation of the {@link GeometryService} service interface. diff --git a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java b/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java index 5168a89..5125ad1 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java @@ -41,8 +41,8 @@ import java.util.ArrayList; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Point3f; +import org.scijava.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/com/sun/j3d/utils/geometry/Numerics.java index 1348180..55e5719 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java @@ -54,8 +54,8 @@ package com.sun.j3d.utils.geometry; -import javax.vecmath.Point2f; -import javax.vecmath.Tuple2f; +import org.scijava.vecmath.Point2f; +import org.scijava.vecmath.Tuple2f; class Numerics { diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java b/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java index 6080b3a..607e39f 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java @@ -41,11 +41,11 @@ 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.scijava.java3d.Appearance; +import org.scijava.java3d.Group; +import org.scijava.java3d.Material; +import org.scijava.java3d.Shape3D; +import org.scijava.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/com/sun/j3d/utils/geometry/Project.java index 7bd92cc..c4f54c8 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Project.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Project.java @@ -54,10 +54,10 @@ package com.sun.j3d.utils.geometry; -import javax.vecmath.Matrix4f; -import javax.vecmath.Point3f; -import javax.vecmath.Tuple3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Matrix4f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Tuple3f; +import org.scijava.vecmath.Vector3f; class Project { diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Simple.java b/src/classes/share/com/sun/j3d/utils/geometry/Simple.java index a3605be..c1ae2c9 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Simple.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Simple.java @@ -54,7 +54,7 @@ package com.sun.j3d.utils.geometry; -import javax.vecmath.Point3f; +import org.scijava.vecmath.Point3f; class Simple { diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java b/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java index 98f56ec..c3d1e90 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java @@ -39,13 +39,13 @@ 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; +import org.scijava.java3d.Appearance; +import org.scijava.java3d.Node; +import org.scijava.java3d.NodeComponent; +import org.scijava.java3d.Shape3D; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.TexCoord2f; +import org.scijava.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/com/sun/j3d/utils/geometry/Stripifier.java index e6f34a2..9f7f827 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java @@ -2037,14 +2037,14 @@ void putBackData(GeometryInfo gi, ArrayList strips) { int[] normals = null; int[][] textures = null; int[] colors = null; - javax.vecmath.Color3b[] stripColors = null; + org.scijava.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.scijava.vecmath.Color3b[ciSize]; colors = new int[ciSize]; } int count = 0; @@ -2076,7 +2076,7 @@ void putBackData(GeometryInfo gi, ArrayList strips) { } if (hasColors) colors[count] = currStrip.istream[j].color; if (colorStrips) stripColors[count] = - new javax.vecmath.Color3b(stripColor); + new org.scijava.vecmath.Color3b(stripColor); count++; } } diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java b/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java index 77bb632..db0cba2 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java @@ -48,18 +48,18 @@ 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.scijava.java3d.Appearance; +import org.scijava.java3d.ImageComponent; +import org.scijava.java3d.ImageComponent2D; +import org.scijava.java3d.Material; +import org.scijava.java3d.Node; +import org.scijava.java3d.QuadArray; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Texture; +import org.scijava.java3d.Texture2D; +import org.scijava.java3d.TransparencyAttributes; +import org.scijava.vecmath.Color3f; +import org.scijava.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/Triangulator.java b/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java index ca4801c..84b138d 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java @@ -56,9 +56,9 @@ import java.util.Random; -import javax.vecmath.Point2f; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Point2f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java index 4c18434..2267242 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java @@ -39,10 +39,10 @@ package com.sun.j3d.utils.geometry.compression; -import javax.media.j3d.Canvas3D; -import javax.media.j3d.J3DBuffer; -import javax.media.j3d.Shape3D; -import javax.vecmath.Point3d; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.J3DBuffer; +import org.scijava.java3d.Shape3D; +import org.scijava.vecmath.Point3d; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java index 797c9fc..e7c227e 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java @@ -43,7 +43,7 @@ import java.io.IOException; import java.io.RandomAccessFile; -import javax.media.j3d.CapabilityNotSetException; +import org.scijava.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/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java index 5a3b333..dd98c22 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.geometry.compression; -import javax.media.j3d.GeometryArray; +import org.scijava.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/com/sun/j3d/utils/geometry/compression/CompressionStream.java index f501db9..55a1771 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java @@ -46,33 +46,33 @@ 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 org.scijava.java3d.Appearance; +import org.scijava.java3d.Geometry; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.GeometryStripArray; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.java3d.IndexedGeometryStripArray; +import org.scijava.java3d.IndexedLineArray; +import org.scijava.java3d.IndexedLineStripArray; +import org.scijava.java3d.IndexedQuadArray; +import org.scijava.java3d.IndexedTriangleArray; +import org.scijava.java3d.IndexedTriangleFanArray; +import org.scijava.java3d.IndexedTriangleStripArray; +import org.scijava.java3d.J3DBuffer; +import org.scijava.java3d.LineArray; +import org.scijava.java3d.LineStripArray; +import org.scijava.java3d.Material; +import org.scijava.java3d.QuadArray; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleFanArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Point3i; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.BufferWrapper; import com.sun.j3d.utils.geometry.GeometryInfo; diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java index ad9263b..54832ef 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java @@ -39,8 +39,8 @@ package com.sun.j3d.utils.geometry.compression; -import javax.vecmath.Color3f; -import javax.vecmath.Color4f; +import org.scijava.vecmath.Color3f; +import org.scijava.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/CompressionStreamNormal.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamNormal.java index 10b8704..37ffd3a 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamNormal.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamNormal.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.geometry.compression; -import javax.vecmath.Vector3f; +import org.scijava.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/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java index fb52482..9dc356c 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java @@ -39,10 +39,10 @@ package com.sun.j3d.utils.geometry.compression; -import javax.vecmath.Color3f; -import javax.vecmath.Color4f; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3f; +import org.scijava.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/GeneralizedVertexList.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java index b5832af..8086c08 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java @@ -41,17 +41,17 @@ 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.scijava.java3d.GeometryArray; +import org.scijava.java3d.GeometryStripArray; +import org.scijava.java3d.LineStripArray; +import org.scijava.java3d.PointArray; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleFanArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3f; +import org.scijava.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/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java index c64a691..c284229 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java @@ -41,7 +41,7 @@ import java.io.IOException; -import javax.vecmath.Point3d; +import org.scijava.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/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java index bbbaa94..b9bda00 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java @@ -39,10 +39,10 @@ package com.sun.j3d.utils.geometry.compression; -import javax.media.j3d.CompressedGeometryHeader; -import javax.vecmath.Color4f; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.java3d.CompressedGeometryHeader; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java index b412f9f..cb6029f 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java @@ -41,19 +41,19 @@ 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 org.scijava.java3d.Appearance; +import org.scijava.java3d.CompressedGeometry; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.GeometryStripArray; +import org.scijava.java3d.LineStripArray; +import org.scijava.java3d.Material; +import org.scijava.java3d.PointArray; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Vector3f; import com.sun.j3d.internal.J3dUtilsI18N; diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java index 0c2ab94..e4ebca8 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java @@ -39,10 +39,10 @@ package com.sun.j3d.utils.geometry.compression; -import javax.vecmath.Color3f; -import javax.vecmath.Color4f; -import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3f; +import org.scijava.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/com/sun/j3d/utils/geometry/compression/package.html index 2977b07..8c7ed6b 100644 --- a/src/classes/share/com/sun/j3d/utils/geometry/compression/package.html +++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/package.html @@ -7,7 +7,7 @@

Provides compressed geometry utility classes. - This package supersedes the javax.media.j3d.CompressedGeometry class and + This package supersedes the org.scijava.java3d.CompressedGeometry class and the com.sun.j3d.utils.compression package.

diff --git a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java b/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java index 09fd841..91faeff 100644 --- a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java +++ b/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java @@ -58,11 +58,11 @@ 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.scijava.java3d.Canvas3D; +import org.scijava.java3d.ImageComponent; +import org.scijava.java3d.ImageComponent2D; +import org.scijava.java3d.Texture; +import org.scijava.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/pickfast/PickCanvas.java b/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java index 2172df3..aa2ae6f 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java @@ -41,17 +41,17 @@ 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.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Locale; +import org.scijava.java3d.PickConeRay; +import org.scijava.java3d.PickCylinderRay; +import org.scijava.java3d.PickRay; +import org.scijava.java3d.PickShape; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.View; +import org.scijava.vecmath.Point3d; +import org.scijava.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/com/sun/j3d/utils/pickfast/PickIntersection.java index 0020956..438f276 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java @@ -39,17 +39,17 @@ 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; +import org.scijava.java3d.Geometry; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.java3d.PickInfo; +import org.scijava.java3d.Transform3D; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.TexCoord3f; +import org.scijava.vecmath.Vector3d; +import org.scijava.vecmath.Vector3f; /** * Holds information about an intersection of a PickShape with a Node diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java b/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java index 1a9d91a..11e63cd 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java @@ -39,28 +39,28 @@ 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 org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Group; +import org.scijava.java3d.Link; +import org.scijava.java3d.Locale; +import org.scijava.java3d.Morph; +import org.scijava.java3d.Node; +import org.scijava.java3d.PickBounds; +import org.scijava.java3d.PickConeRay; +import org.scijava.java3d.PickConeSegment; +import org.scijava.java3d.PickCylinderRay; +import org.scijava.java3d.PickCylinderSegment; +import org.scijava.java3d.PickInfo; +import org.scijava.java3d.PickRay; +import org.scijava.java3d.PickSegment; +import org.scijava.java3d.PickShape; +import org.scijava.java3d.SceneGraphPath; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Switch; +import org.scijava.java3d.TransformGroup; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Vector3d; import com.sun.j3d.utils.geometry.Primitive; @@ -99,7 +99,7 @@ * 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.scijava.java3d.PickShape) */ public class PickTool { diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java index 4cfdaa8..97a17ee 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java @@ -44,14 +44,14 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOr; import com.sun.j3d.utils.pickfast.PickCanvas; import com.sun.j3d.utils.pickfast.PickTool; diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java index 62ad8e4..19d1913 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java @@ -39,12 +39,12 @@ 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 org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.PickInfo; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; import com.sun.j3d.utils.behaviors.mouse.MouseRotate; diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java index 23037b2..7536c38 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java @@ -39,12 +39,12 @@ 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 org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.PickInfo; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehavior; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java index a954aab..232b49f 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java @@ -39,12 +39,12 @@ 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 org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.PickInfo; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehavior; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java index 98573e9..449c623 100644 --- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java +++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.pickfast.behaviors; -import javax.media.j3d.TransformGroup; +import org.scijava.java3d.TransformGroup; /** * The PickingCallback interface allows a class to be notified when a diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java b/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java index 774b916..102ccbf 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java +++ b/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java @@ -41,17 +41,17 @@ 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.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Locale; +import org.scijava.java3d.PickConeRay; +import org.scijava.java3d.PickCylinderRay; +import org.scijava.java3d.PickRay; +import org.scijava.java3d.PickShape; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.View; +import org.scijava.vecmath.Point3d; +import org.scijava.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/com/sun/j3d/utils/picking/PickIntersection.java index df88c89..a4b772f 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java +++ b/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java @@ -39,18 +39,18 @@ 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; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.vecmath.Color3b; +import org.scijava.vecmath.Color3f; +import org.scijava.vecmath.Color4b; +import org.scijava.vecmath.Color4f; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.TexCoord2f; +import org.scijava.vecmath.TexCoord3f; +import org.scijava.vecmath.Vector3d; +import org.scijava.vecmath.Vector3f; /** * Holds information about an intersection of a PickShape with a Node @@ -108,7 +108,7 @@ * can be inquired * the geometry includes them and the corresponding READ capibility bits are * set. - * + * * PickTool.setCapabilties(Node, int) * 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/com/sun/j3d/utils/picking/PickResult.java index be7f290..452ab7d 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/PickResult.java +++ b/src/classes/share/com/sun/j3d/utils/picking/PickResult.java @@ -41,56 +41,56 @@ 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 org.scijava.java3d.BoundingBox; +import org.scijava.java3d.BoundingPolytope; +import org.scijava.java3d.BoundingSphere; +import org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.CompressedGeometry; +import org.scijava.java3d.Geometry; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.Group; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.java3d.IndexedLineArray; +import org.scijava.java3d.IndexedLineStripArray; +import org.scijava.java3d.IndexedPointArray; +import org.scijava.java3d.IndexedQuadArray; +import org.scijava.java3d.IndexedTriangleArray; +import org.scijava.java3d.IndexedTriangleFanArray; +import org.scijava.java3d.IndexedTriangleStripArray; +import org.scijava.java3d.LineArray; +import org.scijava.java3d.LineStripArray; +import org.scijava.java3d.Link; +import org.scijava.java3d.Morph; +import org.scijava.java3d.Node; +import org.scijava.java3d.PickBounds; +import org.scijava.java3d.PickCone; +import org.scijava.java3d.PickConeRay; +import org.scijava.java3d.PickConeSegment; +import org.scijava.java3d.PickCylinder; +import org.scijava.java3d.PickCylinderRay; +import org.scijava.java3d.PickCylinderSegment; +import org.scijava.java3d.PickPoint; +import org.scijava.java3d.PickRay; +import org.scijava.java3d.PickSegment; +import org.scijava.java3d.PickShape; +import org.scijava.java3d.PointArray; +import org.scijava.java3d.QuadArray; +import org.scijava.java3d.SceneGraphPath; +import org.scijava.java3d.Shape3D; +import org.scijava.java3d.Switch; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.TriangleArray; +import org.scijava.java3d.TriangleFanArray; +import org.scijava.java3d.TriangleStripArray; +import org.scijava.vecmath.Point2d; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Point3f; +import org.scijava.vecmath.Point4d; +import org.scijava.vecmath.Tuple3d; +import org.scijava.vecmath.Vector3d; +import org.scijava.vecmath.Vector4d; import com.sun.j3d.internal.Distance; import com.sun.j3d.utils.geometry.Primitive; @@ -102,7 +102,7 @@ * 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; - * + * * PickTool.setCapabilties(Node, int) * 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/com/sun/j3d/utils/picking/PickTool.java index b3e940b..6850ecd 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/PickTool.java +++ b/src/classes/share/com/sun/j3d/utils/picking/PickTool.java @@ -39,27 +39,27 @@ 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; +import org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.CompressedGeometry; +import org.scijava.java3d.Geometry; +import org.scijava.java3d.GeometryArray; +import org.scijava.java3d.IndexedGeometryArray; +import org.scijava.java3d.Locale; +import org.scijava.java3d.Morph; +import org.scijava.java3d.Node; +import org.scijava.java3d.PickBounds; +import org.scijava.java3d.PickConeRay; +import org.scijava.java3d.PickConeSegment; +import org.scijava.java3d.PickCylinderRay; +import org.scijava.java3d.PickCylinderSegment; +import org.scijava.java3d.PickRay; +import org.scijava.java3d.PickSegment; +import org.scijava.java3d.PickShape; +import org.scijava.java3d.SceneGraphPath; +import org.scijava.java3d.Shape3D; +import org.scijava.vecmath.Point3d; +import org.scijava.vecmath.Vector3d; /** * The base class for picking operations. @@ -96,7 +96,7 @@ * * *

The utility method - * + * * PickTool.setCapabilities(Node, int) * can be used before the scene graph is * made live to set the @@ -257,7 +257,7 @@ public Locale setBranchGroup (Locale l) { * 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.scijava.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/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java index 7aecb25..6863657 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java @@ -44,14 +44,14 @@ 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.scijava.java3d.Behavior; +import org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.TransformGroup; +import org.scijava.java3d.WakeupCriterion; +import org.scijava.java3d.WakeupOnAWTEvent; +import org.scijava.java3d.WakeupOr; import com.sun.j3d.utils.picking.PickCanvas; import com.sun.j3d.utils.picking.PickTool; diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java index f28d436..39ed217 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java @@ -39,11 +39,11 @@ 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 org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; import com.sun.j3d.utils.behaviors.mouse.MouseRotate; diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java index 0768579..542c262 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java @@ -39,11 +39,11 @@ 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 org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehavior; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java index 9276560..bf75264 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java @@ -39,11 +39,11 @@ 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 org.scijava.java3d.Bounds; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.Transform3D; +import org.scijava.java3d.TransformGroup; import com.sun.j3d.utils.behaviors.mouse.MouseBehavior; import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback; diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java index 5678bd0..f7df6cb 100644 --- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java +++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java @@ -39,7 +39,7 @@ package com.sun.j3d.utils.picking.behaviors; -import javax.media.j3d.TransformGroup; +import org.scijava.java3d.TransformGroup; /** * The PickingCallback interface allows a class to be notified when a diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java index b389e12..7789954 100644 --- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java +++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java @@ -41,9 +41,9 @@ import java.io.IOException; -import javax.media.j3d.BranchGroup; -import javax.media.j3d.Canvas3D; -import javax.media.j3d.SceneGraphObject; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; +import org.scijava.java3d.SceneGraphObject; import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl; import com.sun.j3d.utils.universe.ConfiguredUniverse; diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java index 7931429..635200b 100644 --- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java +++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java @@ -42,8 +42,8 @@ import java.io.File; import java.io.IOException; -import javax.media.j3d.BranchGroup; -import javax.media.j3d.SceneGraphObject; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.SceneGraphObject; import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl; import com.sun.j3d.utils.universe.SimpleUniverse; diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java index 6002ecf..8f1badf 100644 --- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java +++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java @@ -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.scijava.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.scijava.java3d.SceneGraphObject resolveReference( int nodeID ); } diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java index 2faee62..c655635 100644 --- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java +++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java @@ -44,8 +44,8 @@ import java.io.InputStream; import java.util.HashMap; -import javax.media.j3d.BranchGroup; -import javax.media.j3d.Canvas3D; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.Canvas3D; import com.sun.j3d.utils.scenegraph.io.retained.StreamControl; import com.sun.j3d.utils.universe.ConfiguredUniverse; diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java index 3f6564c..89b4b86 100644 --- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java +++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java @@ -43,8 +43,8 @@ import java.io.IOException; import java.util.HashMap; -import javax.media.j3d.BranchGroup; -import javax.media.j3d.DanglingReferenceException; +import org.scijava.java3d.BranchGroup; +import org.scijava.java3d.DanglingReferenceException; import com.sun.j3d.utils.scenegraph.io.retained.StreamControl; import com.sun.j3d.utils.universe.SimpleUniverse; diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java index 1ad2553..e7f3aa4 100644 --- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java +++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java @@ -47,7 +47,7 @@ * * This normally means the Behavior is not present in the classpath. */ -public class UnresolvedBehavior extends javax.media.j3d.Behavior { +public class UnresolvedBehavior extends org.scijava.java3d.Behavior { @Override public void initialize() { diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/doc-files/extensibility.html b/src/classes/share/com/sun/j3d/utils/scenegraph/io/doc-files/extensibility.html index 113cd9b..8670982 100644 --- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/doc-files/extensibility.html +++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/doc-files/extensibility.html @@ -66,13 +66,13 @@

the original object.

For example: 


-public class MyBranchGroup extends javax.media.j3d.BranchGroup {
+public class MyBranchGroup extends org.scijava.java3d.BranchGroup {
     private int myData;
     ....
 }

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.scijava.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 @@

IO are show....

Behavior Example


-public class BehaviorIO extends javax.media.j3d.Behavior implements SceneGraphIO
+public class BehaviorIO extends org.scijava.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/retained/Controller.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/Controller.java
index 748cd65..2eec37d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/Controller.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/Controller.java
@@ -50,29 +50,29 @@
 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 org.scijava.java3d.BoundingBox;
+import org.scijava.java3d.BoundingPolytope;
+import org.scijava.java3d.BoundingSphere;
+import org.scijava.java3d.Bounds;
+import org.scijava.java3d.BranchGroup;
+import org.scijava.java3d.Canvas3D;
+import org.scijava.java3d.CapabilityNotSetException;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.SharedGroup;
+import org.scijava.java3d.Transform3D;
+import org.scijava.vecmath.Color3f;
+import org.scijava.vecmath.Color4f;
+import org.scijava.vecmath.Matrix4d;
+import org.scijava.vecmath.Point3d;
+import org.scijava.vecmath.Point3f;
+import org.scijava.vecmath.Quat4f;
+import org.scijava.vecmath.Tuple3d;
+import org.scijava.vecmath.Tuple3f;
+import org.scijava.vecmath.Tuple4d;
+import org.scijava.vecmath.Tuple4f;
+import org.scijava.vecmath.Vector3f;
+import org.scijava.vecmath.Vector4d;
+import org.scijava.vecmath.Vector4f;
 
 import com.sun.j3d.utils.scenegraph.io.NamedObjectException;
 import com.sun.j3d.utils.scenegraph.io.ObjectNotLoadedException;
@@ -562,68 +562,68 @@ private int getStateID( SceneGraphObjectState state ) {
     // 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.scijava.java3d.Alpha.class,
+        org.scijava.java3d.Appearance.class,
+        org.scijava.java3d.Billboard.class,
+        org.scijava.java3d.BranchGroup.class,
+        org.scijava.java3d.ColoringAttributes.class,
+        org.scijava.java3d.ConeSound.class,
+        org.scijava.java3d.DecalGroup.class,
+        org.scijava.java3d.DirectionalLight.class,
+        org.scijava.java3d.DistanceLOD.class,
+        org.scijava.java3d.ExponentialFog.class,
+        org.scijava.java3d.Font3D.class,
+        org.scijava.java3d.Group.class,
+        org.scijava.java3d.ImageComponent2D.class,
+        org.scijava.java3d.ImageComponent3D.class,
+        org.scijava.java3d.IndexedLineArray.class,
+        org.scijava.java3d.IndexedLineStripArray.class,
+        org.scijava.java3d.IndexedPointArray.class,
+        org.scijava.java3d.IndexedQuadArray.class,
+        org.scijava.java3d.IndexedTriangleArray.class,
+        org.scijava.java3d.IndexedTriangleFanArray.class,
+        org.scijava.java3d.IndexedTriangleStripArray.class,
+        org.scijava.java3d.LinearFog.class,
+        org.scijava.java3d.LineArray.class,
+        org.scijava.java3d.LineAttributes.class,
+        org.scijava.java3d.LineStripArray.class,
+        org.scijava.java3d.Link.class,
+        org.scijava.java3d.Material.class,
+        org.scijava.java3d.Morph.class,
+        org.scijava.java3d.OrderedGroup.class,
+        org.scijava.java3d.OrientedShape3D.class,
+        org.scijava.java3d.PathInterpolator.class,
+        org.scijava.java3d.PointArray.class,
+        org.scijava.java3d.PointAttributes.class,
+        org.scijava.java3d.PositionInterpolator.class,
+        org.scijava.java3d.PositionPathInterpolator.class,
+        org.scijava.java3d.QuadArray.class,
+        org.scijava.java3d.RenderingAttributes.class,
+        org.scijava.java3d.RotationInterpolator.class,
+        org.scijava.java3d.RotationPathInterpolator.class,
+        org.scijava.java3d.RotPosPathInterpolator.class,
+        org.scijava.java3d.RotPosScalePathInterpolator.class,
+        org.scijava.java3d.ScaleInterpolator.class,
+        org.scijava.java3d.Shape3D.class,
+        org.scijava.java3d.SharedGroup.class,
+        org.scijava.java3d.Soundscape.class,
+        org.scijava.java3d.SpotLight.class,
+        org.scijava.java3d.Switch.class,
+        org.scijava.java3d.SwitchValueInterpolator.class,
+        org.scijava.java3d.Text3D.class,
+        org.scijava.java3d.Texture2D.class,
+        org.scijava.java3d.Texture3D.class,
+        org.scijava.java3d.TextureAttributes.class,
+        org.scijava.java3d.TextureCubeMap.class,
+        org.scijava.java3d.TextureUnitState.class,
+        org.scijava.java3d.TransformGroup.class,
+        org.scijava.java3d.TransformInterpolator.class,
+        org.scijava.java3d.TransparencyAttributes.class,
+        org.scijava.java3d.TransparencyInterpolator.class,
+        org.scijava.java3d.TriangleArray.class,
+        org.scijava.java3d.TriangleFanArray.class,
+        org.scijava.java3d.TriangleStripArray.class,
+        org.scijava.java3d.ViewPlatform.class
     };
 
     public Class getNodeClassFromID( int classID ) {
@@ -635,7 +635,7 @@ public Class getNodeClassFromID( int classID ) {
 
     // TODO Use a HashMap to eliminate the linear search for the class
     //
-    public int getNodeClassID( javax.media.j3d.SceneGraphObject node ) {
+    public int getNodeClassID( org.scijava.java3d.SceneGraphObject node ) {
 
         int ret = -1;
         Class cl = node.getClass();
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
index 5a7839c..f222b6b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
@@ -44,9 +44,9 @@
 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.scijava.java3d.BranchGroup;
+import org.scijava.java3d.Canvas3D;
+import org.scijava.java3d.CapabilityNotSetException;
 
 import com.sun.j3d.utils.scenegraph.io.UnsupportedUniverseException;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
index 8b1dc00..db647bc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
@@ -44,7 +44,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 
-import javax.media.j3d.BranchGroup;
+import org.scijava.java3d.BranchGroup;
 
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
@@ -126,7 +126,7 @@ public void writeBranchGraph( BranchGroup bg, java.io.Serializable userData ) th
             symbolTable.endUnsavedNodeComponentFrame();
 
             if (symbolTable.branchGraphHasDependencies( symbol.branchGraphID ))
-                throw new javax.media.j3d.DanglingReferenceException();
+                throw new org.scijava.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/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
index 2eb441e..c4a2f91 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
@@ -49,7 +49,7 @@
 import java.util.ListIterator;
 import java.util.Stack;
 
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.NamedObjectException;
 import com.sun.j3d.utils.scenegraph.io.ObjectNotLoadedException;
@@ -343,7 +343,7 @@ public SymbolTableData createSymbol( SceneGraphObject node ) {
             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.scijava.java3d.Node) {
             throw new RuntimeException( "Object already in Symbol table "+ node );
         }
 
@@ -500,7 +500,7 @@ public int addReference( SceneGraphObject node ) {
         SymbolTableData symbol = getSymbol( node );
 
         if (symbol==null) {
-            if (node instanceof javax.media.j3d.Node) {
+            if (node instanceof org.scijava.java3d.Node) {
                 symbol = createDanglingSymbol( node );
                 if (symbol.branchGraphID != currentBranchGraphID  ) {
                     //System.out.println("------------- Adding Reference "+symbol.nodeID+" "+node );  // TODO - remove
@@ -527,12 +527,12 @@ public int addReference( SymbolTableData symbol ) {
                 sharedNodes.add( symbol );
             symbol.referenceCount++;
 
-            if (symbol.j3dNode instanceof javax.media.j3d.NodeComponent && symbol.referenceCount>1) {
+            if (symbol.j3dNode instanceof org.scijava.java3d.NodeComponent && symbol.referenceCount>1) {
                 ((NodeComponentState)symbol.nodeState).addSubReference();
             }
 
             if (symbol.branchGraphID != currentBranchGraphID &&
-                symbol.j3dNode instanceof javax.media.j3d.Node ) {
+                symbol.j3dNode instanceof org.scijava.java3d.Node ) {
                     // System.out.println("------------- Adding Reference "+symbol.nodeID+" "+symbol.j3dNode );    // TODO - remove
                     addInterGraphDependency( symbol );
                 }
@@ -840,7 +840,7 @@ public void clearUnshared() {
  * Use only during the load cycle
  */
     @Override
-    public javax.media.j3d.SceneGraphObject resolveReference(int nodeID) {
+    public org.scijava.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/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
index 0122290..49b9974 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
index 047c125..c6e6392 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
 
 import com.sun.j3d.utils.behaviors.interpolators.KBKeyFrame;
 import com.sun.j3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
@@ -109,7 +109,7 @@ public void readConstructorParams( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     keyFrames.getClass() },
@@ -121,7 +121,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
index 13679b2..edb055f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
 
 import com.sun.j3d.utils.behaviors.interpolators.RotPosScaleTCBSplinePathInterpolator;
 import com.sun.j3d.utils.behaviors.interpolators.TCBKeyFrame;
@@ -105,7 +105,7 @@ public void readConstructorParams( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     keyFrames.getClass() },
@@ -117,7 +117,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
index bb00489..0bad5a2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TransformGroup;
+import org.scijava.java3d.TransformGroup;
 
 import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
index bbbf25a..6248e66 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.Appearance;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.geometry.Box;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
@@ -153,7 +153,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
index cc86626..bdf489a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Shape3D;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Shape3D;
 
 import com.sun.j3d.utils.geometry.ColorCube;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
@@ -92,7 +92,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
index 8cb3133..81b2f84 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.Appearance;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.geometry.Cone;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
@@ -138,7 +138,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
index 0be313d..34e6345 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.Appearance;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.geometry.Cylinder;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
@@ -141,7 +141,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/SphereState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
index d6ebaf9..3ba2d43 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.Appearance;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.geometry.Sphere;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
@@ -108,7 +108,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
                                                 Float.TYPE,
                                                 Integer.TYPE,
                                                 Integer.TYPE,
-                                                javax.media.j3d.Appearance.class },
+                                                org.scijava.java3d.Appearance.class },
                                         new Object[] {
                                                 new Float( radius ),
                                                 new Integer( primflags ),
@@ -119,7 +119,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
index 41cff56..518b8a0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
@@ -43,9 +43,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Color3f;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Shape3D;
+import org.scijava.vecmath.Color3f;
 
 import com.sun.j3d.utils.geometry.Text2D;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
@@ -134,7 +134,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
index 6b0e547..697daae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
@@ -39,7 +39,7 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
 
-public class ImageComponent2DURL extends javax.media.j3d.ImageComponent2D {
+public class ImageComponent2DURL extends org.scijava.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/ImageComponent2DURLState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
index 33b4c56..0425a1f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -90,7 +90,7 @@ protected SceneGraphObject createNode( Class j3dClass ) {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
index fcd9000..ee43a75 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
@@ -52,7 +52,7 @@ public PlatformGeometryState(SymbolTableData symbol,Controller control) {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
index e550fd2..737a741 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
@@ -45,13 +45,13 @@
 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 org.scijava.java3d.BranchGroup;
+import org.scijava.java3d.Canvas3D;
+import org.scijava.java3d.HiResCoord;
+import org.scijava.java3d.Locale;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.vecmath.Matrix4d;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -267,8 +267,8 @@ public void detachAllGraphs() {
                     ((BranchGroup)symbol.j3dNode).detach();
                 }
             }
-        } catch( javax.media.j3d.CapabilityNotSetException e ) {
-            throw new javax.media.j3d.CapabilityNotSetException(
+        } catch( org.scijava.java3d.CapabilityNotSetException e ) {
+            throw new org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
index 6a2123c..eec4625 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
@@ -51,7 +51,7 @@ public ViewerAvatarState(SymbolTableData symbol,Controller control) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
index cb91547..36abff5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.Alpha;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
index a383ea3..8bfdbec 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
@@ -43,11 +43,11 @@
 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.scijava.java3d.AlternateAppearance;
+import org.scijava.java3d.Appearance;
+import org.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.Group;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
index af1fd5d..88082a8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
@@ -39,7 +39,7 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.AmbientLight;
+import org.scijava.java3d.AmbientLight;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -50,7 +50,7 @@ public AmbientLightState( SymbolTableData symbol, Controller control ) {
 	super( symbol, control );
     }
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
index 16679b9..7ad601f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
@@ -43,18 +43,18 @@
 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 org.scijava.java3d.Appearance;
+import org.scijava.java3d.ColoringAttributes;
+import org.scijava.java3d.LineAttributes;
+import org.scijava.java3d.Material;
+import org.scijava.java3d.PointAttributes;
+import org.scijava.java3d.PolygonAttributes;
+import org.scijava.java3d.RenderingAttributes;
+import org.scijava.java3d.TexCoordGeneration;
+import org.scijava.java3d.Texture;
+import org.scijava.java3d.TextureAttributes;
+import org.scijava.java3d.TextureUnitState;
+import org.scijava.java3d.TransparencyAttributes;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -184,7 +184,7 @@ public void buildGraph() {
      }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
index 1763b9e..716259c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.AuralAttributes;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.AuralAttributes;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
index c45d23d..41e9b2d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BackgroundSound;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.BackgroundSound;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
index 38eb163..8076593 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
@@ -43,12 +43,12 @@
 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.scijava.java3d.Background;
+import org.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.BranchGroup;
+import org.scijava.java3d.ImageComponent2D;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.vecmath.Color3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
index 6f1ed3c..a18a45e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.Behavior;
+import org.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
index e568ed2..7e2be7e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
@@ -43,11 +43,11 @@
 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.scijava.java3d.Billboard;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.vecmath.Point3f;
+import org.scijava.vecmath.Vector3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
index ca1ef6f..3647cdd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
index 619b6c2..00ddb99 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
@@ -39,8 +39,8 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.BranchGroup;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
index 07a7c44..cbab2c4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Clip;
+import org.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.Clip;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
index 28ebf36..131d165 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.ColorInterpolator;
+import org.scijava.java3d.Material;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.vecmath.Color3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -101,8 +101,8 @@ public void buildGraph() {
 
     @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.scijava.java3d.Alpha.class,
+                                                    org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
index c44e908..c205739 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
@@ -43,9 +43,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ColoringAttributes;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
+import org.scijava.java3d.ColoringAttributes;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.vecmath.Color3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
index 07641ca..a589951 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.CompressedGeometry;
+import org.scijava.java3d.CompressedGeometryHeader;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.vecmath.Point3d;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
index bd7658f..df3861b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
@@ -43,9 +43,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ConeSound;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Vector3f;
+import org.scijava.java3d.ConeSound;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.vecmath.Vector3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
index 7d63f01..230744d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
@@ -39,8 +39,8 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.DecalGroup;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.DecalGroup;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
index 307a593..8f71c0b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DepthComponentFloat;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.DepthComponentFloat;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -106,7 +106,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
index a263585..50a4f90 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DepthComponentInt;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.DepthComponentInt;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -106,7 +106,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
index 94efc93..f149541 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DepthComponentNative;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.DepthComponentNative;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -87,7 +87,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
index 0a314cd..d7ffcab 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DirectionalLight;
-import javax.vecmath.Vector3f;
+import org.scijava.java3d.DirectionalLight;
+import org.scijava.vecmath.Vector3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -72,7 +72,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
index 3b53b66..9b69097 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
@@ -43,9 +43,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DistanceLOD;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Point3f;
+import org.scijava.java3d.DistanceLOD;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.vecmath.Point3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -102,7 +102,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
index ce29ba5..e4969b4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ExponentialFog;
+import org.scijava.java3d.ExponentialFog;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -69,7 +69,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
index 2658f5d..630ca7b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.Fog;
+import org.scijava.java3d.Group;
+import org.scijava.vecmath.Color3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
index 13b3582..a3eb263 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
@@ -46,9 +46,9 @@
 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.scijava.java3d.Font3D;
+import org.scijava.java3d.FontExtrusion;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
index 6e13ba8..a454ee0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
@@ -51,19 +51,19 @@
 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 org.scijava.java3d.GeometryArray;
+import org.scijava.java3d.GeometryStripArray;
+import org.scijava.java3d.IndexedGeometryArray;
+import org.scijava.java3d.J3DBuffer;
+import org.scijava.vecmath.Color3b;
+import org.scijava.vecmath.Color3f;
+import org.scijava.vecmath.Color4b;
+import org.scijava.vecmath.Color4f;
+import org.scijava.vecmath.Point3d;
+import org.scijava.vecmath.Point3f;
+import org.scijava.vecmath.TexCoord2f;
+import org.scijava.vecmath.TexCoord3f;
+import org.scijava.vecmath.Vector3f;
 
 import com.sun.j3d.internal.BufferWrapper;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
index 71e09b3..26fb0c8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.GeometryStripArray;
+import org.scijava.java3d.GeometryStripArray;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
index 6d9c97f..f85ff10 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Group;
-import javax.media.j3d.Node;
+import org.scijava.java3d.Group;
+import org.scijava.java3d.Node;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -136,7 +136,7 @@ public void cleanup() {
   }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
index a5c654a..3cb12c2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
@@ -44,8 +44,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.ImageComponent2D;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -100,7 +100,7 @@ protected SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
index 25a68b1..fd80c39 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
@@ -44,8 +44,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ImageComponent3D;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.ImageComponent3D;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -123,7 +123,7 @@ protected SceneGraphObject createNode( Class j3dClass ) {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
index b55bccc..f3e6ce8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
@@ -61,7 +61,7 @@
 import java.util.zip.GZIPOutputStream;
 
 import javax.imageio.ImageIO;
-import javax.media.j3d.ImageComponent;
+import org.scijava.java3d.ImageComponent;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
index 8142739..2558d78 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
@@ -47,9 +47,9 @@
 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.scijava.java3d.GeometryArray;
+import org.scijava.java3d.IndexedGeometryArray;
+import org.scijava.java3d.IndexedGeometryStripArray;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
index 45692e8..5a282da 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedGeometryStripArray;
+import org.scijava.java3d.IndexedGeometryStripArray;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
index f5ab90c..ac912d9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedLineArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.IndexedLineArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -81,7 +81,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
index bd906ba..0b3d921 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
@@ -39,8 +39,8 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.IndexedLineStripArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.IndexedLineStripArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -69,7 +69,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
index 767708c..4ee57b9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedPointArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.IndexedPointArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -82,7 +82,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
index fa4f2eb..c3880da 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedQuadArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.IndexedQuadArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -81,7 +81,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
index b1b96dc..377afaf 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedTriangleArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.IndexedTriangleArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -81,7 +81,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
index 1803ccb..cc9cab6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedTriangleFanArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.IndexedTriangleFanArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -84,7 +84,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
index 3377516..20015b9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedTriangleStripArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.IndexedTriangleStripArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -84,7 +84,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
index ad6d85a..83ccc7b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Interpolator;
+import org.scijava.java3d.Alpha;
+import org.scijava.java3d.Interpolator;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
index 9c54cbb..4c62869 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.LOD;
-import javax.media.j3d.Switch;
+import org.scijava.java3d.LOD;
+import org.scijava.java3d.Switch;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
index db2da52..0385de4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.Group;
+import org.scijava.java3d.Light;
+import org.scijava.vecmath.Color3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
index 8d663fe..5cdf5ae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
@@ -39,8 +39,8 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.LineArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.LineArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -67,7 +67,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
index 14be6e3..f01830a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.LineAttributes;
+import org.scijava.java3d.LineAttributes;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -77,7 +77,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
index 546f293..7df41ae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
@@ -39,8 +39,8 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.LineStripArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.LineStripArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -69,7 +69,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
index de9fa2a..26bcedd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.LinearFog;
+import org.scijava.java3d.LinearFog;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -71,7 +71,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
index e64305f..a71f53b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Link;
-import javax.media.j3d.SharedGroup;
+import org.scijava.java3d.Link;
+import org.scijava.java3d.SharedGroup;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -96,7 +96,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
index 5981e87..ad94468 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Material;
-import javax.vecmath.Color3f;
+import org.scijava.java3d.Material;
+import org.scijava.vecmath.Color3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -86,7 +86,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
index 5c8c42f..46ec6db 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
@@ -45,7 +45,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.media.j3d.MediaContainer;
+import org.scijava.java3d.MediaContainer;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -109,7 +109,7 @@ public void readObject(DataInput in) throws IOException {
 	}
 
 	@Override
-	protected javax.media.j3d.SceneGraphObject createNode() {
+	protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
index 3d5c0e9..347e423 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.Group;
+import org.scijava.java3d.ModelClip;
+import org.scijava.vecmath.Vector4d;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -124,7 +124,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
index beff388..e1109a5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.Appearance;
+import org.scijava.java3d.GeometryArray;
+import org.scijava.java3d.Morph;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -126,7 +126,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
index 96e2c7b..61bf9c4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.NodeComponent;
+import org.scijava.java3d.NodeComponent;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
index fc3fb84..d3f4506 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Node;
+import org.scijava.java3d.Node;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
index bdab412..d40a56a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -92,7 +92,7 @@ public SymbolTableData getSymbol() {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
index 49ee4b7..20d9c92 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.OrderedGroup;
+import org.scijava.java3d.OrderedGroup;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -78,7 +78,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
index bb1685b..102db54 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
@@ -43,9 +43,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.OrientedShape3D;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.scijava.java3d.OrientedShape3D;
+import org.scijava.vecmath.Point3f;
+import org.scijava.vecmath.Vector3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -87,7 +87,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
index 42ccb01..ed6489f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PathInterpolator;
+import org.scijava.java3d.PathInterpolator;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
index c999a62..c08bbed 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PointAttributes;
+import org.scijava.java3d.PointAttributes;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -71,7 +71,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
index 1d63077..f6e6a4b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PointLight;
-import javax.vecmath.Point3f;
+import org.scijava.java3d.PointLight;
+import org.scijava.vecmath.Point3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -74,7 +74,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
index f34ea1b..1f2ed99 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PointSound;
-import javax.vecmath.Point3f;
+import org.scijava.java3d.PointSound;
+import org.scijava.vecmath.Point3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -92,7 +92,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
index 0d39fc9..33c8ba6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PolygonAttributes;
+import org.scijava.java3d.PolygonAttributes;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -77,7 +77,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
index c9d3de3..a7a9e40 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.PositionInterpolator;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TransformGroup;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -74,14 +74,14 @@ public void readObject( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class },
                                       new Object[] { null,
                                                      null } );
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
index 71fa5f6..843a6c3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
@@ -43,11 +43,11 @@
 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.scijava.java3d.PositionPathInterpolator;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.vecmath.Point3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -84,7 +84,7 @@ public void readConstructorParams( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -97,7 +97,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
index d3969dc..2900906 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.QuadArray;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -81,7 +81,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
index 199acd3..e874010 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
@@ -45,10 +45,10 @@
 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.scijava.java3d.DepthComponent;
+import org.scijava.java3d.ImageComponent2D;
+import org.scijava.java3d.Raster;
+import org.scijava.vecmath.Point3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -134,7 +134,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
index 89b262e..22ee289 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.RenderingAttributes;
+import org.scijava.java3d.RenderingAttributes;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -83,7 +83,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
index cc05dba..aa4319d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
@@ -43,12 +43,12 @@
 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.scijava.java3d.RotPosPathInterpolator;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.vecmath.Point3f;
+import org.scijava.vecmath.Quat4f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -95,7 +95,7 @@ public void readConstructorParams( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -111,7 +111,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
index 2a91071..3bffbc6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
@@ -43,12 +43,12 @@
 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.scijava.java3d.RotPosScalePathInterpolator;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.vecmath.Point3f;
+import org.scijava.vecmath.Quat4f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -101,7 +101,7 @@ public void readConstructorParams( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -119,7 +119,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
index 6ca5e1b..7a97d87 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.Alpha;
+import org.scijava.java3d.RotationInterpolator;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TransformGroup;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -83,7 +83,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
index be3ed34..f1f5c9e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
@@ -43,11 +43,11 @@
 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.scijava.java3d.RotationPathInterpolator;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.vecmath.Quat4f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -87,7 +87,7 @@ public void readConstructorParams( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -101,7 +101,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
index 1dfb902..4e80bab 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.ScaleInterpolator;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TransformGroup;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -74,7 +74,7 @@ public void readObject( DataInput in ) throws IOException {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.scijava.java3d.Alpha.class,
                                                     TransformGroup.class },
                                       new Object[] { null,
                                                      null } );
@@ -82,7 +82,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
index ec91c2f..3460528 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
@@ -49,7 +49,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 
-import javax.media.j3d.SceneGraphObject;
+import org.scijava.java3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
index abd22a9..3b14e68 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.Appearance;
+import org.scijava.java3d.Geometry;
+import org.scijava.java3d.Shape3D;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -113,7 +113,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
index bcc95e9..56dbf7b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
@@ -39,7 +39,7 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.SharedGroup;
+import org.scijava.java3d.SharedGroup;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -52,7 +52,7 @@ public SharedGroupState(SymbolTableData symbol,Controller control) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
index 79545be..d52622a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.MediaContainer;
+import org.scijava.java3d.Sound;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
index 396b997..9b5479a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.AuralAttributes;
+import org.scijava.java3d.BoundingLeaf;
+import org.scijava.java3d.Soundscape;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -95,7 +95,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
index 31d5f9f..6b63bb6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.PointLight;
+import org.scijava.java3d.SpotLight;
+import org.scijava.vecmath.Point3f;
+import org.scijava.vecmath.Vector3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -97,7 +97,7 @@ public void readObject(DataInput in) throws IOException {
 	}
 
 	@Override
-	protected javax.media.j3d.SceneGraphObject createNode() {
+	protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
index e828f17..9ca76a4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Switch;
+import org.scijava.java3d.Switch;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -72,7 +72,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
index 9150bb9..4d701a3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Switch;
+import org.scijava.java3d.SwitchValueInterpolator;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -88,14 +88,14 @@ public void buildGraph() {
 
     @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.scijava.java3d.Alpha.class,
+                                                    org.scijava.java3d.Switch.class },
                                       new Object[] { null,
                                                      null } );
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
index 43262e9..eb2cf82 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TexCoordGeneration;
-import javax.vecmath.Vector4f;
+import org.scijava.java3d.TexCoordGeneration;
+import org.scijava.vecmath.Vector4f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -87,7 +87,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
index 493fd7b..a9e5da3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
@@ -43,9 +43,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Font3D;
-import javax.media.j3d.Text3D;
-import javax.vecmath.Point3f;
+import org.scijava.java3d.Font3D;
+import org.scijava.java3d.Text3D;
+import org.scijava.vecmath.Point3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -116,7 +116,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
index de146ea..64ea68d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.ImageComponent2D;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Texture2D;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -135,7 +135,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
index 30b025a..95c0320 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Texture3D;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.Texture3D;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -98,7 +98,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
index 3ed92e6..cbbaabc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.TextureAttributes;
+import org.scijava.java3d.Transform3D;
+import org.scijava.vecmath.Color4f;
+import org.scijava.vecmath.Matrix4d;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -129,7 +129,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
index 9c45b7b..54558e5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
@@ -39,10 +39,10 @@
 
 package com.sun.j3d.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.scijava.java3d.ImageComponent;
+import org.scijava.java3d.ImageComponent2D;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TextureCubeMap;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -108,7 +108,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
index eae418b..0c121bb 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
@@ -43,11 +43,11 @@
 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.scijava.java3d.ImageComponent;
+import org.scijava.java3d.Texture;
+import org.scijava.java3d.TextureCubeMap;
+import org.scijava.vecmath.Color4f;
+import org.scijava.vecmath.Point3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
index 4fd7862..c3649bb 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.TexCoordGeneration;
+import org.scijava.java3d.Texture;
+import org.scijava.java3d.TextureAttributes;
+import org.scijava.java3d.TextureUnitState;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -102,7 +102,7 @@ public void buildGraph() {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
index 02c3615..d9b9507 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -83,7 +83,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
index 20b1758..4c7ead2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.TransformInterpolator;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.java3d.TransformInterpolator;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
index 0c45116..0216557 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TransparencyAttributes;
+import org.scijava.java3d.TransparencyAttributes;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -75,7 +75,7 @@ public void readObject( DataInput in ) throws IOException {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
index 99d67eb..d9c03e7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
@@ -43,9 +43,9 @@
 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.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TransparencyAttributes;
+import org.scijava.java3d.TransparencyInterpolator;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -97,14 +97,14 @@ public void buildGraph() {
 
     @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.scijava.java3d.Alpha.class,
+                                                    org.scijava.java3d.TransparencyAttributes.class },
                                       new Object[] { null,
                                                      null } );
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
index 858e02b..85d29ce 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TriangleArray;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TriangleArray;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -81,7 +81,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
index 7489c8a..935dd9a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TriangleFanArray;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TriangleFanArray;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -83,7 +83,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
index d732071..8b882d4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
@@ -43,8 +43,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TriangleStripArray;
+import org.scijava.java3d.SceneGraphObject;
+import org.scijava.java3d.TriangleStripArray;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -84,7 +84,7 @@ public SceneGraphObject createNode( Class j3dClass ) {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.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/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
index 201c87e..0db8e8d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
@@ -43,7 +43,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ViewPlatform;
+import org.scijava.java3d.ViewPlatform;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
@@ -75,7 +75,7 @@ public void readObject( DataInput in ) throws IOException {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.scijava.java3d.SceneGraphObject createNode() {
         return new ViewPlatform();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java b/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
index 8af44fc..8a6c99b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
@@ -41,7 +41,7 @@
 
 import java.util.Comparator;
 
-import javax.media.j3d.TransparencySortGeom;
+import org.scijava.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/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
index b50d5ea..a826fbc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
@@ -41,9 +41,9 @@
 
 import java.util.Comparator;
 
-import javax.media.j3d.TransparencySortGeom;
-import javax.media.j3d.TransparencySortMap;
-import javax.media.j3d.View;
+import org.scijava.java3d.TransparencySortGeom;
+import org.scijava.java3d.TransparencySortMap;
+import org.scijava.java3d.View;
 
 /**
  * This class controls the Transparency Sorting scheme used by Java 3D when
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
index a7ae5af..de6ce5d 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
@@ -43,8 +43,8 @@
 import java.text.FieldPosition;
 import java.util.Collection;
 
-import javax.vecmath.Matrix3d;
-import javax.vecmath.Matrix4d;
+import org.scijava.vecmath.Matrix3d;
+import org.scijava.vecmath.Matrix4d;
 
 /**
  * Contains the elements which compose a configuration file command,
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
index 2102acc..6a0fe04 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
@@ -38,7 +38,7 @@
  */
 
 package com.sun.j3d.utils.universe ;
-import javax.media.j3d.InputDevice;
+import org.scijava.java3d.InputDevice;
 
 /**
  * Mostly empty now; ConfigObject provides all required methods.
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
index cd76a71..78786f4 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
@@ -39,10 +39,10 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.PhysicalBody;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3d;
+import org.scijava.java3d.PhysicalBody;
+import org.scijava.java3d.Transform3D;
+import org.scijava.vecmath.Matrix4d;
+import org.scijava.vecmath.Point3d;
 
 class ConfigPhysicalBody extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
index b9144ab..47849f9 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
@@ -41,11 +41,11 @@
 
 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.scijava.java3d.InputDevice;
+import org.scijava.java3d.PhysicalEnvironment;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.View;
+import org.scijava.vecmath.Matrix4d;
 
 class ConfigPhysicalEnvironment extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
index 4748675..3c1ed25 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
@@ -41,12 +41,12 @@
 
 import java.awt.Window;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.View;
+import org.scijava.java3d.Canvas3D;
+import org.scijava.java3d.View;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point2d;
+import org.scijava.vecmath.Matrix4d;
+import org.scijava.vecmath.Point2d;
 
 class ConfigScreen extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
index ba3a407..1c2f598 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
@@ -39,8 +39,8 @@
 
 package com.sun.j3d.utils.universe ;
 
-import javax.media.j3d.Sensor;
-import javax.vecmath.Point3d;
+import org.scijava.java3d.Sensor;
+import org.scijava.vecmath.Point3d;
 
 class ConfigSensor extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
index 7673343..df813b2 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
@@ -43,14 +43,14 @@
 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.scijava.java3d.BoundingSphere;
+import org.scijava.java3d.Transform3D;
+import org.scijava.vecmath.Matrix3d;
+import org.scijava.vecmath.Matrix4d;
+import org.scijava.vecmath.Point2d;
+import org.scijava.vecmath.Point3d;
+import org.scijava.vecmath.Point4d;
+import org.scijava.vecmath.Vector3d;
 
 class ConfigSexpression {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
index 00a3c0b..92f2f3a 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
@@ -43,10 +43,10 @@
 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.scijava.java3d.PhysicalBody;
+import org.scijava.java3d.PhysicalEnvironment;
+import org.scijava.java3d.View;
+import org.scijava.vecmath.Point3d;
 
 class ConfigView extends ConfigObject {
     /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
index 69320fb..45a0426 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
@@ -41,12 +41,12 @@
 
 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.scijava.java3d.Node;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.java3d.View;
+import org.scijava.java3d.ViewPlatform;
+import org.scijava.vecmath.Matrix4d;
 
 class ConfigViewPlatform extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
index 2b0d10b..0334fb5 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
@@ -39,9 +39,9 @@
 
 package com.sun.j3d.utils.universe ;
 
-import javax.media.j3d.Bounds;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Matrix4d;
+import org.scijava.java3d.Bounds;
+import org.scijava.java3d.Transform3D;
+import org.scijava.vecmath.Matrix4d;
 
 import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java b/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
index 7b84b25..81082c4 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
@@ -44,10 +44,10 @@
 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.scijava.java3d.Canvas3D;
+import org.scijava.java3d.HiResCoord;
+import org.scijava.java3d.Locale;
+import org.scijava.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/com/sun/j3d/utils/universe/LocaleFactory.java
index c00c030..2f95f54 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
@@ -39,9 +39,9 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.HiResCoord;
-import javax.media.j3d.Locale;
-import javax.media.j3d.VirtualUniverse;
+import org.scijava.java3d.HiResCoord;
+import org.scijava.java3d.Locale;
+import org.scijava.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/com/sun/j3d/utils/universe/MultiTransformGroup.java
index 173ebe3..b94bb97 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
@@ -39,7 +39,7 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.TransformGroup;
+import org.scijava.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/com/sun/j3d/utils/universe/PlatformGeometry.java
index 8f0c037..bfdc3e1 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
@@ -39,7 +39,7 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.BranchGroup;
+import org.scijava.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/com/sun/j3d/utils/universe/SimpleUniverse.java
index 761ac2e..56833b8 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
@@ -43,13 +43,13 @@
 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.scijava.java3d.BranchGroup;
+import org.scijava.java3d.Canvas3D;
+import org.scijava.java3d.GraphicsConfigTemplate3D;
+import org.scijava.java3d.HiResCoord;
+import org.scijava.java3d.Locale;
+import org.scijava.java3d.View;
+import org.scijava.java3d.VirtualUniverse;
 
 import com.sun.j3d.utils.geometry.Primitive;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java b/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
index feb846b..28f8189 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
@@ -53,17 +53,17 @@
 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.scijava.java3d.Canvas3D;
+import org.scijava.java3d.Node;
+import org.scijava.java3d.PhysicalBody;
+import org.scijava.java3d.PhysicalEnvironment;
+import org.scijava.java3d.Screen3D;
+import org.scijava.java3d.Sensor;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.View;
+import org.scijava.java3d.ViewPlatform;
+import org.scijava.vecmath.Point3d;
+import org.scijava.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/com/sun/j3d/utils/universe/Viewer.java
index 7553622..5531512 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/Viewer.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/Viewer.java
@@ -53,14 +53,14 @@
 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.scijava.java3d.AudioDevice;
+import org.scijava.java3d.Canvas3D;
+import org.scijava.java3d.GraphicsConfigTemplate3D;
+import org.scijava.java3d.PhysicalBody;
+import org.scijava.java3d.PhysicalEnvironment;
+import org.scijava.java3d.Screen3D;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.View;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java b/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
index 17367b3..5458741 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
@@ -39,7 +39,7 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.BranchGroup;
+import org.scijava.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/com/sun/j3d/utils/universe/ViewingPlatform.java
index e740106..c5c9a52 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
@@ -42,13 +42,13 @@
 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.scijava.java3d.BranchGroup;
+import org.scijava.java3d.Group;
+import org.scijava.java3d.Transform3D;
+import org.scijava.java3d.TransformGroup;
+import org.scijava.java3d.View;
+import org.scijava.java3d.ViewPlatform;
+import org.scijava.vecmath.Vector3d;
 
 import com.sun.j3d.internal.J3dUtilsI18N;
 import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html b/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html
index b170cc0..0500117 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html
+++ b/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html
@@ -945,7 +945,7 @@ 

 default is RELATIVE_TO_COEXISTENCE if 
 CoexistenceCenteringEnable is false,
 otherwise the normal default applies.  See the
-setWindowEyepointPolicy View method.
+setWindowEyepointPolicy View method.
 

 For the RELATIVE_TO_SCREEN and RELATIVE_TO_WINDOW
 policies, the eyepoint is set by using the setLeftManualEyeInImagePlate() and
@@ -966,8 +966,8 @@ 

 values are VIRTUAL_WORLD if 
 CoexistenceCenteringEnable is false,
 otherwise the normal defaults apply.  See the
-setWindowMovementPolicy and 
-setWindowResizePolicy View methods.

+setWindowMovementPolicy and 
+setWindowResizePolicy View methods.

 
 

 CenterEyeInCoexistence

@@ -1032,16 +1032,16 @@ 

 The string values of these properties may be either PHYSICAL_EYE,
 PHYSICAL_SCREEN, VIRTUAL_EYE, or VIRTUAL_SCREEN.  The
 default policies are PHYSICAL_EYE.  See the
-setFrontClipPolicy and 
-setBackClipPolicy View methods.
+setFrontClipPolicy and 
+setBackClipPolicy View methods.
 
 

 FrontClipDistance

 BackClipDistance

 These property values are numbers.  The defaults are 0.1 and 10.0 
 respectively. See the 
-setFrontClipDistance and 
-setBackClipDistance View methods.

+setFrontClipDistance and 
+setBackClipDistance View methods.

 

 With the default clip policies of PHYSICAL_EYE the clip distances
 are measured relative to the eye in physical units, so the clip distances
@@ -1283,13 +1283,13 @@ 

 

 SchedulingInterval

 A number indicating the scheduling interval for this behavior. See the 
-setSchedulingInterval
+setSchedulingInterval
 method of Behavior.
 
 

 HomeTransform

 See the ViewPlatformBehavior method 
-setHomeTransform.
+setHomeTransform.
 The property value must be a 4D matrix.
 

 

@@ -1447,7 +1447,7 @@ 

 

 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 
-setEuler
+setEuler
 method of Transform3D.

 

 

From dbc441832672fbeddefd6014d9b43bbe703c5533 Mon Sep 17 00:00:00 2001
From: Curtis Rueden 
Date: Wed, 18 Nov 2015 11:48:48 -0600
Subject: [PATCH 13/18] Relocate package prefix to org.scijava.java3d

This avoids a serious problem with Java 3D on OS X 10.11 "El Capitan":
it is no longer possible for users to easily delete the Java 3D 1.3
artifacts out of /System/Library/Java/Extensions, thanks to El Capitan's
new System Integrity Protection (SIP, a.k.a "rootless") feature.

So, even with the new Java 3D 1.6 on the classpath, the old Java 3D 1.3
always takes precedence because /System/Library/Java/Extensions is on
OS X's java.ext.path by default. Worse, the old Java 3D 1.3 crashes
Oracle Java 8.

I thought of two different ways to address this new difficulty:

1. Change the package prefix to avoid a clash.
2. Manually manipulate the java.ext.path.

Option 2 is a deployment-centric solution, which only solves the problem
in environments where tweaking the Java runtime parameters is possible.
It is also a pain because there is no way to simply blacklist the
undesirable directory; instead, the java.ext.path must be built from the
ground up to include all the directories which Java includes by default,
except for /System/Java/Library/Extensions. Furthermore, there _are_
libraries in said directory that might continue to be useful for ImageJ
users, such as the support for AppleScript. It would be a shame to lose
access to _all_ Apple-specific Java extensions, just because of three
bad apples (the old Java 3D 1.3 JARs).

Therefore, this commit opts for option 1.
---
 THIRDPARTY-LICENSE-DISTANCE.txt               |  2 +-
 THIRDPARTY-LICENSE-FIST.txt                   |  2 +-
 THIRDPARTY-LICENSE-MAINFRAME.txt              |  2 +-
 .../org.scijava.java3d.GeometryService        |  2 +-
 .../java3d}/ExceptionStrings.properties       |  0
 .../java3d}/audioengines/AudioEngine.java     |  2 +-
 .../java3d}/audioengines/AudioEngine3D.java   |  2 +-
 .../java3d}/audioengines/AudioEngine3DL2.java |  2 +-
 .../audioengines/AudioEngineThread.java       |  2 +-
 .../java3d}/audioengines/AuralParameters.java |  2 +-
 .../scijava/java3d}/audioengines/Sample.java  |  2 +-
 .../javasound/JSAuralParameters.java          |  4 +-
 .../audioengines/javasound/JSChannel.java     |  4 +-
 .../audioengines/javasound/JSClip.java        |  2 +-
 .../javasound/JSDirectionalSample.java        |  4 +-
 .../audioengines/javasound/JSMidi.java        |  2 +-
 .../javasound/JSPositionalSample.java         |  4 +-
 .../audioengines/javasound/JSSample.java      |  6 +--
 .../audioengines/javasound/JSStream.java      |  2 +-
 .../audioengines/javasound/JSThread.java      | 28 ++++++------
 .../javasound/JavaSoundMixer.java             |  6 +--
 .../audioengines/javasound/package.html       |  2 +-
 .../scijava/java3d}/audioengines/package.html |  2 +-
 .../scijava/java3d}/exp/swing/JCanvas3D.java  |  4 +-
 .../exp/swing/impl/AutoOffScreenCanvas3D.java |  2 +-
 .../scijava/java3d}/exp/swing/package.html    |  2 +-
 .../java3d}/internal/BufferWrapper.java       |  2 +-
 .../java3d}/internal/ByteBufferWrapper.java   |  2 +-
 .../scijava/java3d}/internal/Distance.java    |  2 +-
 .../java3d}/internal/DoubleBufferWrapper.java |  2 +-
 .../scijava/java3d}/internal/FastVector.java  |  2 +-
 .../java3d}/internal/FloatBufferWrapper.java  |  2 +-
 .../java3d}/internal/HashCodeUtil.java        |  2 +-
 .../java3d}/internal/J3dUtilsI18N.java        |  4 +-
 .../loaders/IncorrectFormatException.java     |  2 +-
 .../scijava/java3d}/loaders/Loader.java       |  4 +-
 .../scijava/java3d}/loaders/LoaderBase.java   |  2 +-
 .../loaders/ParsingErrorException.java        |  2 +-
 .../scijava/java3d}/loaders/Scene.java        |  2 +-
 .../scijava/java3d}/loaders/SceneBase.java    |  2 +-
 .../java3d}/loaders/lw3d/DebugOutput.java     |  2 +-
 .../java3d}/loaders/lw3d/EnvelopeHandler.java |  6 +--
 .../loaders/lw3d/FloatValueInterpolator.java  |  4 +-
 .../java3d}/loaders/lw3d/ImageScaler.java     |  2 +-
 .../java3d}/loaders/lw3d/J3dLwoParser.java    | 10 ++---
 .../java3d}/loaders/lw3d/LWOBFileReader.java  |  4 +-
 .../lw3d/LightIntensityPathInterpolator.java  |  2 +-
 .../java3d}/loaders/lw3d/Lw3dLoader.java      | 14 +++---
 .../java3d}/loaders/lw3d/LwLightObject.java   |  2 +-
 .../java3d}/loaders/lw3d/LwoParser.java       |  6 +--
 .../java3d}/loaders/lw3d/LwoSurface.java      |  8 ++--
 .../java3d}/loaders/lw3d/LwoTexture.java      |  6 +--
 .../java3d}/loaders/lw3d/LwsBackground.java   |  4 +-
 .../java3d}/loaders/lw3d/LwsCamera.java       |  4 +-
 .../java3d}/loaders/lw3d/LwsEnvelope.java     |  8 ++--
 .../loaders/lw3d/LwsEnvelopeFrame.java        |  2 +-
 .../lw3d/LwsEnvelopeLightIntensity.java       |  2 +-
 .../scijava/java3d}/loaders/lw3d/LwsFog.java  |  4 +-
 .../java3d}/loaders/lw3d/LwsFrame.java        |  2 +-
 .../java3d}/loaders/lw3d/LwsLight.java        |  4 +-
 .../java3d}/loaders/lw3d/LwsMotion.java       | 12 ++---
 .../java3d}/loaders/lw3d/LwsObject.java       |  6 +--
 .../java3d}/loaders/lw3d/LwsPrimitive.java    |  2 +-
 .../java3d}/loaders/lw3d/ParserObject.java    |  2 +-
 .../java3d}/loaders/lw3d/SequenceLine.java    |  6 +--
 .../java3d}/loaders/lw3d/SequenceReader.java  |  4 +-
 .../java3d}/loaders/lw3d/ShapeHolder.java     |  2 +-
 .../loaders/lw3d/SwitchPathInterpolator.java  |  4 +-
 .../java3d}/loaders/lw3d/TargaReader.java     |  6 +--
 .../java3d}/loaders/lw3d/TextfileParser.java  |  4 +-
 .../scijava/java3d}/loaders/lw3d/package.html |  2 +-
 .../loaders/objectfile/DefaultMaterials.java  |  2 +-
 .../loaders/objectfile/ObjectFile.java        | 22 +++++-----
 .../objectfile/ObjectFileMaterials.java       |  8 ++--
 .../loaders/objectfile/ObjectFileParser.java  |  4 +-
 .../java3d}/loaders/objectfile/RgbFile.java   |  2 +-
 .../java3d}/loaders/objectfile/package.html   |  2 +-
 .../scijava/java3d}/loaders/package.html      |  2 +-
 .../java3d}/utils/applet/JMainFrame.java      |  2 +-
 .../java3d}/utils/applet/MainFrame.java       |  2 +-
 .../scijava/java3d}/utils/applet/package.html |  2 +-
 .../utils/audio/DistanceAttenuation.java      |  4 +-
 .../scijava/java3d}/utils/audio/package.html  |  2 +-
 .../interpolators/CubicSplineCurve.java       |  4 +-
 .../interpolators/CubicSplineSegment.java     |  2 +-
 .../interpolators/KBCubicSplineCurve.java     |  4 +-
 .../interpolators/KBCubicSplineSegment.java   |  2 +-
 .../behaviors/interpolators/KBKeyFrame.java   |  4 +-
 .../KBRotPosScaleSplinePathInterpolator.java  |  2 +-
 .../KBSplinePathInterpolator.java             |  4 +-
 .../RotPosScaleTCBSplinePathInterpolator.java |  2 +-
 .../behaviors/interpolators/TCBKeyFrame.java  |  4 +-
 .../TCBSplinePathInterpolator.java            |  4 +-
 .../behaviors/interpolators/package.html      |  2 +-
 .../behaviors/keyboard/KeyNavigator.java      |  2 +-
 .../keyboard/KeyNavigatorBehavior.java        |  4 +-
 .../utils/behaviors/keyboard/package.html     |  2 +-
 .../utils/behaviors/mouse/MouseBehavior.java  |  4 +-
 .../mouse/MouseBehaviorCallback.java          |  2 +-
 .../utils/behaviors/mouse/MouseRotate.java    |  2 +-
 .../utils/behaviors/mouse/MouseTranslate.java |  2 +-
 .../utils/behaviors/mouse/MouseWheelZoom.java |  2 +-
 .../utils/behaviors/mouse/MouseZoom.java      |  2 +-
 .../utils/behaviors/mouse/package.html        |  2 +-
 .../utils/behaviors/picking/Intersect.java    |  4 +-
 .../behaviors/picking/PickMouseBehavior.java  |  6 +--
 .../utils/behaviors/picking/PickObject.java   |  8 ++--
 .../behaviors/picking/PickRotateBehavior.java | 10 ++---
 .../picking/PickTranslateBehavior.java        | 12 ++---
 .../behaviors/picking/PickZoomBehavior.java   | 12 ++---
 .../behaviors/picking/PickingCallback.java    |  6 +--
 .../utils/behaviors/picking}/package.html     |  4 +-
 .../sensor/Mouse6DPointerBehavior.java        |  2 +-
 .../behaviors/sensor/SensorBeamEcho.java      |  2 +-
 .../sensor/SensorButtonListener.java          |  2 +-
 .../utils/behaviors/sensor/SensorEvent.java   |  2 +-
 .../behaviors/sensor/SensorEventAgent.java    |  4 +-
 .../behaviors/sensor/SensorGnomonEcho.java    |  2 +-
 .../behaviors/sensor/SensorInputAdaptor.java  |  2 +-
 .../behaviors/sensor/SensorReadListener.java  |  2 +-
 .../utils/behaviors/sensor/package.html       |  2 +-
 .../utils/behaviors/vp/OrbitBehavior.java     |  6 +--
 .../behaviors/vp/ViewPlatformAWTBehavior.java |  6 +--
 .../behaviors/vp/ViewPlatformBehavior.java    |  4 +-
 .../utils/behaviors/vp/WandViewBehavior.java  | 26 +++++------
 .../java3d}/utils/behaviors/vp/package.html   |  2 +-
 .../utils/compression/CommandStream.java      |  2 +-
 .../compression/CompressedGeometryFile.java   |  4 +-
 .../utils/compression/CompressionStream.java  |  8 ++--
 .../compression/CompressionStreamColor.java   |  2 +-
 .../compression/CompressionStreamElement.java |  2 +-
 .../compression/CompressionStreamNormal.java  |  2 +-
 .../compression/CompressionStreamVertex.java  |  2 +-
 .../utils/compression/GeometryCompressor.java |  4 +-
 .../utils/compression/HuffmanNode.java        |  2 +-
 .../utils/compression/HuffmanTable.java       |  2 +-
 .../java3d}/utils/compression/MeshBuffer.java |  2 +-
 .../java3d/utils/compression}/package.html    |  4 +-
 .../scijava/java3d}/utils/geometry/BBox.java  |  2 +-
 .../scijava/java3d}/utils/geometry/Basic.java |  2 +-
 .../java3d}/utils/geometry/BottleNeck.java    |  2 +-
 .../scijava/java3d}/utils/geometry/Box.java   |  2 +-
 .../java3d}/utils/geometry/Bridge.java        |  2 +-
 .../scijava/java3d}/utils/geometry/Clean.java |  2 +-
 .../java3d}/utils/geometry/ColorCube.java     |  2 +-
 .../scijava/java3d}/utils/geometry/Cone.java  |  2 +-
 .../java3d}/utils/geometry/Cylinder.java      |  2 +-
 .../java3d}/utils/geometry/Degenerate.java    |  2 +-
 .../java3d}/utils/geometry/Desperate.java     |  2 +-
 .../java3d}/utils/geometry/Distance.java      |  2 +-
 .../java3d}/utils/geometry/EarClip.java       |  2 +-
 .../scijava/java3d}/utils/geometry/Edge.java  |  2 +-
 .../java3d}/utils/geometry/EdgeTable.java     |  2 +-
 .../java3d}/utils/geometry/GeomBuffer.java    |  2 +-
 .../java3d}/utils/geometry/GeometryInfo.java  |  8 ++--
 .../utils/geometry/GeometryInfoGenerator.java |  6 +--
 .../utils/geometry/GeometryServiceImpl.java   |  2 +-
 .../scijava/java3d}/utils/geometry/Heap.java  |  2 +-
 .../java3d}/utils/geometry/HeapNode.java      |  2 +-
 .../scijava/java3d}/utils/geometry/Left.java  |  2 +-
 .../java3d}/utils/geometry/ListNode.java      |  2 +-
 .../java3d}/utils/geometry/NoHash.java        |  2 +-
 .../utils/geometry/NormalGenerator.java       |  2 +-
 .../java3d}/utils/geometry/Numerics.java      |  2 +-
 .../java3d}/utils/geometry/Orientation.java   |  2 +-
 .../java3d}/utils/geometry/PntNode.java       |  2 +-
 .../java3d}/utils/geometry/Primitive.java     |  2 +-
 .../java3d}/utils/geometry/Project.java       |  2 +-
 .../java3d}/utils/geometry/Quadrics.java      |  2 +-
 .../java3d}/utils/geometry/Simple.java        |  2 +-
 .../java3d}/utils/geometry/Sphere.java        |  2 +-
 .../java3d}/utils/geometry/Stripifier.java    |  4 +-
 .../utils/geometry/StripifierStats.java       |  2 +-
 .../java3d}/utils/geometry/Text2D.java        |  2 +-
 .../java3d}/utils/geometry/Triangle.java      |  2 +-
 .../java3d}/utils/geometry/Triangulator.java  |  4 +-
 .../geometry/compression/CommandStream.java   |  2 +-
 .../compression/CompressedGeometryData.java   |  4 +-
 .../compression/CompressedGeometryFile.java   |  2 +-
 .../CompressedGeometryRetained.java           |  2 +-
 .../compression/CompressionStream.java        |  6 +--
 .../compression/CompressionStreamColor.java   |  2 +-
 .../compression/CompressionStreamElement.java |  2 +-
 .../compression/CompressionStreamNormal.java  |  2 +-
 .../compression/CompressionStreamVertex.java  |  2 +-
 .../compression/GeneralizedStrip.java         |  4 +-
 .../compression/GeneralizedStripFlags.java    |  2 +-
 .../compression/GeneralizedVertexList.java    |  2 +-
 .../compression/GeometryCompressor.java       |  2 +-
 .../compression/GeometryDecompressor.java     |  4 +-
 .../GeometryDecompressorShape3D.java          |  4 +-
 .../geometry/compression/HuffmanNode.java     |  2 +-
 .../geometry/compression/HuffmanTable.java    |  2 +-
 .../geometry/compression/MeshBuffer.java      |  2 +-
 .../utils/geometry/compression/package.html   |  4 +-
 .../java3d}/utils/geometry/package.html       |  2 +-
 .../java3d}/utils/image/ImageException.java   |  2 +-
 .../java3d}/utils/image/TextureLoader.java    |  2 +-
 .../scijava/java3d}/utils/image/package.html  |  2 +-
 .../java3d}/utils/pickfast/PickCanvas.java    |  2 +-
 .../utils/pickfast/PickIntersection.java      |  4 +-
 .../java3d}/utils/pickfast/PickTool.java      |  4 +-
 .../pickfast/behaviors/PickMouseBehavior.java |  6 +--
 .../behaviors/PickRotateBehavior.java         |  8 ++--
 .../behaviors/PickTranslateBehavior.java      | 10 ++---
 .../pickfast/behaviors/PickZoomBehavior.java  | 10 ++---
 .../pickfast/behaviors/PickingCallback.java   |  2 +-
 .../utils/pickfast/behaviors/package.html     |  2 +-
 .../java3d}/utils/pickfast/package.html       |  2 +-
 .../java3d}/utils/picking/PickCanvas.java     |  2 +-
 .../utils/picking/PickIntersection.java       |  4 +-
 .../java3d}/utils/picking/PickResult.java     |  6 +--
 .../java3d}/utils/picking/PickTool.java       |  4 +-
 .../picking/behaviors/PickMouseBehavior.java  |  6 +--
 .../picking/behaviors/PickRotateBehavior.java | 10 ++---
 .../behaviors/PickTranslateBehavior.java      | 12 ++---
 .../picking/behaviors/PickZoomBehavior.java   | 12 ++---
 .../picking/behaviors/PickingCallback.java    |  2 +-
 .../utils/picking/behaviors/package.html      |  2 +-
 .../java3d}/utils/picking/package.html        |  2 +-
 .../scenegraph/io/NamedObjectException.java   |  2 +-
 .../io/ObjectNotLoadedException.java          |  2 +-
 .../scenegraph/io/SceneGraphFileReader.java   |  6 +--
 .../scenegraph/io/SceneGraphFileWriter.java   |  6 +--
 .../utils/scenegraph/io/SceneGraphIO.java     |  2 +-
 .../io/SceneGraphObjectReferenceControl.java  |  2 +-
 .../io/SceneGraphStateProvider.java           |  4 +-
 .../scenegraph/io/SceneGraphStreamReader.java |  6 +--
 .../scenegraph/io/SceneGraphStreamWriter.java |  6 +--
 .../scenegraph/io/UnresolvedBehavior.java     |  2 +-
 .../io/UnsupportedUniverseException.java      |  4 +-
 .../io/doc-files/extensibility.html           |  0
 .../java3d}/utils/scenegraph/io/package.html  |  0
 .../scenegraph/io/retained/Controller.java    | 44 +++++++++----------
 .../io/retained/J3fInputStream.java           |  2 +-
 .../io/retained/J3fOutputStream.java          |  2 +-
 .../io/retained/PositionInputStream.java      |  2 +-
 .../io/retained/PositionOutputStream.java     |  2 +-
 .../io/retained/RandomAccessFileControl.java  | 12 ++---
 .../io/retained/SGIORuntimeException.java     |  2 +-
 .../scenegraph/io/retained/StreamControl.java |  4 +-
 .../scenegraph/io/retained/SymbolTable.java   | 14 +++---
 .../io/retained/SymbolTableData.java          |  4 +-
 .../state/org/scijava/java3d}/AlphaState.java |  6 +--
 .../java3d}/AlternateAppearanceState.java     |  6 +--
 .../scijava/java3d}/AmbientLightState.java    |  6 +--
 .../org/scijava/java3d}/AppearanceState.java  |  6 +--
 .../scijava/java3d}/AuralAttributesState.java |  6 +--
 .../scijava/java3d}/BackgroundSoundState.java |  6 +--
 .../org/scijava/java3d}/BackgroundState.java  |  6 +--
 .../org/scijava/java3d}/BehaviorState.java    | 10 ++---
 .../org/scijava/java3d}/BillboardState.java   |  6 +--
 .../scijava/java3d}/BoundingLeafState.java    |  6 +--
 .../org/scijava/java3d}/BranchGroupState.java |  6 +--
 .../state/org/scijava/java3d}/ClipState.java  |  6 +--
 .../java3d}/ColorInterpolatorState.java       |  6 +--
 .../java3d}/ColoringAttributesState.java      |  6 +--
 .../java3d}/CompressedGeometryState.java      |  6 +--
 .../org/scijava/java3d}/ConeSoundState.java   |  6 +--
 .../org/scijava/java3d}/DecalGroupState.java  |  6 +--
 .../java3d}/DepthComponentFloatState.java     |  6 +--
 .../java3d}/DepthComponentIntState.java       |  6 +--
 .../java3d}/DepthComponentNativeState.java    |  6 +--
 .../java3d}/DirectionalLightState.java        |  6 +--
 .../org/scijava/java3d}/DistanceLODState.java |  6 +--
 .../scijava/java3d}/ExponentialFogState.java  |  6 +--
 .../state/org/scijava/java3d}/FogState.java   |  6 +--
 .../org/scijava/java3d}/Font3DState.java      |  6 +--
 .../scijava/java3d}/GeometryArrayState.java   |  8 ++--
 .../org/scijava/java3d}/GeometryState.java    |  6 +--
 .../java3d}/GeometryStripArrayState.java      |  6 +--
 .../state/org/scijava/java3d}/GroupState.java | 10 ++---
 .../java3d}/ImageComponent2DState.java        |  6 +--
 .../java3d}/ImageComponent3DState.java        |  6 +--
 .../scijava/java3d}/ImageComponentState.java  |  8 ++--
 .../java3d}/IndexedGeometryArrayState.java    |  6 +--
 .../IndexedGeometryStripArrayState.java       |  6 +--
 .../java3d}/IndexedLineArrayState.java        |  6 +--
 .../java3d}/IndexedLineStripArrayState.java   |  6 +--
 .../java3d}/IndexedPointArrayState.java       |  6 +--
 .../java3d}/IndexedQuadArrayState.java        |  6 +--
 .../java3d}/IndexedTriangleArrayState.java    |  6 +--
 .../java3d}/IndexedTriangleFanArrayState.java |  6 +--
 .../IndexedTriangleStripArrayState.java       |  6 +--
 .../scijava/java3d}/InterpolatorState.java    |  6 +--
 .../state/org/scijava/java3d}/LODState.java   |  6 +--
 .../state/org/scijava/java3d}/LeafState.java  |  6 +--
 .../state/org/scijava/java3d}/LightState.java |  6 +--
 .../org/scijava/java3d}/LineArrayState.java   |  6 +--
 .../scijava/java3d}/LineAttributesState.java  |  6 +--
 .../scijava/java3d}/LineStripArrayState.java  |  6 +--
 .../org/scijava/java3d}/LinearFogState.java   |  6 +--
 .../state/org/scijava/java3d}/LinkState.java  |  6 +--
 .../org/scijava/java3d}/MaterialState.java    |  6 +--
 .../scijava/java3d}/MediaContainerState.java  |  6 +--
 .../org/scijava/java3d}/ModelClipState.java   |  6 +--
 .../state/org/scijava/java3d}/MorphState.java |  6 +--
 .../scijava/java3d}/NodeComponentState.java   |  6 +--
 .../state/org/scijava/java3d}/NodeState.java  |  6 +--
 .../java3d}/NullSceneGraphObjectState.java    |  6 +--
 .../scijava/java3d}/OrderedGroupState.java    |  6 +--
 .../scijava/java3d}/OrientedShape3DState.java |  6 +--
 .../java3d}/PathInterpolatorState.java        |  6 +--
 .../scijava/java3d}/PointAttributesState.java |  6 +--
 .../org/scijava/java3d}/PointLightState.java  |  6 +--
 .../org/scijava/java3d}/PointSoundState.java  |  6 +--
 .../java3d}/PolygonAttributesState.java       |  6 +--
 .../java3d}/PositionInterpolatorState.java    |  6 +--
 .../PositionPathInterpolatorState.java        |  6 +--
 .../org/scijava/java3d}/QuadArrayState.java   |  6 +--
 .../org/scijava/java3d}/RasterState.java      |  6 +--
 .../java3d}/RenderingAttributesState.java     |  6 +--
 .../java3d}/RotPosPathInterpolatorState.java  |  6 +--
 .../RotPosScalePathInterpolatorState.java     |  6 +--
 .../java3d}/RotationInterpolatorState.java    |  6 +--
 .../RotationPathInterpolatorState.java        |  6 +--
 .../java3d}/ScaleInterpolatorState.java       |  6 +--
 .../java3d}/SceneGraphObjectState.java        | 26 +++++------
 .../org/scijava/java3d}/Shape3DState.java     |  6 +--
 .../org/scijava/java3d}/SharedGroupState.java |  6 +--
 .../state/org/scijava/java3d}/SoundState.java |  6 +--
 .../org/scijava/java3d}/SoundscapeState.java  |  6 +--
 .../org/scijava/java3d}/SpotLightState.java   |  6 +--
 .../org/scijava/java3d}/SwitchState.java      |  6 +--
 .../java3d}/SwitchValueInterpolatorState.java |  6 +--
 .../java3d}/TexCoordGenerationState.java      |  6 +--
 .../org/scijava/java3d}/Text3DState.java      |  6 +--
 .../org/scijava/java3d}/Texture2DState.java   |  6 +--
 .../org/scijava/java3d}/Texture3DState.java   |  6 +--
 .../java3d}/TextureAttributesState.java       |  6 +--
 .../scijava/java3d}/TextureCubeMapState.java  |  6 +--
 .../org/scijava/java3d}/TextureState.java     |  6 +--
 .../java3d}/TextureUnitStateState.java        |  6 +--
 .../scijava/java3d}/TransformGroupState.java  |  6 +--
 .../java3d}/TransformInterpolatorState.java   |  6 +--
 .../java3d}/TransparencyAttributesState.java  |  6 +--
 .../TransparencyInterpolatorState.java        |  6 +--
 .../scijava/java3d}/TriangleArrayState.java   |  6 +--
 .../java3d}/TriangleFanArrayState.java        |  6 +--
 .../java3d}/TriangleStripArrayState.java      |  6 +--
 .../scijava/java3d}/ViewPlatformState.java    |  6 +--
 ...otPosScaleSplinePathInterpolatorState.java | 12 ++---
 ...osScaleTCBSplinePathInterpolatorState.java | 12 ++---
 .../behaviors/mouse/MouseBehaviorState.java   | 10 ++---
 .../java3d}/utils/geometry/BoxState.java      |  8 ++--
 .../utils/geometry/ColorCubeState.java        | 10 ++---
 .../java3d}/utils/geometry/ConeState.java     |  8 ++--
 .../java3d}/utils/geometry/CylinderState.java |  8 ++--
 .../utils/geometry/PrimitiveState.java        | 10 ++---
 .../java3d}/utils/geometry/SphereState.java   |  8 ++--
 .../java3d}/utils/geometry/Text2DState.java   | 10 ++---
 .../utils/image/ImageComponent2DURL.java      |  2 +-
 .../image/ImageComponent2DURLIOListener.java  |  2 +-
 .../utils/image/ImageComponent2DURLState.java |  8 ++--
 .../utils/universe/PlatformGeometryState.java | 10 ++---
 .../utils/universe/SimpleUniverseState.java   | 20 ++++-----
 .../utils/universe/ViewerAvatarState.java     | 10 ++---
 .../SimpleDistanceComparator.java             |  2 +-
 .../TransparencySortController.java           |  2 +-
 .../scenegraph/transparency/package.html      |  2 +-
 .../java3d}/utils/shader/StringIO.java        |  2 +-
 .../scijava/java3d}/utils/shader/package.html |  2 +-
 .../scijava/java3d}/utils/timer/J3DTimer.java |  2 +-
 .../scijava/java3d}/utils/timer/package.html  |  2 +-
 .../java3d}/utils/universe/ConfigCommand.java |  2 +-
 .../utils/universe/ConfigContainer.java       |  4 +-
 .../java3d}/utils/universe/ConfigDevice.java  |  2 +-
 .../java3d}/utils/universe/ConfigObject.java  |  6 +--
 .../utils/universe/ConfigPhysicalBody.java    |  2 +-
 .../universe/ConfigPhysicalEnvironment.java   |  2 +-
 .../java3d}/utils/universe/ConfigScreen.java  |  2 +-
 .../java3d}/utils/universe/ConfigSensor.java  |  2 +-
 .../utils/universe/ConfigSexpression.java     |  2 +-
 .../java3d}/utils/universe/ConfigView.java    |  2 +-
 .../utils/universe/ConfigViewPlatform.java    |  2 +-
 .../universe/ConfigViewPlatformBehavior.java  |  4 +-
 .../utils/universe/ConfiguredUniverse.java    |  2 +-
 .../java3d}/utils/universe/LocaleFactory.java |  2 +-
 .../utils/universe/MultiTransformGroup.java   |  2 +-
 .../utils/universe/PlatformGeometry.java      |  2 +-
 .../utils/universe/SimpleUniverse.java        |  4 +-
 .../java3d}/utils/universe/ViewInfo.java      |  2 +-
 .../java3d}/utils/universe/Viewer.java        |  4 +-
 .../java3d}/utils/universe/ViewerAvatar.java  |  2 +-
 .../utils/universe/ViewingPlatform.java       |  6 +--
 .../universe/doc-files/config-examples.html   |  0
 .../universe/doc-files/config-syntax.html     |  2 +-
 .../universe/doc-files/j3d1x1-behavior.html   |  2 +-
 .../universe/doc-files/j3d1x1-stereo.html     |  0
 .../utils/universe/doc-files/j3d1x1-vr.html   |  8 ++--
 .../universe/doc-files/j3d1x1-window.html     |  0
 .../utils/universe/doc-files/j3d1x1.html      |  0
 .../utils/universe/doc-files/j3d1x2-flat.html |  0
 .../universe/doc-files/j3d1x2-rot30.html      |  0
 .../universe/doc-files/j3d1x3-cave-vr.html    |  6 +--
 .../utils/universe/doc-files/j3d1x3-cave.html |  0
 .../universe/doc-files/j3d1x3-rot45.html      |  0
 .../utils/universe/doc-files/j3d2x2-flat.html |  0
 .../java3d}/utils/universe/package.html       |  2 +-
 399 files changed, 899 insertions(+), 899 deletions(-)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/ExceptionStrings.properties (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/AudioEngine.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/AudioEngine3D.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/AudioEngine3DL2.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/AudioEngineThread.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/AuralParameters.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/Sample.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSAuralParameters.java (94%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSChannel.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSClip.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSDirectionalSample.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSMidi.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSPositionalSample.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSSample.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSStream.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JSThread.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/JavaSoundMixer.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/javasound/package.html (81%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/audioengines/package.html (83%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/exp/swing/JCanvas3D.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/exp/swing/impl/AutoOffScreenCanvas3D.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/exp/swing/package.html (88%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/BufferWrapper.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/ByteBufferWrapper.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/Distance.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/DoubleBufferWrapper.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/FastVector.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/FloatBufferWrapper.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/HashCodeUtil.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/internal/J3dUtilsI18N.java (94%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/IncorrectFormatException.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/Loader.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/LoaderBase.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/ParsingErrorException.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/Scene.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/SceneBase.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/DebugOutput.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/EnvelopeHandler.java (96%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/FloatValueInterpolator.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/ImageScaler.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/J3dLwoParser.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LWOBFileReader.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LightIntensityPathInterpolator.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/Lw3dLoader.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwLightObject.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwoParser.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwoSurface.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwoTexture.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsBackground.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsCamera.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsEnvelope.java (95%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsEnvelopeFrame.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsEnvelopeLightIntensity.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsFog.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsFrame.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsLight.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsMotion.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsObject.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/LwsPrimitive.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/ParserObject.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/SequenceLine.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/SequenceReader.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/ShapeHolder.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/SwitchPathInterpolator.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/TargaReader.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/TextfileParser.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/lw3d/package.html (83%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/objectfile/DefaultMaterials.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/objectfile/ObjectFile.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/objectfile/ObjectFileMaterials.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/objectfile/ObjectFileParser.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/objectfile/RgbFile.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/objectfile/package.html (81%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/loaders/package.html (85%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/applet/JMainFrame.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/applet/MainFrame.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/applet/package.html (84%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/audio/DistanceAttenuation.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/audio/package.html (82%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/CubicSplineCurve.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/CubicSplineSegment.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/KBCubicSplineCurve.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/KBCubicSplineSegment.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/KBKeyFrame.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/KBSplinePathInterpolator.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/TCBKeyFrame.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/TCBSplinePathInterpolator.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/interpolators/package.html (78%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/keyboard/KeyNavigator.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/keyboard/KeyNavigatorBehavior.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/keyboard/package.html (79%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/mouse/MouseBehavior.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/mouse/MouseBehaviorCallback.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/mouse/MouseRotate.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/mouse/MouseTranslate.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/mouse/MouseWheelZoom.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/mouse/MouseZoom.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/mouse/package.html (80%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/picking/Intersect.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/picking/PickMouseBehavior.java (96%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/picking/PickObject.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/picking/PickRotateBehavior.java (95%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/picking/PickTranslateBehavior.java (93%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/picking/PickZoomBehavior.java (93%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/picking/PickingCallback.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/compression => org/scijava/java3d/utils/behaviors/picking}/package.html (58%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/Mouse6DPointerBehavior.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/SensorBeamEcho.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/SensorButtonListener.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/SensorEvent.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/SensorEventAgent.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/SensorGnomonEcho.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/SensorInputAdaptor.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/SensorReadListener.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/sensor/package.html (79%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/vp/OrbitBehavior.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/vp/ViewPlatformAWTBehavior.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/vp/ViewPlatformBehavior.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/vp/WandViewBehavior.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/behaviors/vp/package.html (81%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/CommandStream.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/CompressedGeometryFile.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/CompressionStream.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/CompressionStreamColor.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/CompressionStreamElement.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/CompressionStreamNormal.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/CompressionStreamVertex.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/GeometryCompressor.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/HuffmanNode.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/HuffmanTable.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/compression/MeshBuffer.java (99%)
 rename src/classes/share/{com/sun/j3d/utils/behaviors/picking => org/scijava/java3d/utils/compression}/package.html (59%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/BBox.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Basic.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/BottleNeck.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Box.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Bridge.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Clean.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/ColorCube.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Cone.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Cylinder.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Degenerate.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Desperate.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Distance.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/EarClip.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Edge.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/EdgeTable.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/GeomBuffer.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/GeometryInfo.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/GeometryInfoGenerator.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/GeometryServiceImpl.java (96%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Heap.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/HeapNode.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Left.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/ListNode.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/NoHash.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/NormalGenerator.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Numerics.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Orientation.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/PntNode.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Primitive.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Project.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Quadrics.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Simple.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Sphere.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Stripifier.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/StripifierStats.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Text2D.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Triangle.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/Triangulator.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CommandStream.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressedGeometryData.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressedGeometryFile.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressedGeometryRetained.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressionStream.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressionStreamColor.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressionStreamElement.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressionStreamNormal.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/CompressionStreamVertex.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/GeneralizedStrip.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/GeneralizedStripFlags.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/GeneralizedVertexList.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/GeometryCompressor.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/GeometryDecompressor.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/GeometryDecompressorShape3D.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/HuffmanNode.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/HuffmanTable.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/MeshBuffer.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/compression/package.html (72%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/geometry/package.html (84%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/image/ImageException.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/image/TextureLoader.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/image/package.html (82%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/PickCanvas.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/PickIntersection.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/PickTool.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/behaviors/PickMouseBehavior.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/behaviors/PickRotateBehavior.java (96%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/behaviors/PickTranslateBehavior.java (94%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/behaviors/PickZoomBehavior.java (94%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/behaviors/PickingCallback.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/behaviors/package.html (80%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/pickfast/package.html (83%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/PickCanvas.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/PickIntersection.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/PickResult.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/PickTool.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/behaviors/PickMouseBehavior.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/behaviors/PickRotateBehavior.java (95%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/behaviors/PickTranslateBehavior.java (93%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/behaviors/PickZoomBehavior.java (93%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/behaviors/PickingCallback.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/behaviors/package.html (81%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/picking/package.html (84%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/NamedObjectException.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/ObjectNotLoadedException.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/SceneGraphFileReader.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/SceneGraphFileWriter.java (96%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/SceneGraphIO.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/SceneGraphObjectReferenceControl.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/SceneGraphStateProvider.java (94%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/SceneGraphStreamReader.java (95%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/SceneGraphStreamWriter.java (96%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/UnresolvedBehavior.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/UnsupportedUniverseException.java (94%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/doc-files/extensibility.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/package.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/Controller.java (94%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/J3fInputStream.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/J3fOutputStream.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/PositionInputStream.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/PositionOutputStream.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/RandomAccessFileControl.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/SGIORuntimeException.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/StreamControl.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/SymbolTable.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/io/retained/SymbolTableData.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/AlphaState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/AlternateAppearanceState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/AmbientLightState.java (90%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/AppearanceState.java (97%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/AuralAttributesState.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/BackgroundSoundState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/BackgroundState.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/BehaviorState.java (90%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/BillboardState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/BoundingLeafState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/BranchGroupState.java (91%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ClipState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ColorInterpolatorState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ColoringAttributesState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/CompressedGeometryState.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ConeSoundState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/DecalGroupState.java (91%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/DepthComponentFloatState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/DepthComponentIntState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/DepthComponentNativeState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/DirectionalLightState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/DistanceLODState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ExponentialFogState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/FogState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/Font3DState.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/GeometryArrayState.java (99%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/GeometryState.java (90%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/GeometryStripArrayState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/GroupState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ImageComponent2DState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ImageComponent3DState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ImageComponentState.java (98%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedGeometryArrayState.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedGeometryStripArrayState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedLineArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedLineStripArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedPointArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedQuadArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedTriangleArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedTriangleFanArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/IndexedTriangleStripArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/InterpolatorState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LODState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LeafState.java (90%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LightState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LineArrayState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LineAttributesState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LineStripArrayState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LinearFogState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/LinkState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/MaterialState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/MediaContainerState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ModelClipState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/MorphState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/NodeComponentState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/NodeState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/NullSceneGraphObjectState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/OrderedGroupState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/OrientedShape3DState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/PathInterpolatorState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/PointAttributesState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/PointLightState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/PointSoundState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/PolygonAttributesState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/PositionInterpolatorState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/PositionPathInterpolatorState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/QuadArrayState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/RasterState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/RenderingAttributesState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/RotPosPathInterpolatorState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/RotPosScalePathInterpolatorState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/RotationInterpolatorState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/RotationPathInterpolatorState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ScaleInterpolatorState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/SceneGraphObjectState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/Shape3DState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/SharedGroupState.java (91%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/SoundState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/SoundscapeState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/SpotLightState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/SwitchState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/SwitchValueInterpolatorState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TexCoordGenerationState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/Text3DState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/Texture2DState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/Texture3DState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TextureAttributesState.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TextureCubeMapState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TextureState.java (97%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TextureUnitStateState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TransformGroupState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TransformInterpolatorState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TransparencyAttributesState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TransparencyInterpolatorState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TriangleArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TriangleFanArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/TriangleStripArrayState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/ViewPlatformState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java (91%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java (90%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/behaviors/mouse/MouseBehaviorState.java (87%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/geometry/BoxState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/geometry/ColorCubeState.java (89%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/geometry/ConeState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/geometry/CylinderState.java (95%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/geometry/PrimitiveState.java (88%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/geometry/SphereState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/geometry/Text2DState.java (93%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/image/ImageComponent2DURL.java (98%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/image/ImageComponent2DURLIOListener.java (96%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/image/ImageComponent2DURLState.java (92%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/universe/PlatformGeometryState.java (84%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/universe/SimpleUniverseState.java (94%)
 rename src/classes/share/{com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d => org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d}/utils/universe/ViewerAvatarState.java (84%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/transparency/SimpleDistanceComparator.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/transparency/TransparencySortController.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/scenegraph/transparency/package.html (78%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/shader/StringIO.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/shader/package.html (82%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/timer/J3DTimer.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/timer/package.html (84%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigCommand.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigContainer.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigDevice.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigObject.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigPhysicalBody.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigPhysicalEnvironment.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigScreen.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigSensor.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigSexpression.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigView.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigViewPlatform.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfigViewPlatformBehavior.java (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ConfiguredUniverse.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/LocaleFactory.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/MultiTransformGroup.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/PlatformGeometry.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/SimpleUniverse.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ViewInfo.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/Viewer.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ViewerAvatar.java (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/ViewingPlatform.java (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/config-examples.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/config-syntax.html (99%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x1-behavior.html (98%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x1-stereo.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x1-vr.html (95%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x1-window.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x1.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x2-flat.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x2-rot30.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x3-cave-vr.html (97%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x3-cave.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d1x3-rot45.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/doc-files/j3d2x2-flat.html (100%)
 rename src/classes/share/{com/sun/j3d => org/scijava/java3d}/utils/universe/package.html (85%)

diff --git a/THIRDPARTY-LICENSE-DISTANCE.txt b/THIRDPARTY-LICENSE-DISTANCE.txt
index 2c86b0a..73b5c22 100644
--- a/THIRDPARTY-LICENSE-DISTANCE.txt
+++ b/THIRDPARTY-LICENSE-DISTANCE.txt
@@ -1,7 +1,7 @@
 The following additional provisions apply to third party software
 included as part of this product.
 
-    com/sun/j3d/internal/
+    org/scijava/java3d/internal/
 	Distance.java
 
 Copyright (c) 2004 Magic Software, Inc.  All Rights Reserved.
diff --git a/THIRDPARTY-LICENSE-FIST.txt b/THIRDPARTY-LICENSE-FIST.txt
index 712723e..0cc9049 100644
--- a/THIRDPARTY-LICENSE-FIST.txt
+++ b/THIRDPARTY-LICENSE-FIST.txt
@@ -3,7 +3,7 @@ included as part of this product. No additional restrictions are
 placed on this source code, except that this attribution must be
 distributed with the source code.
 
-    com/sun/j3d/utils/geometry/
+    org/scijava/java3d/utils/geometry/
 	BBox.java, Basic.java, BottleNeck.java, Bridge.java,
 	Clean.java, Degenerate.java, Desperate.java, Distance.java,
 	EarClip.java, Heap.java, HeapNode.java, Left.java,
diff --git a/THIRDPARTY-LICENSE-MAINFRAME.txt b/THIRDPARTY-LICENSE-MAINFRAME.txt
index 0f15a58..f8a4621 100644
--- a/THIRDPARTY-LICENSE-MAINFRAME.txt
+++ b/THIRDPARTY-LICENSE-MAINFRAME.txt
@@ -1,7 +1,7 @@
 The following additional provisions apply to third party software
 included as part of this product.
 
-    com/sun/j3d/utils/applet/
+    org/scijava/java3d/utils/applet/
 	MainFrame.java - run an Applet as an application in AWT Frame
 	JMainFrame.java - run an Applet as an application in Swing JFrame
 
diff --git a/src/classes/share/META-INF/services/org.scijava.java3d.GeometryService b/src/classes/share/META-INF/services/org.scijava.java3d.GeometryService
index fc954bc..1b474ae 100644
--- a/src/classes/share/META-INF/services/org.scijava.java3d.GeometryService
+++ b/src/classes/share/META-INF/services/org.scijava.java3d.GeometryService
@@ -1 +1 @@
-com.sun.j3d.utils.geometry.GeometryServiceImpl
+org.scijava.java3d.utils.geometry.GeometryServiceImpl
diff --git a/src/classes/share/com/sun/j3d/ExceptionStrings.properties b/src/classes/share/org/scijava/java3d/ExceptionStrings.properties
similarity index 100%
rename from src/classes/share/com/sun/j3d/ExceptionStrings.properties
rename to src/classes/share/org/scijava/java3d/ExceptionStrings.properties
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java b/src/classes/share/org/scijava/java3d/audioengines/AudioEngine.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
rename to src/classes/share/org/scijava/java3d/audioengines/AudioEngine.java
index bd5512a..56d81c1 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/AudioEngine.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.scijava.java3d.audioengines;
 
 import org.scijava.java3d.AudioDevice;
 import org.scijava.java3d.PhysicalEnvironment;
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java b/src/classes/share/org/scijava/java3d/audioengines/AudioEngine3D.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
rename to src/classes/share/org/scijava/java3d/audioengines/AudioEngine3D.java
index f9e555b..c8deaa4 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/AudioEngine3D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.scijava.java3d.audioengines;
 
 import java.util.ArrayList;
 
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java b/src/classes/share/org/scijava/java3d/audioengines/AudioEngine3DL2.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
rename to src/classes/share/org/scijava/java3d/audioengines/AudioEngine3DL2.java
index 5ab4e8f..cd27523 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/AudioEngine3DL2.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.scijava.java3d.audioengines;
 
 import org.scijava.java3d.AudioDevice3DL2;
 import org.scijava.java3d.AuralAttributes;
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java b/src/classes/share/org/scijava/java3d/audioengines/AudioEngineThread.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
rename to src/classes/share/org/scijava/java3d/audioengines/AudioEngineThread.java
index be16a6e..8dd8e0a 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/AudioEngineThread.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.scijava.java3d.audioengines;
 
 /*
  * Audio Engine Thread
diff --git a/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java b/src/classes/share/org/scijava/java3d/audioengines/AuralParameters.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/AuralParameters.java
rename to src/classes/share/org/scijava/java3d/audioengines/AuralParameters.java
index f2d4627..2849533 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/AuralParameters.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.scijava.java3d.audioengines;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/audioengines/Sample.java b/src/classes/share/org/scijava/java3d/audioengines/Sample.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/Sample.java
rename to src/classes/share/org/scijava/java3d/audioengines/Sample.java
index 2645133..1aa56fd 100644
--- a/src/classes/share/com/sun/j3d/audioengines/Sample.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/Sample.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.scijava.java3d.audioengines;
 
 import org.scijava.java3d.MediaContainer;
 import org.scijava.java3d.Sound;
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSAuralParameters.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSAuralParameters.java
index 1f1240c..e55cdc4 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSAuralParameters.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.java3d.audioengines.javasound;
 
 
 /**
@@ -45,7 +45,7 @@
  * These are explicitly maintained for HaeSoundMixer
  */
 
-public class JSAuralParameters extends com.sun.j3d.audioengines.AuralParameters {
+public class JSAuralParameters extends org.scijava.java3d.audioengines.AuralParameters {
 
     /**
      * Reverb Parameters
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSChannel.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSChannel.java
index 06457df..be0a876 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSChannel.java
@@ -42,7 +42,7 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.java3d.audioengines.javasound;
 
 // import java.applet.*;
 import java.io.InputStream;
@@ -53,7 +53,7 @@
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.DataLine;
 
-import com.sun.j3d.audioengines.Sample;
+import org.scijava.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/scijava/java3d/audioengines/javasound/JSClip.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSClip.java
index ba988c0..317527a 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSClip.java
@@ -42,7 +42,7 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.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/scijava/java3d/audioengines/javasound/JSDirectionalSample.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSDirectionalSample.java
index 86695e2..ab1a969 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSDirectionalSample.java
@@ -44,12 +44,12 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.java3d.audioengines.javasound;
 
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.audioengines.AuralParameters;
+import org.scijava.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/scijava/java3d/audioengines/javasound/JSMidi.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSMidi.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSMidi.java
index 1e99e89..834bb0b 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSMidi.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSMidi.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.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/scijava/java3d/audioengines/javasound/JSPositionalSample.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSPositionalSample.java
index 79a61cd..70fd483 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSPositionalSample.java
@@ -44,7 +44,7 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.java3d.audioengines.javasound;
 
 import org.scijava.java3d.PhysicalBody;
 import org.scijava.java3d.Transform3D;
@@ -53,7 +53,7 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.audioengines.AuralParameters;
+import org.scijava.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/scijava/java3d/audioengines/javasound/JSSample.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSSample.java
index 91e91f9..b7d0d07 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSSample.java
@@ -44,7 +44,7 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.java3d.audioengines.javasound;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -54,13 +54,13 @@
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.DataLine;
 
-import com.sun.j3d.audioengines.AuralParameters;
+import org.scijava.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.scijava.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/scijava/java3d/audioengines/javasound/JSStream.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSStream.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSStream.java
index 22a87bc..ec4fdc5 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSStream.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.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/scijava/java3d/audioengines/javasound/JSThread.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JSThread.java
index 0d5a090..8cc50a9 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JSThread.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.java3d.audioengines.javasound;
 
 /*
  * JavaSound engine Thread
@@ -46,8 +46,8 @@
  * 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.scijava.java3d.audioengines.AudioEngine3D;
+import org.scijava.java3d.audioengines.AudioEngine3DL2;
 
 /**
  * The Thread Class extended for JavaSound Mixer specific audio device
@@ -55,7 +55,7 @@
  * such as volume/gain and sample-rate/frequency(pitch).
  */
 
-class JSThread extends com.sun.j3d.audioengines.AudioEngineThread {
+class JSThread extends org.scijava.java3d.audioengines.AudioEngineThread {
 
     /**
      * The thread data for this thread
@@ -431,15 +431,15 @@ void setSampleGain(JSSample sample, float gain) {
 // TODO:
         if (dataType == JSAuralParameters.STREAMING_AUDIO_DATA)
 {
-            com.sun.j3d.audio.J3DHaeStream.setSampleGain(index, gain);
+            org.scijava.java3d.audio.J3DHaeStream.setSampleGain(index, gain);
         }
         else if (dataType == JSAuralParameters.BUFFERED_AUDIO_DATA) {
-            com.sun.j3d.audio.J3DHaeClip.setSampleGain(index, gain);
+            org.scijava.java3d.audio.J3DHaeClip.setSampleGain(index, gain);
         }
         else {
             // dataType==JSAuralParameters.STREAMING_MIDI_DATA
             // dataType==JSAuralParameters.BUFFERED_MIDI_DATA
-            com.sun.j3d.audio.J3DHaeMidi.setSampleGain(index, gain);
+            org.scijava.java3d.audio.J3DHaeMidi.setSampleGain(index, gain);
         }
 ***************/
     }
@@ -456,32 +456,32 @@ void  setSampleRate(JSSample sample, float scaleFactor) {
 
 // TODO:
         if (dataType == JSAuralParameters.STREAMING_AUDIO_DATA) {
-            com.sun.j3d.audio.J3DHaeStream.scaleSampleRate(index, scaleFactor);
+            org.scijava.java3d.audio.J3DHaeStream.scaleSampleRate(index, scaleFactor);
             if ( (soundType == AudioDevice3D.CONE_SOUND) ||
                  (soundType == AudioDevice3D.POINT_SOUND) ) {
-                com.sun.j3d.audio.J3DHaeStream.scaleSampleRate(
+                org.scijava.java3d.audio.J3DHaeStream.scaleSampleRate(
                       ((JSPositionalSample)sample).getSecondIndex(),
                       scaleFactor);
-                com.sun.j3d.audio.J3DHaeStream.scaleSampleRate(
+                org.scijava.java3d.audio.J3DHaeStream.scaleSampleRate(
                       ((JSPositionalSample)sample).getReverbIndex(),
                       scaleFactor);
             }
         }
         else if (dataType == JSAuralParameters.BUFFERED_AUDIO_DATA) {
-            com.sun.j3d.audio.J3DHaeClip.scaleSampleRate(index, scaleFactor);
+            org.scijava.java3d.audio.J3DHaeClip.scaleSampleRate(index, scaleFactor);
             if ( (soundType == AudioDevice3D.CONE_SOUND) ||
                  (soundType == AudioDevice3D.POINT_SOUND) ) {
-                com.sun.j3d.audio.J3DHaeClip.scaleSampleRate(
+                org.scijava.java3d.audio.J3DHaeClip.scaleSampleRate(
                       ((JSPositionalSample)sample).getSecondIndex(),
                       scaleFactor);
-                com.sun.j3d.audio.J3DHaeClip.scaleSampleRate(
+                org.scijava.java3d.audio.J3DHaeClip.scaleSampleRate(
                       ((JSPositionalSample)sample).getReverbIndex(),
                       scaleFactor);
             }
         }
         else if (dataType == JSAuralParameters.STREAMING_MIDI_DATA ||
                  dataType == JSAuralParameters.BUFFERED_MIDI_DATA) {
-            com.sun.j3d.audio.J3DHaeMidi.scaleSampleRate(index, scaleFactor);
+            org.scijava.java3d.audio.J3DHaeMidi.scaleSampleRate(index, scaleFactor);
             // TODO: MIDI only supported for Background sounds
         }
 ***********/
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java b/src/classes/share/org/scijava/java3d/audioengines/javasound/JavaSoundMixer.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/JavaSoundMixer.java
index cad2bd9..b2cdabe 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/JavaSoundMixer.java
@@ -44,7 +44,7 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.scijava.java3d.audioengines.javasound;
 
 import org.scijava.java3d.AudioDevice3D;
 import org.scijava.java3d.MediaContainer;
@@ -54,8 +54,8 @@
 import org.scijava.vecmath.Point3d;
 import org.scijava.vecmath.Vector3d;
 
-import com.sun.j3d.audioengines.AudioEngine3DL2;
-import com.sun.j3d.audioengines.Sample;
+import org.scijava.java3d.audioengines.AudioEngine3DL2;
+import org.scijava.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/scijava/java3d/audioengines/javasound/package.html
similarity index 81%
rename from src/classes/share/com/sun/j3d/audioengines/javasound/package.html
rename to src/classes/share/org/scijava/java3d/audioengines/javasound/package.html
index 5897bc9..bd99ef2 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/package.html
+++ b/src/classes/share/org/scijava/java3d/audioengines/javasound/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.audioengines.javasound
+  org.scijava.java3d.audioengines.javasound
 
 
 
Provides a JavaSound-based implementation of a Java 3D audio device.

diff --git a/src/classes/share/com/sun/j3d/audioengines/package.html b/src/classes/share/org/scijava/java3d/audioengines/package.html
similarity index 83%
rename from src/classes/share/com/sun/j3d/audioengines/package.html
rename to src/classes/share/org/scijava/java3d/audioengines/package.html
index 59b80b4..f9d509c 100644
--- a/src/classes/share/com/sun/j3d/audioengines/package.html
+++ b/src/classes/share/org/scijava/java3d/audioengines/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.audioengines
+  org.scijava.java3d.audioengines
 
 
 
Provides abstract classes for creating Java 3D audio devices.

diff --git a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java b/src/classes/share/org/scijava/java3d/exp/swing/JCanvas3D.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java
rename to src/classes/share/org/scijava/java3d/exp/swing/JCanvas3D.java
index e6ffed1..06aa0ff 100644
--- a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java
+++ b/src/classes/share/org/scijava/java3d/exp/swing/JCanvas3D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.exp.swing;
+package org.scijava.java3d.exp.swing;
 
 import java.awt.Dimension;
 import java.awt.EventQueue;
@@ -54,7 +54,7 @@
 import javax.swing.JPanel;
 import javax.swing.event.AncestorListener;
 
-import com.sun.j3d.exp.swing.impl.AutoOffScreenCanvas3D;
+import org.scijava.java3d.exp.swing.impl.AutoOffScreenCanvas3D;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java b/src/classes/share/org/scijava/java3d/exp/swing/impl/AutoOffScreenCanvas3D.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java
rename to src/classes/share/org/scijava/java3d/exp/swing/impl/AutoOffScreenCanvas3D.java
index 299c1b6..c08069c 100644
--- a/src/classes/share/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java
+++ b/src/classes/share/org/scijava/java3d/exp/swing/impl/AutoOffScreenCanvas3D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.exp.swing.impl;
+package org.scijava.java3d.exp.swing.impl;
 
 /**
  * Tagging interface for Java 3D off-screen Canvas3D objects that are
diff --git a/src/classes/share/com/sun/j3d/exp/swing/package.html b/src/classes/share/org/scijava/java3d/exp/swing/package.html
similarity index 88%
rename from src/classes/share/com/sun/j3d/exp/swing/package.html
rename to src/classes/share/org/scijava/java3d/exp/swing/package.html
index e1cff44..0882190 100644
--- a/src/classes/share/com/sun/j3d/exp/swing/package.html
+++ b/src/classes/share/org/scijava/java3d/exp/swing/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.exp.swing
+  org.scijava.java3d.exp.swing
 
 
 
EXPERIMENTAL: Provides a lightweight JCanvas3D class.
diff --git a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java b/src/classes/share/org/scijava/java3d/internal/BufferWrapper.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/internal/BufferWrapper.java
rename to src/classes/share/org/scijava/java3d/internal/BufferWrapper.java
index b280641..f53b092 100644
--- a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java
+++ b/src/classes/share/org/scijava/java3d/internal/BufferWrapper.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.scijava.java3d.internal;
 
 import java.nio.Buffer;
 
diff --git a/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java b/src/classes/share/org/scijava/java3d/internal/ByteBufferWrapper.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java
rename to src/classes/share/org/scijava/java3d/internal/ByteBufferWrapper.java
index 912531a..c7edf69 100644
--- a/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java
+++ b/src/classes/share/org/scijava/java3d/internal/ByteBufferWrapper.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.scijava.java3d.internal;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/classes/share/com/sun/j3d/internal/Distance.java b/src/classes/share/org/scijava/java3d/internal/Distance.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/internal/Distance.java
rename to src/classes/share/org/scijava/java3d/internal/Distance.java
index 0f3fa64..24a075d 100644
--- a/src/classes/share/com/sun/j3d/internal/Distance.java
+++ b/src/classes/share/org/scijava/java3d/internal/Distance.java
@@ -53,7 +53,7 @@
 //
 // --------------------------------------------------
 
-package com.sun.j3d.internal;
+package org.scijava.java3d.internal;
 
 import org.scijava.vecmath.Point3d;
 import org.scijava.vecmath.Vector3d;
diff --git a/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java b/src/classes/share/org/scijava/java3d/internal/DoubleBufferWrapper.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java
rename to src/classes/share/org/scijava/java3d/internal/DoubleBufferWrapper.java
index 898a21b..baf4683 100644
--- a/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java
+++ b/src/classes/share/org/scijava/java3d/internal/DoubleBufferWrapper.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.scijava.java3d.internal;
 
 import java.nio.DoubleBuffer;
 
diff --git a/src/classes/share/com/sun/j3d/internal/FastVector.java b/src/classes/share/org/scijava/java3d/internal/FastVector.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/internal/FastVector.java
rename to src/classes/share/org/scijava/java3d/internal/FastVector.java
index a9d168f..f0ebb93 100644
--- a/src/classes/share/com/sun/j3d/internal/FastVector.java
+++ b/src/classes/share/org/scijava/java3d/internal/FastVector.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.scijava.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/scijava/java3d/internal/FloatBufferWrapper.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java
rename to src/classes/share/org/scijava/java3d/internal/FloatBufferWrapper.java
index ee06748..e1f07aa 100644
--- a/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java
+++ b/src/classes/share/org/scijava/java3d/internal/FloatBufferWrapper.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.scijava.java3d.internal;
 
 import java.nio.FloatBuffer;
 
diff --git a/src/classes/share/com/sun/j3d/internal/HashCodeUtil.java b/src/classes/share/org/scijava/java3d/internal/HashCodeUtil.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/internal/HashCodeUtil.java
rename to src/classes/share/org/scijava/java3d/internal/HashCodeUtil.java
index bb59aae..d9166d0 100644
--- a/src/classes/share/com/sun/j3d/internal/HashCodeUtil.java
+++ b/src/classes/share/org/scijava/java3d/internal/HashCodeUtil.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.scijava.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/scijava/java3d/internal/J3dUtilsI18N.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java
rename to src/classes/share/org/scijava/java3d/internal/J3dUtilsI18N.java
index 32c052b..8797dd0 100644
--- a/src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java
+++ b/src/classes/share/org/scijava/java3d/internal/J3dUtilsI18N.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.scijava.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.scijava.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/scijava/java3d/loaders/IncorrectFormatException.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/IncorrectFormatException.java
rename to src/classes/share/org/scijava/java3d/loaders/IncorrectFormatException.java
index 6926e86..eaf6cf7 100644
--- a/src/classes/share/com/sun/j3d/loaders/IncorrectFormatException.java
+++ b/src/classes/share/org/scijava/java3d/loaders/IncorrectFormatException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.scijava.java3d.loaders;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/Loader.java b/src/classes/share/org/scijava/java3d/loaders/Loader.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/Loader.java
rename to src/classes/share/org/scijava/java3d/loaders/Loader.java
index a2634c7..1b7d8f2 100644
--- a/src/classes/share/com/sun/j3d/loaders/Loader.java
+++ b/src/classes/share/org/scijava/java3d/loaders/Loader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.scijava.java3d.loaders;
 
 import java.io.FileNotFoundException;
 import java.io.Reader;
@@ -52,7 +52,7 @@
  * the user a consistent interface to extract the
  * data.
  *
- * @see com.sun.j3d.loaders.Scene
+ * @see org.scijava.java3d.loaders.Scene
  */
 public interface Loader {
 
diff --git a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java b/src/classes/share/org/scijava/java3d/loaders/LoaderBase.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/LoaderBase.java
rename to src/classes/share/org/scijava/java3d/loaders/LoaderBase.java
index ec12cb4..88d80b9 100644
--- a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
+++ b/src/classes/share/org/scijava/java3d/loaders/LoaderBase.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.scijava.java3d.loaders;
 
 import java.net.URL;
 
diff --git a/src/classes/share/com/sun/j3d/loaders/ParsingErrorException.java b/src/classes/share/org/scijava/java3d/loaders/ParsingErrorException.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/ParsingErrorException.java
rename to src/classes/share/org/scijava/java3d/loaders/ParsingErrorException.java
index f046b58..8946051 100644
--- a/src/classes/share/com/sun/j3d/loaders/ParsingErrorException.java
+++ b/src/classes/share/org/scijava/java3d/loaders/ParsingErrorException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.scijava.java3d.loaders;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/Scene.java b/src/classes/share/org/scijava/java3d/loaders/Scene.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/Scene.java
rename to src/classes/share/org/scijava/java3d/loaders/Scene.java
index b4a08f5..d683df0 100644
--- a/src/classes/share/com/sun/j3d/loaders/Scene.java
+++ b/src/classes/share/org/scijava/java3d/loaders/Scene.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.scijava.java3d.loaders;
 
 import java.util.Hashtable;
 
diff --git a/src/classes/share/com/sun/j3d/loaders/SceneBase.java b/src/classes/share/org/scijava/java3d/loaders/SceneBase.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/SceneBase.java
rename to src/classes/share/org/scijava/java3d/loaders/SceneBase.java
index ac75946..503ee23 100644
--- a/src/classes/share/com/sun/j3d/loaders/SceneBase.java
+++ b/src/classes/share/org/scijava/java3d/loaders/SceneBase.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.scijava.java3d.loaders;
 
 import java.util.Hashtable;
 import java.util.Vector;
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/DebugOutput.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/DebugOutput.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/DebugOutput.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/DebugOutput.java
index e78540d..6edb0d7 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/DebugOutput.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/DebugOutput.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/EnvelopeHandler.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/EnvelopeHandler.java
index c5a3daf..9587424 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/EnvelopeHandler.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.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.scijava.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.scijava.java3d.utils.loaders.lw3d.LwsEnvelope");
     }
 
 	/**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/FloatValueInterpolator.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/FloatValueInterpolator.java
index 3b2e746..f56e358 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/FloatValueInterpolator.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.Interpolator;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/loaders/lw3d/ImageScaler.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/ImageScaler.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/ImageScaler.java
index 7a7ff2f..d25fdf5 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/ImageScaler.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/ImageScaler.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.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/scijava/java3d/loaders/lw3d/J3dLwoParser.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/J3dLwoParser.java
index 1044343..41175b7 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/J3dLwoParser.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.io.FileNotFoundException;
 import java.net.URL;
@@ -56,10 +56,10 @@
 import org.scijava.vecmath.Color3f;
 import org.scijava.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.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.java3d.utils.geometry.GeometryInfo;
+import org.scijava.java3d.utils.geometry.NormalGenerator;
+import org.scijava.java3d.utils.geometry.Stripifier;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LWOBFileReader.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LWOBFileReader.java
index dd3a755..94498f0 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LWOBFileReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
@@ -46,7 +46,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/LightIntensityPathInterpolator.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LightIntensityPathInterpolator.java
index 2efce26..ea73e38 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LightIntensityPathInterpolator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.util.Enumeration;
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/Lw3dLoader.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/Lw3dLoader.java
index 62b03b0..b394bb2 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/Lw3dLoader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 import java.io.BufferedInputStream;
@@ -62,11 +62,11 @@
 import org.scijava.vecmath.Color3f;
 import org.scijava.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.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.java3d.loaders.Loader;
+import org.scijava.java3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.Scene;
+import org.scijava.java3d.loaders.SceneBase;
 
 
 /**
@@ -116,7 +116,7 @@ public Lw3dLoader() {
     /**
      * 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.scijava.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/scijava/java3d/loaders/lw3d/LwLightObject.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwLightObject.java
index 6a820f3..55c1daf 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwLightObject.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwoParser.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwoParser.java
index 25f8ab7..35d9ba3 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwoParser.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
@@ -47,8 +47,8 @@
 import java.util.Enumeration;
 import java.util.Vector;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwoSurface.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwoSurface.java
index 2d6bbdc..32b25c4 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwoSurface.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.awt.Image;
 import java.io.FileNotFoundException;
@@ -47,9 +47,9 @@
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwoTexture.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwoTexture.java
index 7895eae..e3ff2ff 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwoTexture.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -50,8 +50,8 @@
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.utils.image.TextureLoader;
+import org.scijava.java3d.loaders.ParsingErrorException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/LwsBackground.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsBackground.java
index 0bd7ebe..41e345d 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsBackground.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
@@ -49,7 +49,7 @@
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Point3d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsCamera.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsCamera.java
index a4d680f..fd9c480 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsCamera.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
@@ -50,7 +50,7 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.vecmath.Matrix4d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/LwsEnvelope.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsEnvelope.java
index 1732ec2..2c7eb49 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsEnvelope.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
@@ -45,9 +45,9 @@
 import org.scijava.java3d.Behavior;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/LwsEnvelopeFrame.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsEnvelopeFrame.java
index 0bd9145..25d70a6 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsEnvelopeFrame.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
index 06ca660..391e9bd 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsFog.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsFog.java
index 85f5dd0..be51e35 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsFog.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
@@ -50,7 +50,7 @@
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Point3d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsFrame.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsFrame.java
index d2f7362..b846351 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsFrame.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsLight.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsLight.java
index 4df1f46..e3b6508 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsLight.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
@@ -59,7 +59,7 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/LwsMotion.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsMotion.java
index d5c61b0..15809ac 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsMotion.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.io.StreamTokenizer;
 import java.util.Enumeration;
@@ -53,11 +53,11 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.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.scijava.java3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.java3d.loaders.ParsingErrorException;
+import org.scijava.java3d.utils.behaviors.interpolators.KBKeyFrame;
+import org.scijava.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/scijava/java3d/loaders/lw3d/LwsObject.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsObject.java
index a736645..eb4420e 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsObject.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 import java.io.File;
@@ -58,8 +58,8 @@
 import org.scijava.vecmath.Matrix4d;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/LwsPrimitive.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/LwsPrimitive.java
index 15c7816..275ab6a 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/LwsPrimitive.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/ParserObject.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/ParserObject.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/ParserObject.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/ParserObject.java
index 95e1453..de0a0ae 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/ParserObject.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/ParserObject.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.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/scijava/java3d/loaders/lw3d/SequenceLine.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/SequenceLine.java
index c107f04..d70254c 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/SequenceLine.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -58,8 +58,8 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.vecmath.Point3d;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/SequenceReader.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/SequenceReader.java
index 3d62ce1..2ec8388 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/SequenceReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -53,7 +53,7 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.vecmath.Point3d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/ShapeHolder.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/ShapeHolder.java
index 283e9d0..4f46e31 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/ShapeHolder.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.util.Vector;
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java b/src/classes/share/org/scijava/java3d/loaders/lw3d/SwitchPathInterpolator.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/SwitchPathInterpolator.java
index aa1c2c6..7837508 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/SwitchPathInterpolator.java
@@ -37,7 +37,7 @@
  *
  */
 
- package com.sun.j3d.loaders.lw3d;
+ package org.scijava.java3d.loaders.lw3d;
 
 
 import java.util.Enumeration;
@@ -45,7 +45,7 @@
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.Switch;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/loaders/lw3d/TargaReader.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/TargaReader.java
index 617c710..affa44e 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/TargaReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -48,8 +48,8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/TextfileParser.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/TextfileParser.java
index f0cc401..421a384 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/TextfileParser.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.scijava.java3d.loaders.lw3d;
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.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/scijava/java3d/loaders/lw3d/package.html
similarity index 83%
rename from src/classes/share/com/sun/j3d/loaders/lw3d/package.html
rename to src/classes/share/org/scijava/java3d/loaders/lw3d/package.html
index e87c100..9659985 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/package.html
+++ b/src/classes/share/org/scijava/java3d/loaders/lw3d/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.loaders.lw3d
+  org.scijava.java3d.loaders.lw3d
 
 
 
Provides a Java 3D loader for Lightwave 3D scene files.

diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/DefaultMaterials.java b/src/classes/share/org/scijava/java3d/loaders/objectfile/DefaultMaterials.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/objectfile/DefaultMaterials.java
rename to src/classes/share/org/scijava/java3d/loaders/objectfile/DefaultMaterials.java
index dfa102d..a0d19aa 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/DefaultMaterials.java
+++ b/src/classes/share/org/scijava/java3d/loaders/objectfile/DefaultMaterials.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.scijava.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/scijava/java3d/loaders/objectfile/ObjectFile.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
rename to src/classes/share/org/scijava/java3d/loaders/objectfile/ObjectFile.java
index c8b943c..2f176ac 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
+++ b/src/classes/share/org/scijava/java3d/loaders/objectfile/ObjectFile.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.scijava.java3d.loaders.objectfile;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -57,14 +57,14 @@
 import org.scijava.vecmath.TexCoord2f;
 import org.scijava.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.scijava.java3d.loaders.IncorrectFormatException;
+import org.scijava.java3d.loaders.Loader;
+import org.scijava.java3d.loaders.ParsingErrorException;
+import org.scijava.java3d.loaders.Scene;
+import org.scijava.java3d.loaders.SceneBase;
+import org.scijava.java3d.utils.geometry.GeometryInfo;
+import org.scijava.java3d.utils.geometry.NormalGenerator;
+import org.scijava.java3d.utils.geometry.Stripifier;
 
 
 
@@ -603,7 +603,7 @@ else if (st.ttype == ObjectFileParser.TT_WORD)
      * Constructor.
      *
      * @param flags The constants from above or from
-     * com.sun.j3d.loaders.Loader, possibly "or'ed" (|) together.
+     * org.scijava.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 ObjectFile(int flags, float radians) {
      * 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.scijava.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/scijava/java3d/loaders/objectfile/ObjectFileMaterials.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java
rename to src/classes/share/org/scijava/java3d/loaders/objectfile/ObjectFileMaterials.java
index 5c60076..7c2565a 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java
+++ b/src/classes/share/org/scijava/java3d/loaders/objectfile/ObjectFileMaterials.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.scijava.java3d.loaders.objectfile;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -64,9 +64,9 @@
 import org.scijava.java3d.TransparencyAttributes;
 import org.scijava.vecmath.Color3f;
 
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.utils.image.ImageException;
-import com.sun.j3d.utils.image.TextureLoader;
+import org.scijava.java3d.loaders.ParsingErrorException;
+import org.scijava.java3d.utils.image.ImageException;
+import org.scijava.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/scijava/java3d/loaders/objectfile/ObjectFileParser.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java
rename to src/classes/share/org/scijava/java3d/loaders/objectfile/ObjectFileParser.java
index b5a8426..1a1cf62 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java
+++ b/src/classes/share/org/scijava/java3d/loaders/objectfile/ObjectFileParser.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.scijava.java3d.loaders.objectfile;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StreamTokenizer;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.scijava.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/scijava/java3d/loaders/objectfile/RgbFile.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java
rename to src/classes/share/org/scijava/java3d/loaders/objectfile/RgbFile.java
index fe2446a..8bb7599 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java
+++ b/src/classes/share/org/scijava/java3d/loaders/objectfile/RgbFile.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.scijava.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/scijava/java3d/loaders/objectfile/package.html
similarity index 81%
rename from src/classes/share/com/sun/j3d/loaders/objectfile/package.html
rename to src/classes/share/org/scijava/java3d/loaders/objectfile/package.html
index 1171815..1c8cb08 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/package.html
+++ b/src/classes/share/org/scijava/java3d/loaders/objectfile/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.loaders.objectfile
+  org.scijava.java3d.loaders.objectfile
 
 
 
Provides a Java 3D loader for Wavefront .obj files.

diff --git a/src/classes/share/com/sun/j3d/loaders/package.html b/src/classes/share/org/scijava/java3d/loaders/package.html
similarity index 85%
rename from src/classes/share/com/sun/j3d/loaders/package.html
rename to src/classes/share/org/scijava/java3d/loaders/package.html
index 6b38d00..7debe0b 100644
--- a/src/classes/share/com/sun/j3d/loaders/package.html
+++ b/src/classes/share/org/scijava/java3d/loaders/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.loaders
+  org.scijava.java3d.loaders
 
 
 
Provides interfaces and abstract classes for writing Java 3D loaders.

diff --git a/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java b/src/classes/share/org/scijava/java3d/utils/applet/JMainFrame.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java
rename to src/classes/share/org/scijava/java3d/utils/applet/JMainFrame.java
index 62541fd..20842cf 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java
+++ b/src/classes/share/org/scijava/java3d/utils/applet/JMainFrame.java
@@ -67,7 +67,7 @@
 
 // ---------------------------------------------------------------------
 
-package com.sun.j3d.utils.applet;
+package org.scijava.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/scijava/java3d/utils/applet/MainFrame.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/applet/MainFrame.java
rename to src/classes/share/org/scijava/java3d/utils/applet/MainFrame.java
index 3415bc2..016b72e 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java
+++ b/src/classes/share/org/scijava/java3d/utils/applet/MainFrame.java
@@ -67,7 +67,7 @@
 
 // ---------------------------------------------------------------------
 
-package com.sun.j3d.utils.applet;
+package org.scijava.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/scijava/java3d/utils/applet/package.html
similarity index 84%
rename from src/classes/share/com/sun/j3d/utils/applet/package.html
rename to src/classes/share/org/scijava/java3d/utils/applet/package.html
index 3e0334e..f364c03 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/applet/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.applet
+  org.scijava.java3d.utils.applet
 
 
 
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/scijava/java3d/utils/audio/DistanceAttenuation.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java
rename to src/classes/share/org/scijava/java3d/utils/audio/DistanceAttenuation.java
index 6388a96..a04ab1b 100644
--- a/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java
+++ b/src/classes/share/org/scijava/java3d/utils/audio/DistanceAttenuation.java
@@ -44,12 +44,12 @@
   *  arrays.
   */
 
-package com.sun.j3d.utils.audio;
+package org.scijava.java3d.utils.audio;
 
 import org.scijava.java3d.SoundException;
 import org.scijava.vecmath.Point2f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.internal.J3dUtilsI18N;
 
 public class DistanceAttenuation
 {
diff --git a/src/classes/share/com/sun/j3d/utils/audio/package.html b/src/classes/share/org/scijava/java3d/utils/audio/package.html
similarity index 82%
rename from src/classes/share/com/sun/j3d/utils/audio/package.html
rename to src/classes/share/org/scijava/java3d/utils/audio/package.html
index c0ccbfc..10e908d 100644
--- a/src/classes/share/com/sun/j3d/utils/audio/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/audio/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.audio
+  org.scijava.java3d.utils.audio
 
 
 
Provides audio utility classes.

diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/CubicSplineCurve.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/CubicSplineCurve.java
index efc1d6b..696fdbd 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/CubicSplineCurve.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/interpolators/CubicSplineSegment.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/CubicSplineSegment.java
index 96ce8f7..7c08397 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/CubicSplineSegment.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Quat4f;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
index 755dd78..0c28c67 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
index 8b4ca3e..966192b 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBKeyFrame.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBKeyFrame.java
index d91fee4..95a54ab 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBKeyFrame.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
index 102667e..060d65f 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.Node;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
index ae02dff..c2c3c7a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.Node;
@@ -47,7 +47,7 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.java3d.TransformInterpolator;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
index 315026d..789dd1a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.Node;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/TCBKeyFrame.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/TCBKeyFrame.java
index e13bed9..99d4c38 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/TCBKeyFrame.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Quat4f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
index e9cffb3..cc7b765 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.behaviors.interpolators;
 
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.Node;
@@ -47,7 +47,7 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.java3d.TransformInterpolator;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/interpolators/package.html
similarity index 78%
rename from src/classes/share/com/sun/j3d/utils/behaviors/interpolators/package.html
rename to src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/package.html
index 7f18f4a..7d6d15b 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/interpolators/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.behaviors.interpolators
+  org.scijava.java3d.utils.behaviors.interpolators
 
 
 
Provides spline-based interpolation behaviors.

diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java b/src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/KeyNavigator.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/KeyNavigator.java
index 46c303e..ca1660a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/KeyNavigator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.keyboard;
+package org.scijava.java3d.utils.behaviors.keyboard;
 
 import java.awt.event.KeyEvent;
 
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java b/src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
index 0082485..913f725 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.keyboard;
+package org.scijava.java3d.utils.behaviors.keyboard;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
@@ -55,7 +55,7 @@
 import org.scijava.java3d.WakeupOnElapsedFrames;
 import org.scijava.java3d.WakeupOr;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/keyboard/package.html
similarity index 79%
rename from src/classes/share/com/sun/j3d/utils/behaviors/keyboard/package.html
rename to src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/package.html
index b22646e..b8cd1dd 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/keyboard/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.behaviors.keyboard
+  org.scijava.java3d.utils.behaviors.keyboard
 
 
 
Provides keyboard navigation utility classes.

diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseBehavior.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseBehavior.java
index c47dd7e..fab43f4 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.scijava.java3d.utils.behaviors.mouse;
 
 import java.awt.Component;
 import java.awt.event.MouseEvent;
@@ -56,7 +56,7 @@
 import org.scijava.java3d.WakeupOnBehaviorPost;
 import org.scijava.java3d.WakeupOr;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.internal.J3dUtilsI18N;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseBehaviorCallback.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseBehaviorCallback.java
index b494e7a..f33f598 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseBehaviorCallback.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.scijava.java3d.utils.behaviors.mouse;
 
 import org.scijava.java3d.Transform3D;
 
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseRotate.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseRotate.java
index ff2f3fb..293f93a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseRotate.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.scijava.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseTranslate.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseTranslate.java
index 3dabfae..e9e1e0b 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseTranslate.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.scijava.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseWheelZoom.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseWheelZoom.java
index 97904f8..1f01cae 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseWheelZoom.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.scijava.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseZoom.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseZoom.java
index 5fbe951..f400a45 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/MouseZoom.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.scijava.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/package.html b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/package.html
similarity index 80%
rename from src/classes/share/com/sun/j3d/utils/behaviors/mouse/package.html
rename to src/classes/share/org/scijava/java3d/utils/behaviors/mouse/package.html
index d943a49..9c0ab84 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/mouse/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.behaviors.mouse
+  org.scijava.java3d.utils.behaviors.mouse
 
 
 
Provides mouse navigation utility classes.

diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/Intersect.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/Intersect.java
index 09b7778..0abe2a9 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/Intersect.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.scijava.java3d.utils.behaviors.picking;
 
 import org.scijava.java3d.PickPoint;
 import org.scijava.java3d.PickRay;
@@ -47,7 +47,7 @@
 import org.scijava.vecmath.Tuple3d;
 import org.scijava.vecmath.Vector3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/picking/PickMouseBehavior.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickMouseBehavior.java
index 174cf56..edcc7c8 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickMouseBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.scijava.java3d.utils.behaviors.picking;
 
 import java.awt.AWTEvent;
 import java.awt.Event;
@@ -62,9 +62,9 @@
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * com.sun.j3d.utils.picking.behaviors.PickMouseBehavior
+ * org.scijava.java3d.utils.picking.behaviors.PickMouseBehavior
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickMouseBehavior
+ * @see org.scijava.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/scijava/java3d/utils/behaviors/picking/PickObject.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickObject.java
index c482cc3..fff80a0 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickObject.java
@@ -76,7 +76,7 @@ bool intersect(SceneGraphPath, PickShape)
 
 	*/
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.scijava.java3d.utils.behaviors.picking;
 
 import org.scijava.java3d.BranchGroup;
 import org.scijava.java3d.Canvas3D;
@@ -95,7 +95,7 @@ bool intersect(SceneGraphPath, PickShape)
 import org.scijava.vecmath.Point3d;
 import org.scijava.vecmath.Vector3d;
 
-import com.sun.j3d.utils.geometry.Primitive;
+import org.scijava.java3d.utils.geometry.Primitive;
 
 /*
  * Contains methods to aid in picking.  A PickObject is created
@@ -106,9 +106,9 @@ bool intersect(SceneGraphPath, PickShape)
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * com.sun.j3d.utils.picking.PickCanvas
+ * org.scijava.java3d.utils.picking.PickCanvas
  *
- * @see com.sun.j3d.utils.picking.PickCanvas
+ * @see org.scijava.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/scijava/java3d/utils/behaviors/picking/PickRotateBehavior.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickRotateBehavior.java
index b1f9145..e98c8b6 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickRotateBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.scijava.java3d.utils.behaviors.picking;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -45,8 +45,8 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseRotate;
 
 /*
  * A mouse behavior that allows user to pick and drag scene graph objects.
@@ -69,9 +69,9 @@
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * com.sun.j3d.utils.picking.behaviors.PickRotateBehavior
+ * org.scijava.java3d.utils.picking.behaviors.PickRotateBehavior
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickRotateBehavior
+ * @see org.scijava.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/scijava/java3d/utils/behaviors/picking/PickTranslateBehavior.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickTranslateBehavior.java
index 7f561d0..1f36f09 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickTranslateBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.scijava.java3d.utils.behaviors.picking;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -45,9 +45,9 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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.scijava.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.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 @@
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * com.sun.j3d.utils.picking.behaviors.PickTranslateBehavior
+ * org.scijava.java3d.utils.picking.behaviors.PickTranslateBehavior
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickTranslateBehavior
+ * @see org.scijava.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/scijava/java3d/utils/behaviors/picking/PickZoomBehavior.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickZoomBehavior.java
index 32cae2a..92ea7ba 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickZoomBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.scijava.java3d.utils.behaviors.picking;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -45,9 +45,9 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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.scijava.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseZoom;
 
 
 // A mouse behavior that allows user to pick and zoom scene graph objects.
@@ -56,9 +56,9 @@
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * com.sun.j3d.utils.picking.behaviors.PickZoomBehavior
+ * org.scijava.java3d.utils.picking.behaviors.PickZoomBehavior
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickZoomBehavior
+ * @see org.scijava.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/scijava/java3d/utils/behaviors/picking/PickingCallback.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickingCallback.java
index 1ff176e..7902829 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/PickingCallback.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.scijava.java3d.utils.behaviors.picking;
 
 import org.scijava.java3d.TransformGroup;
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * com.sun.j3d.utils.picking.behaviors.PickingCallback
+ * org.scijava.java3d.utils.picking.behaviors.PickingCallback
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickingCallback
+ * @see org.scijava.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/scijava/java3d/utils/behaviors/picking/package.html
similarity index 58%
rename from src/classes/share/com/sun/j3d/utils/compression/package.html
rename to src/classes/share/org/scijava/java3d/utils/behaviors/picking/package.html
index 628453b..27a2c7d 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/picking/package.html
@@ -3,11 +3,11 @@
 
   
-  com.sun.j3d.utils.compression
+  org.scijava.java3d.utils.behaviors.picking
 
 
 
Deprecated: Use com.sun.j3d.utils.geometry.compression
+ href="../../pickfast/behaviors/package-summary.html">org.scijava.java3d.utils.pickfast.behaviors
 instead.

 
 
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
index 27bcca0..9b80be1 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.java3d.utils.behaviors.sensor ;
 
 import java.util.Enumeration;
 
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorBeamEcho.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorBeamEcho.java
index 3762bd4..a68f430 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorBeamEcho.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.java3d.utils.behaviors.sensor ;
 
 import org.scijava.java3d.Appearance;
 import org.scijava.java3d.GeometryArray;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorButtonListener.java b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorButtonListener.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorButtonListener.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorButtonListener.java
index 0b54985..792febe 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorButtonListener.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorButtonListener.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.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/scijava/java3d/utils/behaviors/sensor/SensorEvent.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorEvent.java
index db22659..5616052 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorEvent.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.java3d.utils.behaviors.sensor ;
 
 import org.scijava.java3d.Sensor;
 import org.scijava.java3d.Transform3D;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorEventAgent.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorEventAgent.java
index c540ca5..4fba15a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorEventAgent.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.java3d.utils.behaviors.sensor ;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -46,7 +46,7 @@
 import org.scijava.java3d.Sensor;
 import org.scijava.java3d.Transform3D;
 
-import com.sun.j3d.utils.timer.J3DTimer;
+import org.scijava.java3d.utils.timer.J3DTimer;
 
 /**
  * This class works in conjunction with the SensorButtonListener
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorGnomonEcho.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorGnomonEcho.java
index c26b882..fd26b5e 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorGnomonEcho.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.java3d.utils.behaviors.sensor ;
 
 import org.scijava.java3d.Appearance;
 import org.scijava.java3d.GeometryArray;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorInputAdaptor.java b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorInputAdaptor.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorInputAdaptor.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorInputAdaptor.java
index cee6c02..d09c670 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorInputAdaptor.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorInputAdaptor.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.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/scijava/java3d/utils/behaviors/sensor/SensorReadListener.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorReadListener.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorReadListener.java
index f2f440c..4128833 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorReadListener.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/SensorReadListener.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.scijava.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/scijava/java3d/utils/behaviors/sensor/package.html
similarity index 79%
rename from src/classes/share/com/sun/j3d/utils/behaviors/sensor/package.html
rename to src/classes/share/org/scijava/java3d/utils/behaviors/sensor/package.html
index 25c9b13..dc96dfd 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/sensor/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.behaviors.sensor
+  org.scijava.java3d.utils.behaviors.sensor
 
 
 
Provides 6DOF sensor behavior classes.

diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java b/src/classes/share/org/scijava/java3d/utils/behaviors/vp/OrbitBehavior.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/vp/OrbitBehavior.java
index c023ee4..633b349 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/vp/OrbitBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp;
+package org.scijava.java3d.utils.behaviors.vp;
 
 import java.awt.AWTEvent;
 import java.awt.event.MouseEvent;
@@ -48,8 +48,8 @@
 import org.scijava.vecmath.Point3d;
 import org.scijava.vecmath.Vector3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.scijava.java3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
index 598f38f..8223f34 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp;
+package org.scijava.java3d.utils.behaviors.vp;
 
 import java.awt.AWTEvent;
 import java.awt.event.KeyListener;
@@ -53,8 +53,8 @@
 import org.scijava.java3d.WakeupOnBehaviorPost;
 import org.scijava.java3d.WakeupOnElapsedFrames;
 
-import com.sun.j3d.utils.universe.Viewer;
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.scijava.java3d.utils.universe.Viewer;
+import org.scijava.java3d.utils.universe.ViewingPlatform;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java b/src/classes/share/org/scijava/java3d/utils/behaviors/vp/ViewPlatformBehavior.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/vp/ViewPlatformBehavior.java
index 3d3fa0b..a1c1a95 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/vp/ViewPlatformBehavior.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp;
+package org.scijava.java3d.utils.behaviors.vp;
 
 import org.scijava.java3d.Behavior;
 import org.scijava.java3d.Transform3D;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.scijava.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/scijava/java3d/utils/behaviors/vp/WandViewBehavior.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/behaviors/vp/WandViewBehavior.java
index 5872e0c..296db76 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/vp/WandViewBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp ;
+package org.scijava.java3d.utils.behaviors.vp ;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -64,17 +64,17 @@
 import org.scijava.vecmath.Point3d;
 import org.scijava.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.scijava.java3d.utils.behaviors.sensor.SensorBeamEcho;
+import org.scijava.java3d.utils.behaviors.sensor.SensorButtonListener;
+import org.scijava.java3d.utils.behaviors.sensor.SensorEvent;
+import org.scijava.java3d.utils.behaviors.sensor.SensorEventAgent;
+import org.scijava.java3d.utils.behaviors.sensor.SensorGnomonEcho;
+import org.scijava.java3d.utils.behaviors.sensor.SensorInputAdaptor;
+import org.scijava.java3d.utils.behaviors.sensor.SensorReadListener;
+import org.scijava.java3d.utils.universe.ConfiguredUniverse;
+import org.scijava.java3d.utils.universe.SimpleUniverse;
+import org.scijava.java3d.utils.universe.Viewer;
+import org.scijava.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.
      * 

      * Syntax:
(NewViewPlatformBehavior <name>
-     * com.sun.j3d.utils.behaviors.vp.WandViewBehavior)
+     * org.scijava.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/scijava/java3d/utils/behaviors/vp/package.html
similarity index 81%
rename from src/classes/share/com/sun/j3d/utils/behaviors/vp/package.html
rename to src/classes/share/org/scijava/java3d/utils/behaviors/vp/package.html
index 4900193..edd171f 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/behaviors/vp/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.behaviors.vp
+  org.scijava.java3d.utils.behaviors.vp
 
 
 
Provides ViewPlatform navigation utility classes.

diff --git a/src/classes/share/com/sun/j3d/utils/compression/CommandStream.java b/src/classes/share/org/scijava/java3d/utils/compression/CommandStream.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/CommandStream.java
rename to src/classes/share/org/scijava/java3d/utils/compression/CommandStream.java
index 3eae922..326d150 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CommandStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/CommandStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.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/scijava/java3d/utils/compression/CompressedGeometryFile.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java
rename to src/classes/share/org/scijava/java3d/utils/compression/CompressedGeometryFile.java
index 3cf23d1..0033434 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/CompressedGeometryFile.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.compression;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -67,7 +67,7 @@
  * 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.scijava.java3d.utils.geometry.compression.{@link org.scijava.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/scijava/java3d/utils/compression/CompressionStream.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java
rename to src/classes/share/org/scijava/java3d/utils/compression/CompressionStream.java
index f9ded4c..ddbe87d 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.compression;
 
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
@@ -75,8 +75,8 @@
 import org.scijava.vecmath.Point3i;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.utils.geometry.GeometryInfo;
+import org.scijava.java3d.internal.BufferWrapper;
+import org.scijava.java3d.utils.geometry.GeometryInfo;
 
 /**
  * This class is used as input to a geometry compressor.  It collects elements
@@ -87,7 +87,7 @@
  * @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.scijava.java3d.utils.geometry.compression.{@link org.scijava.java3d.utils.geometry.compression.CompressionStream}.
  */
 public class CompressionStream {
     //
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamColor.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java
rename to src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamColor.java
index 2c9e1b8..c953df4 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamColor.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.compression;
 
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Color4f;
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamElement.java b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamElement.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/CompressionStreamElement.java
rename to src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamElement.java
index ed98617..c1b23d3 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamElement.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamElement.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.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/scijava/java3d/utils/compression/CompressionStreamNormal.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/CompressionStreamNormal.java
rename to src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamNormal.java
index 78d2c1e..6eca6b8 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamNormal.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamNormal.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.compression;
 
 import org.scijava.vecmath.Vector3f;
 
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamVertex.java b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamVertex.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/CompressionStreamVertex.java
rename to src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamVertex.java
index 31b578d..31282ad 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamVertex.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/CompressionStreamVertex.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.compression;
 
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Color4f;
diff --git a/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java b/src/classes/share/org/scijava/java3d/utils/compression/GeometryCompressor.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java
rename to src/classes/share/org/scijava/java3d/utils/compression/GeometryCompressor.java
index 8b3df1b..7357d81 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/GeometryCompressor.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.compression;
 
 import java.io.IOException;
 
@@ -58,7 +58,7 @@
  * @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.scijava.java3d.utils.geometry.compression.{@link org.scijava.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/scijava/java3d/utils/compression/HuffmanNode.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/HuffmanNode.java
rename to src/classes/share/org/scijava/java3d/utils/compression/HuffmanNode.java
index a89eec8..4274380 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/HuffmanNode.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/HuffmanNode.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.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/scijava/java3d/utils/compression/HuffmanTable.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/HuffmanTable.java
rename to src/classes/share/org/scijava/java3d/utils/compression/HuffmanTable.java
index 881a7ea..1148b69 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/HuffmanTable.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/HuffmanTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.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/scijava/java3d/utils/compression/MeshBuffer.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java
rename to src/classes/share/org/scijava/java3d/utils/compression/MeshBuffer.java
index 25c430e..d41b673 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java
+++ b/src/classes/share/org/scijava/java3d/utils/compression/MeshBuffer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.scijava.java3d.utils.compression;
 
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Color4f;
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/package.html b/src/classes/share/org/scijava/java3d/utils/compression/package.html
similarity index 59%
rename from src/classes/share/com/sun/j3d/utils/behaviors/picking/package.html
rename to src/classes/share/org/scijava/java3d/utils/compression/package.html
index b5d0b77..8ce1464 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/compression/package.html
@@ -3,11 +3,11 @@
 
   
-  com.sun.j3d.utils.behaviors.picking
+  org.scijava.java3d.utils.compression
 
 
 
Deprecated: Use com.sun.j3d.utils.pickfast.behaviors
+ href="../geometry/compression/package-summary.html">org.scijava.java3d.utils.geometry.compression
 instead.

 
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/BBox.java b/src/classes/share/org/scijava/java3d/utils/geometry/BBox.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/BBox.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/BBox.java
index a08d3eb..ca14113 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/BBox.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/BBox.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Basic.java b/src/classes/share/org/scijava/java3d/utils/geometry/Basic.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Basic.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Basic.java
index eecdadf..77537d8 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Basic.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Basic.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.vecmath.Tuple2f;
 import org.scijava.vecmath.Tuple3f;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java b/src/classes/share/org/scijava/java3d/utils/geometry/BottleNeck.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/BottleNeck.java
index 7087297..ede4a64 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/BottleNeck.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 class BottleNeck {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Box.java b/src/classes/share/org/scijava/java3d/utils/geometry/Box.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Box.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Box.java
index f871d5a..578d03e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Box.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Box.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.java3d.Appearance;
 import org.scijava.java3d.Node;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java b/src/classes/share/org/scijava/java3d/utils/geometry/Bridge.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Bridge.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Bridge.java
index 2dfb7ec..7f34bff 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Bridge.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 class Bridge {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Clean.java b/src/classes/share/org/scijava/java3d/utils/geometry/Clean.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Clean.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Clean.java
index 654031e..e42d673 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Clean.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Clean.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.vecmath.Point2f;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java b/src/classes/share/org/scijava/java3d/utils/geometry/ColorCube.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/ColorCube.java
index bbd11d0..6289a9c 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/ColorCube.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.java3d.QuadArray;
 import org.scijava.java3d.Shape3D;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Cone.java b/src/classes/share/org/scijava/java3d/utils/geometry/Cone.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Cone.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Cone.java
index 7e0d466..8944815 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Cone.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Cone.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.java3d.Appearance;
 import org.scijava.java3d.Node;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java b/src/classes/share/org/scijava/java3d/utils/geometry/Cylinder.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Cylinder.java
index 6983003..4867d86 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Cylinder.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.java3d.Appearance;
 import org.scijava.java3d.Node;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java b/src/classes/share/org/scijava/java3d/utils/geometry/Degenerate.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Degenerate.java
index 960437f..f17839c 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Degenerate.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 class Degenerate {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java b/src/classes/share/org/scijava/java3d/utils/geometry/Desperate.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Desperate.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Desperate.java
index 1f324f4..f324677 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Desperate.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.vecmath.Point2f;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Distance.java b/src/classes/share/org/scijava/java3d/utils/geometry/Distance.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/Distance.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Distance.java
index be3d3d1..d33cf96 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Distance.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Distance.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/EarClip.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/EarClip.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/EarClip.java
index d7be619..299a92f 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/EarClip.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 class EarClip {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Edge.java b/src/classes/share/org/scijava/java3d/utils/geometry/Edge.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/Edge.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Edge.java
index 1841a0e..a768dfd 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Edge.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Edge.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/EdgeTable.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/EdgeTable.java
index 337f353..38cfd8d 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/EdgeTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/GeomBuffer.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/GeomBuffer.java
index 78c6342..b265443 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/GeomBuffer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.java3d.Geometry;
 import org.scijava.java3d.GeometryArray;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java b/src/classes/share/org/scijava/java3d/utils/geometry/GeometryInfo.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/GeometryInfo.java
index 5c32d58..4dc37fa 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/GeometryInfo.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -70,7 +70,7 @@
 import org.scijava.vecmath.Tuple4f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.internal.J3dUtilsI18N;
 
 /**
  * The GeometryInfo object holds data for processing by the Java3D geometry
@@ -134,8 +134,8 @@
  *
  * @see NormalGenerator
  * @see Stripifier
- * @see com.sun.j3d.utils.compression.CompressionStream
- * @see com.sun.j3d.utils.compression.GeometryCompressor
+ * @see org.scijava.java3d.utils.compression.CompressionStream
+ * @see org.scijava.java3d.utils.compression.GeometryCompressor
  * @see org.scijava.java3d.GeometryArray
  */
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java b/src/classes/share/org/scijava/java3d/utils/geometry/GeometryInfoGenerator.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/GeometryInfoGenerator.java
index dfd9ed5..0320e43 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/GeometryInfoGenerator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
@@ -67,8 +67,8 @@
 import org.scijava.vecmath.TexCoord4f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.internal.BufferWrapper;
+import org.scijava.java3d.internal.J3dUtilsI18N;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java b/src/classes/share/org/scijava/java3d/utils/geometry/GeometryServiceImpl.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/GeometryServiceImpl.java
index e833295..924d84c 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/GeometryServiceImpl.java
@@ -1,5 +1,5 @@
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.util.ArrayList;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Heap.java b/src/classes/share/org/scijava/java3d/utils/geometry/Heap.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Heap.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Heap.java
index a0e23f2..0a319e9 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Heap.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Heap.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 class Heap {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/HeapNode.java b/src/classes/share/org/scijava/java3d/utils/geometry/HeapNode.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/HeapNode.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/HeapNode.java
index 12f369b..91387db 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/HeapNode.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/HeapNode.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/Left.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/Left.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Left.java
index dd6edc4..576ca3a 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Left.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Left.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/ListNode.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/ListNode.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/ListNode.java
index 089d664..ef00624 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/ListNode.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/ListNode.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/NoHash.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/NoHash.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/NoHash.java
index 7286506..2cf327d 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/NoHash.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 class NoHash {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java b/src/classes/share/org/scijava/java3d/utils/geometry/NormalGenerator.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/NormalGenerator.java
index 5125ad1..b6cde18 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/NormalGenerator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.util.ArrayList;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java b/src/classes/share/org/scijava/java3d/utils/geometry/Numerics.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Numerics.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Numerics.java
index 55e5719..a0cd756 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Numerics.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.vecmath.Point2f;
 import org.scijava.vecmath.Tuple2f;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java b/src/classes/share/org/scijava/java3d/utils/geometry/Orientation.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Orientation.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Orientation.java
index c8ae26d..f53a5ef 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Orientation.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 
 class Orientation {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/PntNode.java b/src/classes/share/org/scijava/java3d/utils/geometry/PntNode.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/PntNode.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/PntNode.java
index a2b0252..01728ca 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/PntNode.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/PntNode.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/Primitive.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Primitive.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Primitive.java
index 607e39f..2f4aa5d 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Primitive.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.util.Hashtable;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Project.java b/src/classes/share/org/scijava/java3d/utils/geometry/Project.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Project.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Project.java
index c4f54c8..7c7e0ea 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Project.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Project.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.vecmath.Matrix4f;
 import org.scijava.vecmath.Point3f;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java b/src/classes/share/org/scijava/java3d/utils/geometry/Quadrics.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Quadrics.java
index bfaaac0..4cb9624 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Quadrics.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/Simple.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Simple.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Simple.java
index c1ae2c9..93d868a 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Simple.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Simple.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.vecmath.Point3f;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java b/src/classes/share/org/scijava/java3d/utils/geometry/Sphere.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Sphere.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Sphere.java
index c3d1e90..0e89025 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Sphere.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import org.scijava.java3d.Appearance;
 import org.scijava.java3d.Node;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java b/src/classes/share/org/scijava/java3d/utils/geometry/Stripifier.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Stripifier.java
index 9f7f827..f40cb2a 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Stripifier.java
@@ -52,11 +52,11 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.util.ArrayList;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.internal.J3dUtilsI18N;
 
 /**
  * The Stripifier utility will change the primitive of the GeometryInfo
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/StripifierStats.java b/src/classes/share/org/scijava/java3d/utils/geometry/StripifierStats.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/StripifierStats.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/StripifierStats.java
index 5431473..cf8cbfa 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/StripifierStats.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/StripifierStats.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/Text2D.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Text2D.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Text2D.java
index db0cba2..6be1bfe 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Text2D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Triangle.java b/src/classes/share/org/scijava/java3d/utils/geometry/Triangle.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/Triangle.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Triangle.java
index a27ea4b..c38c322 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Triangle.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Triangle.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.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/scijava/java3d/utils/geometry/Triangulator.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/Triangulator.java
index 84b138d..304d4bd 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/Triangulator.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.geometry;
 
 import java.util.Random;
 
@@ -60,7 +60,7 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/geometry/compression/CommandStream.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CommandStream.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CommandStream.java
index 576fbc4..0f8693b 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CommandStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CommandStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.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/scijava/java3d/utils/geometry/compression/CompressedGeometryData.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressedGeometryData.java
index 2267242..f3a1877 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressedGeometryData.java
@@ -37,14 +37,14 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import org.scijava.java3d.Canvas3D;
 import org.scijava.java3d.J3DBuffer;
 import org.scijava.java3d.Shape3D;
 import org.scijava.vecmath.Point3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/geometry/compression/CompressedGeometryFile.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressedGeometryFile.java
index e7c227e..e495923 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressedGeometryFile.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressedGeometryRetained.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressedGeometryRetained.java
index dd98c22..827ea51 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressedGeometryRetained.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import org.scijava.java3d.GeometryArray;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStream.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStream.java
index 55a1771..1e9498d 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
@@ -74,8 +74,8 @@
 import org.scijava.vecmath.Point3i;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.utils.geometry.GeometryInfo;
+import org.scijava.java3d.internal.BufferWrapper;
+import org.scijava.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/geometry/compression/CompressionStreamColor.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamColor.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamColor.java
index 54832ef..3752fcc 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamColor.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Color4f;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamElement.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamElement.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamElement.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamElement.java
index 2e8fe98..73ffc16 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamElement.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamElement.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.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/geometry/compression/CompressionStreamNormal.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamNormal.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamNormal.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamNormal.java
index 37ffd3a..2c55a22 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamNormal.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamNormal.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import org.scijava.vecmath.Vector3f;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamVertex.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamVertex.java
index 9dc356c..7780aee 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/CompressionStreamVertex.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Color4f;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStrip.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedStrip.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStrip.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedStrip.java
index 029fd0b..6fffa71 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStrip.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedStrip.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.java3d.internal.J3dUtilsI18N;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStripFlags.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedStripFlags.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStripFlags.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedStripFlags.java
index 9fd75ea..517bde9 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStripFlags.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedStripFlags.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.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/scijava/java3d/utils/geometry/compression/GeneralizedVertexList.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedVertexList.java
index 8086c08..780baf6 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeneralizedVertexList.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import java.util.ArrayList;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryCompressor.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryCompressor.java
index c284229..4dbf178 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryCompressor.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import java.io.IOException;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryDecompressor.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryDecompressor.java
index b9bda00..481e7d7 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryDecompressor.java
@@ -37,14 +37,14 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import org.scijava.java3d.CompressedGeometryHeader;
 import org.scijava.vecmath.Color4f;
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/geometry/compression/GeometryDecompressorShape3D.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryDecompressorShape3D.java
index cb6029f..24a9b27 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/GeometryDecompressorShape3D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import java.util.ArrayList;
 
@@ -55,7 +55,7 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/geometry/compression/HuffmanNode.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanNode.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/HuffmanNode.java
index b0f16b5..8b465d8 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanNode.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/HuffmanNode.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.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/scijava/java3d/utils/geometry/compression/HuffmanTable.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanTable.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/HuffmanTable.java
index f874e5a..bbfd25e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanTable.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/HuffmanTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.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/scijava/java3d/utils/geometry/compression/MeshBuffer.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/MeshBuffer.java
index e4ebca8..3c0cdf3 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/MeshBuffer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.scijava.java3d.utils.geometry.compression;
 
 import org.scijava.vecmath.Color3f;
 import org.scijava.vecmath.Color4f;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/package.html b/src/classes/share/org/scijava/java3d/utils/geometry/compression/package.html
similarity index 72%
rename from src/classes/share/com/sun/j3d/utils/geometry/compression/package.html
rename to src/classes/share/org/scijava/java3d/utils/geometry/compression/package.html
index 8c7ed6b..fba9f3f 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/compression/package.html
@@ -3,11 +3,11 @@
 
   
-  com.sun.j3d.utils.geometry.compression
+  org.scijava.java3d.utils.geometry.compression
 
 
 
Provides compressed geometry utility classes.
   This package supersedes the org.scijava.java3d.CompressedGeometry class and
-  the com.sun.j3d.utils.compression package.

+  the org.scijava.java3d.utils.compression package.

 
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/package.html b/src/classes/share/org/scijava/java3d/utils/geometry/package.html
similarity index 84%
rename from src/classes/share/com/sun/j3d/utils/geometry/package.html
rename to src/classes/share/org/scijava/java3d/utils/geometry/package.html
index 49da2ca..68d4f86 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/geometry/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.geometry
+  org.scijava.java3d.utils.geometry
 
 
 
Provides geometry construction, triangulation, and optimization
diff --git a/src/classes/share/com/sun/j3d/utils/image/ImageException.java b/src/classes/share/org/scijava/java3d/utils/image/ImageException.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/image/ImageException.java
rename to src/classes/share/org/scijava/java3d/utils/image/ImageException.java
index fef584a..60d8c66 100644
--- a/src/classes/share/com/sun/j3d/utils/image/ImageException.java
+++ b/src/classes/share/org/scijava/java3d/utils/image/ImageException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.image;
+package org.scijava.java3d.utils.image;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java b/src/classes/share/org/scijava/java3d/utils/image/TextureLoader.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/image/TextureLoader.java
rename to src/classes/share/org/scijava/java3d/utils/image/TextureLoader.java
index 91faeff..48a71f4 100644
--- a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java
+++ b/src/classes/share/org/scijava/java3d/utils/image/TextureLoader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.image;
+package org.scijava.java3d.utils.image;
 
 import java.awt.Component;
 import java.awt.Image;
diff --git a/src/classes/share/com/sun/j3d/utils/image/package.html b/src/classes/share/org/scijava/java3d/utils/image/package.html
similarity index 82%
rename from src/classes/share/com/sun/j3d/utils/image/package.html
rename to src/classes/share/org/scijava/java3d/utils/image/package.html
index e32c5d8..aa39a54 100644
--- a/src/classes/share/com/sun/j3d/utils/image/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/image/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.image
+  org.scijava.java3d.utils.image
 
 
 
Provides texture image utility classes.

diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java b/src/classes/share/org/scijava/java3d/utils/pickfast/PickCanvas.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/PickCanvas.java
index aa2ae6f..bca428a 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/PickCanvas.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast;
+package org.scijava.java3d.utils.pickfast;
 
 import java.awt.event.MouseEvent;
 
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java b/src/classes/share/org/scijava/java3d/utils/pickfast/PickIntersection.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/PickIntersection.java
index 438f276..c58023a 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/PickIntersection.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast;
+package org.scijava.java3d.utils.pickfast;
 
 import org.scijava.java3d.Geometry;
 import org.scijava.java3d.GeometryArray;
@@ -60,7 +60,7 @@
  * The intersected primitive indicates which primitive out of the GeometryArray
  * was intersected (where the primitive is a point, line, triangle or quad,
  * not a
- * com.sun.j3d.utils.geometry.Primitive).
+ * org.scijava.java3d.utils.geometry.Primitive).
  * 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/scijava/java3d/utils/pickfast/PickTool.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/PickTool.java
index 11e63cd..57a5a43 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/PickTool.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast;
+package org.scijava.java3d.utils.pickfast;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -62,7 +62,7 @@
 import org.scijava.vecmath.Point3d;
 import org.scijava.vecmath.Vector3d;
 
-import com.sun.j3d.utils.geometry.Primitive;
+import org.scijava.java3d.utils.geometry.Primitive;
 
 /**
  * The base class for optimized picking operations.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickMouseBehavior.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickMouseBehavior.java
index 97a17ee..9e9980c 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickMouseBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
+package org.scijava.java3d.utils.pickfast.behaviors;
 
 import java.awt.AWTEvent;
 import java.awt.Event;
@@ -53,8 +53,8 @@
 import org.scijava.java3d.WakeupOnAWTEvent;
 import org.scijava.java3d.WakeupOr;
 
-import com.sun.j3d.utils.pickfast.PickCanvas;
-import com.sun.j3d.utils.pickfast.PickTool;
+import org.scijava.java3d.utils.pickfast.PickCanvas;
+import org.scijava.java3d.utils.pickfast.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickRotateBehavior.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickRotateBehavior.java
index 19d1913..0ead79c 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickRotateBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
+package org.scijava.java3d.utils.pickfast.behaviors;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -46,9 +46,9 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
-import com.sun.j3d.utils.pickfast.PickTool;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseRotate;
+import org.scijava.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/scijava/java3d/utils/pickfast/behaviors/PickTranslateBehavior.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickTranslateBehavior.java
index 7536c38..8ca4113 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickTranslateBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
+package org.scijava.java3d.utils.pickfast.behaviors;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -46,10 +46,10 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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 com.sun.j3d.utils.pickfast.PickTool;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseTranslate;
+import org.scijava.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/scijava/java3d/utils/pickfast/behaviors/PickZoomBehavior.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickZoomBehavior.java
index 232b49f..7b49fc2 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickZoomBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
+package org.scijava.java3d.utils.pickfast.behaviors;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -46,10 +46,10 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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 com.sun.j3d.utils.pickfast.PickTool;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseZoom;
+import org.scijava.java3d.utils.pickfast.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickingCallback.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java
rename to src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickingCallback.java
index 449c623..e9935bd 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/PickingCallback.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
+package org.scijava.java3d.utils.pickfast.behaviors;
 
 import org.scijava.java3d.TransformGroup;
 
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/package.html b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/package.html
similarity index 80%
rename from src/classes/share/com/sun/j3d/utils/pickfast/behaviors/package.html
rename to src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/package.html
index c401786..1c4211e 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/behaviors/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.pickfast.behaviors
+  org.scijava.java3d.utils.pickfast.behaviors
 
 
 
Provides picking behaviors for the new core picking methods.

diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/package.html b/src/classes/share/org/scijava/java3d/utils/pickfast/package.html
similarity index 83%
rename from src/classes/share/com/sun/j3d/utils/pickfast/package.html
rename to src/classes/share/org/scijava/java3d/utils/pickfast/package.html
index b23eb91..96bc6ca 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/pickfast/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.pickfast
+  org.scijava.java3d.utils.pickfast
 
 
 
Provides picking utility classes for the new core picking methods.

diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java b/src/classes/share/org/scijava/java3d/utils/picking/PickCanvas.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java
rename to src/classes/share/org/scijava/java3d/utils/picking/PickCanvas.java
index 102ccbf..c0c244f 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/PickCanvas.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
+package org.scijava.java3d.utils.picking;
 
 import java.awt.event.MouseEvent;
 
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java b/src/classes/share/org/scijava/java3d/utils/picking/PickIntersection.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java
rename to src/classes/share/org/scijava/java3d/utils/picking/PickIntersection.java
index a4b772f..38fccbf 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/PickIntersection.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
+package org.scijava.java3d.utils.picking;
 
 import org.scijava.java3d.GeometryArray;
 import org.scijava.java3d.IndexedGeometryArray;
@@ -65,7 +65,7 @@
  * The intersected primitive indicates which primitive out of the GeometryArray
  * was intersected (where the primitive is a point, line, triangle or quad,
  * not a
- * com.sun.j3d.utils.geometry.Primitive).
+ * org.scijava.java3d.utils.geometry.Primitive).
  * 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/picking/PickResult.java b/src/classes/share/org/scijava/java3d/utils/picking/PickResult.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/picking/PickResult.java
rename to src/classes/share/org/scijava/java3d/utils/picking/PickResult.java
index 452ab7d..3106ff5 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickResult.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/PickResult.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
+package org.scijava.java3d.utils.picking;
 
 import java.util.ArrayList;
 
@@ -92,8 +92,8 @@
 import org.scijava.vecmath.Vector3d;
 import org.scijava.vecmath.Vector4d;
 
-import com.sun.j3d.internal.Distance;
-import com.sun.j3d.utils.geometry.Primitive;
+import org.scijava.java3d.internal.Distance;
+import org.scijava.java3d.utils.geometry.Primitive;
 
 /**
  * Stores information about a pick hit.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickTool.java b/src/classes/share/org/scijava/java3d/utils/picking/PickTool.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/picking/PickTool.java
rename to src/classes/share/org/scijava/java3d/utils/picking/PickTool.java
index 6850ecd..821fad2 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickTool.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/PickTool.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
+package org.scijava.java3d.utils.picking;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -242,7 +242,7 @@ public Locale setBranchGroup (Locale l) {
      * Sets the capabilities on the Node and it's components to allow
      * picking at the specified detail level.
      * 

-     * Note that by default all com.sun.j3d.utils.geometry.Primitive
+     * Note that by default all org.scijava.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
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickMouseBehavior.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickMouseBehavior.java
index 6863657..7a8d048 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickMouseBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
+package org.scijava.java3d.utils.picking.behaviors;
 
 import java.awt.AWTEvent;
 import java.awt.Event;
@@ -53,8 +53,8 @@
 import org.scijava.java3d.WakeupOnAWTEvent;
 import org.scijava.java3d.WakeupOr;
 
-import com.sun.j3d.utils.picking.PickCanvas;
-import com.sun.j3d.utils.picking.PickTool;
+import org.scijava.java3d.utils.picking.PickCanvas;
+import org.scijava.java3d.utils.picking.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickRotateBehavior.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickRotateBehavior.java
index 39ed217..ed5a589 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickRotateBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
+package org.scijava.java3d.utils.picking.behaviors;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -45,10 +45,10 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.java3d.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;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseRotate;
+import org.scijava.java3d.utils.picking.PickResult;
+import org.scijava.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/scijava/java3d/utils/picking/behaviors/PickTranslateBehavior.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickTranslateBehavior.java
index 542c262..3c0b28d 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickTranslateBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
+package org.scijava.java3d.utils.picking.behaviors;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -45,11 +45,11 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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 com.sun.j3d.utils.picking.PickResult;
-import com.sun.j3d.utils.picking.PickTool;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseTranslate;
+import org.scijava.java3d.utils.picking.PickResult;
+import org.scijava.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/scijava/java3d/utils/picking/behaviors/PickZoomBehavior.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickZoomBehavior.java
index bf75264..a951b52 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickZoomBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
+package org.scijava.java3d.utils.picking.behaviors;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.BranchGroup;
@@ -45,11 +45,11 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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 com.sun.j3d.utils.picking.PickResult;
-import com.sun.j3d.utils.picking.PickTool;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.scijava.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.scijava.java3d.utils.behaviors.mouse.MouseZoom;
+import org.scijava.java3d.utils.picking.PickResult;
+import org.scijava.java3d.utils.picking.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickingCallback.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java
rename to src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickingCallback.java
index f7df6cb..93a9fad 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java
+++ b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/PickingCallback.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
+package org.scijava.java3d.utils.picking.behaviors;
 
 import org.scijava.java3d.TransformGroup;
 
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/package.html b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/package.html
similarity index 81%
rename from src/classes/share/com/sun/j3d/utils/picking/behaviors/package.html
rename to src/classes/share/org/scijava/java3d/utils/picking/behaviors/package.html
index 21ef9e7..13445e5 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/picking/behaviors/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.picking.behaviors
+  org.scijava.java3d.utils.picking.behaviors
 
 
 
OBSOLETE: 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/scijava/java3d/utils/picking/package.html
similarity index 84%
rename from src/classes/share/com/sun/j3d/utils/picking/package.html
rename to src/classes/share/org/scijava/java3d/utils/picking/package.html
index 1b9d21b..640cf6d 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/picking/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.picking
+  org.scijava.java3d.utils.picking
 
 
 
OBSOLETE: 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/scijava/java3d/utils/scenegraph/io/NamedObjectException.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/NamedObjectException.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/NamedObjectException.java
index bea6d1e..6fde83a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/NamedObjectException.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/NamedObjectException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/ObjectNotLoadedException.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/ObjectNotLoadedException.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/ObjectNotLoadedException.java
index 6fb363a..e6bc568 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/ObjectNotLoadedException.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/ObjectNotLoadedException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/SceneGraphFileReader.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphFileReader.java
index 7789954..ad46a80 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphFileReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.java3d.utils.scenegraph.io;
 
 import java.io.IOException;
 
@@ -45,8 +45,8 @@
 import org.scijava.java3d.Canvas3D;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import org.scijava.java3d.utils.scenegraph.io.retained.RandomAccessFileControl;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/SceneGraphFileWriter.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphFileWriter.java
index 635200b..4e6b537 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphFileWriter.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.java3d.utils.scenegraph.io;
 
 import java.io.File;
 import java.io.IOException;
@@ -45,8 +45,8 @@
 import org.scijava.java3d.BranchGroup;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl;
-import com.sun.j3d.utils.universe.SimpleUniverse;
+import org.scijava.java3d.utils.scenegraph.io.retained.RandomAccessFileControl;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/SceneGraphIO.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphIO.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphIO.java
index 58dee3d..d5b2e81 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphIO.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphIO.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
index 8f1badf..35fe421 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.java3d.utils.scenegraph.io;
 
 /**
  * Provides and resolves references to SceneGraphObjects to enable
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStateProvider.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStateProvider.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
index 77daed3..3271358 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStateProvider.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.java3d.utils.scenegraph.io;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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/scijava/java3d/utils/scenegraph/io/SceneGraphStreamReader.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphStreamReader.java
index c655635..e90c7cc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphStreamReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.java3d.utils.scenegraph.io;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.BranchGroup;
 import org.scijava.java3d.Canvas3D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.StreamControl;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import org.scijava.java3d.utils.scenegraph.io.retained.StreamControl;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/SceneGraphStreamWriter.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphStreamWriter.java
index 89b4b86..9740827 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/SceneGraphStreamWriter.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.java3d.utils.scenegraph.io;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.BranchGroup;
 import org.scijava.java3d.DanglingReferenceException;
 
-import com.sun.j3d.utils.scenegraph.io.retained.StreamControl;
-import com.sun.j3d.utils.universe.SimpleUniverse;
+import org.scijava.java3d.utils.scenegraph.io.retained.StreamControl;
+import org.scijava.java3d.utils.universe.SimpleUniverse;
 
 /**
  * Writes a Java3D SceneGraph to a Java OutputStream.

diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/UnresolvedBehavior.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/UnresolvedBehavior.java
index e7f3aa4..14b5c6a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/UnresolvedBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.java3d.utils.scenegraph.io;
 
 /**
  * This Behavior is used in place of any behaviors which can not
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnsupportedUniverseException.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/UnsupportedUniverseException.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/UnsupportedUniverseException.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/UnsupportedUniverseException.java
index a18902d..2e29cba 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnsupportedUniverseException.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/UnsupportedUniverseException.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.scijava.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.scijava.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/scijava/java3d/utils/scenegraph/io/doc-files/extensibility.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/doc-files/extensibility.html
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/doc-files/extensibility.html
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/package.html b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/package.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/package.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/scenegraph/io/retained/Controller.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/Controller.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/Controller.java
index 2eec37d..595774d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/Controller.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/Controller.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.java3d.utils.scenegraph.io.retained;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -74,16 +74,16 @@
 import org.scijava.vecmath.Vector4d;
 import org.scijava.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.scijava.java3d.utils.scenegraph.io.NamedObjectException;
+import org.scijava.java3d.utils.scenegraph.io.ObjectNotLoadedException;
+import org.scijava.java3d.utils.scenegraph.io.SceneGraphStateProvider;
+import org.scijava.java3d.utils.scenegraph.io.UnsupportedUniverseException;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.universe.SimpleUniverseState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.ImageComponentState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.NullSceneGraphObjectState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.SceneGraphObjectState;
+import org.scijava.java3d.utils.universe.ConfiguredUniverse;
+import org.scijava.java3d.utils.universe.SimpleUniverse;
 
 /**
  * Provides code to control the reading and writing of Java3D objects to and
@@ -224,12 +224,12 @@ public SceneGraphObjectState createState( SymbolTableData symbol ) {
               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.scijava.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.scijava.java3d.utils.scenegraph.io.SceneGraphIO))
+                System.out.println("Could not find "+"org.scijava.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 @@ private SceneGraphObjectState constructStateObj( SymbolTableData symbol,
 
         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.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData.class,
+                                              org.scijava.java3d.utils.scenegraph.io.retained.Controller.class
                                             } );
             ret = (SceneGraphObjectState)construct.newInstance(
                                                 new Object[]{ symbol, this } );
@@ -287,7 +287,7 @@ private SceneGraphObjectState checkSuperClasses( SymbolTableData symbol ) {
             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.scijava.java3d.utils.scenegraph.io.state."+name+"State" );
             } catch(ClassNotFoundException e) {
                 state = null;
             }
@@ -333,8 +333,8 @@ else if (classID==0) {
                 // 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.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData.class,
+                        org.scijava.java3d.utils.scenegraph.io.retained.Controller.class} );
 
                 // System.out.println("Got constructor "+construct );
                 state = (SceneGraphObjectState)construct.newInstance(
@@ -484,8 +484,8 @@ public ConfiguredUniverse readUniverse(DataInput in, boolean attachBranchGraphs,
         //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.scijava.java3d.utils.universe.SimpleUniverse")) ||
+                  (universeClass.equals("org.scijava.java3d.utils.universe.ConfiguredUniverse")) ) {
             SimpleUniverseState state = new SimpleUniverseState( this );
             state.readObject( in, canvas );
 
@@ -534,7 +534,7 @@ else if (classID==0)
 
         Class j3dClass = getNodeClassFromID( classID-1 );
         String j3dClassName = j3dClass.getName();
-        String stateClassName = "com.sun.j3d.utils.scenegraph.io.state."+j3dClassName+"State";
+        String stateClassName = "org.scijava.java3d.utils.scenegraph.io.state."+j3dClassName+"State";
 
         SceneGraphObjectState stateObj = null;
         try {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fInputStream.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/J3fInputStream.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fInputStream.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/J3fInputStream.java
index a05700b..2ec7cb9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fInputStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/J3fInputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/retained/J3fOutputStream.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fOutputStream.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/J3fOutputStream.java
index b25495c..95c6fae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fOutputStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/J3fOutputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/retained/PositionInputStream.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/PositionInputStream.java
index 15479af..8870e41 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/PositionInputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/retained/PositionOutputStream.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/PositionOutputStream.java
index ae9b984..fa7822e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/PositionOutputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
index f222b6b..9a09562 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,11 +48,11 @@
 import org.scijava.java3d.Canvas3D;
 import org.scijava.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.scijava.java3d.utils.scenegraph.io.UnsupportedUniverseException;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.BranchGroupState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.SceneGraphObjectState;
+import org.scijava.java3d.utils.universe.ConfiguredUniverse;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/retained/SGIORuntimeException.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SGIORuntimeException.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SGIORuntimeException.java
index 5698fbb..cadc642 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SGIORuntimeException.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SGIORuntimeException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.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/scijava/java3d/utils/scenegraph/io/retained/StreamControl.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/StreamControl.java
index db647bc..34ef767 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/StreamControl.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -46,7 +46,7 @@
 
 import org.scijava.java3d.BranchGroup;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.SceneGraphObjectState;
 
 /**
  * Provides the infrastructure for ScenGraphStream Reader and Writer
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SymbolTable.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SymbolTable.java
index c4a2f91..f96afee 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SymbolTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataOutput;
 import java.io.IOException;
@@ -51,12 +51,12 @@
 
 import org.scijava.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.scijava.java3d.utils.scenegraph.io.NamedObjectException;
+import org.scijava.java3d.utils.scenegraph.io.ObjectNotLoadedException;
+import org.scijava.java3d.utils.scenegraph.io.SceneGraphObjectReferenceControl;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.NodeComponentState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.NullSceneGraphObjectState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.SceneGraphObjectState;
 
 /**
  * SymbolTable class for SceneGraph I/O.
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SymbolTableData.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SymbolTableData.java
index 49b9974..6e585ab 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/retained/SymbolTableData.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.scijava.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,7 +45,7 @@
 
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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/javax/media/j3d/AlphaState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AlphaState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AlphaState.java
index 36abff5..f16b9d7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AlphaState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AlternateAppearanceState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AlternateAppearanceState.java
index 8bfdbec..f28ee1b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AlternateAppearanceState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -49,8 +49,8 @@
 import org.scijava.java3d.Group;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AmbientLightState.java
similarity index 90%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AmbientLightState.java
index 88082a8..579c63b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AmbientLightState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.AmbientLight;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AmbientLightState extends LightState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AppearanceState.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AppearanceState.java
index 7ad601f..2444317 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AppearanceState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -56,8 +56,8 @@
 import org.scijava.java3d.TextureUnitState;
 import org.scijava.java3d.TransparencyAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AppearanceState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AuralAttributesState.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AuralAttributesState.java
index 716259c..671c642 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/AuralAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.AuralAttributes;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BackgroundSoundState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BackgroundSoundState.java
index 41e9b2d..af2dff2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BackgroundSoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.BackgroundSound;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BackgroundState.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BackgroundState.java
index 8076593..1173de2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BackgroundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -50,8 +50,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BehaviorState.java
similarity index 90%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BehaviorState.java
index a18a45e..83a1bac 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BehaviorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.BoundingLeaf;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BehaviorState extends LeafState {
 
@@ -64,8 +64,8 @@ protected SceneGraphObject createNode( String className ) {
         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.scijava.java3d.utils.scenegraph.io.retained.SGIORuntimeException e ) {
+            ret = new org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BillboardState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BillboardState.java
index 7e2be7e..23d2cb8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BillboardState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -49,8 +49,8 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BoundingLeafState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BoundingLeafState.java
index 3647cdd..1cd67f5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BoundingLeafState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.BoundingLeaf;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BranchGroupState.java
similarity index 91%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BranchGroupState.java
index 00ddb99..849eeb4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/BranchGroupState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.BranchGroup;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ClipState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ClipState.java
index cbab2c4..87b6d88 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ClipState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.BoundingLeaf;
 import org.scijava.java3d.Clip;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ColorInterpolatorState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ColorInterpolatorState.java
index 131d165..304215c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ColorInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ColorInterpolatorState extends InterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ColoringAttributesState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ColoringAttributesState.java
index c205739..8b0c078 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ColoringAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/CompressedGeometryState.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/CompressedGeometryState.java
index a589951..4a8839f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/CompressedGeometryState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.vecmath.Point3d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ConeSoundState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ConeSoundState.java
index df3861b..eb47b79 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ConeSoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DecalGroupState.java
similarity index 91%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DecalGroupState.java
index 230744d..407dd42 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DecalGroupState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.DecalGroup;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentFloatState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentFloatState.java
index 8f71c0b..6be85af 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentFloatState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.DepthComponentFloat;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DepthComponentFloatState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentIntState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentIntState.java
index 50a4f90..d41ba0e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentIntState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.DepthComponentInt;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DepthComponentIntState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentNativeState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentNativeState.java
index f149541..d478cb9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DepthComponentNativeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.DepthComponentNative;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 /**
  * We have no access to the data inside a DepthComponentNative and
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DirectionalLightState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DirectionalLightState.java
index d7ffcab..ddffab0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DirectionalLightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.DirectionalLight;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DirectionalLightState extends LightState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DistanceLODState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DistanceLODState.java
index 9b69097..543d1f9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/DistanceLODState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DistanceLODState extends LODState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ExponentialFogState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ExponentialFogState.java
index e4969b4..3486a2b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ExponentialFogState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.ExponentialFog;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ExponentialFogState extends FogState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/FogState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/FogState.java
index 630ca7b..3db41f1 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/FogState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.java3d.Group;
 import org.scijava.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Font3DState.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Font3DState.java
index a3eb263..31fedcc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Font3DState.java
@@ -36,7 +36,7 @@
  * maintenance of any nuclear facility.
  *
  */
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.awt.Font;
 import java.awt.Shape;
@@ -50,8 +50,8 @@
 import org.scijava.java3d.FontExtrusion;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryArrayState.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryArrayState.java
index a454ee0..31ba905 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -65,9 +65,9 @@
 import org.scijava.vecmath.TexCoord3f;
 import org.scijava.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.scijava.java3d.internal.BufferWrapper;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryState.java
similarity index 90%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryState.java
index 65dd7ba..efab9af 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryState.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryStripArrayState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryStripArrayState.java
index 26fb0c8..7995534 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GeometryStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.GeometryStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GroupState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GroupState.java
index f85ff10..eab640e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/GroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.Group;
 import org.scijava.java3d.Node;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class GroupState extends NodeState {
 
@@ -95,8 +95,8 @@ public void readObject( DataInput in ) throws IOException {
   }
 
   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.scijava.java3d.utils.scenegraph.io.SceneGraphIO)
+          return ((org.scijava.java3d.utils.scenegraph.io.SceneGraphIO)node).saveChildren();
       else
           return processChildren();
   }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponent2DState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponent2DState.java
index 3cb12c2..58f9b8f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponent2DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.awt.image.BufferedImage;
 import java.io.DataInput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.ImageComponent2D;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ImageComponent2DState extends ImageComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponent3DState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponent3DState.java
index fd80c39..0e8a76b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponent3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.awt.image.BufferedImage;
 import java.io.DataInput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.ImageComponent3D;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ImageComponent3DState extends ImageComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponentState.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponentState.java
index f3e6ce8..c4b8a4d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ImageComponentState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.awt.Point;
 import java.awt.image.BufferedImage;
@@ -63,9 +63,9 @@
 import javax.imageio.ImageIO;
 import org.scijava.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.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SGIORuntimeException;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedGeometryArrayState.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedGeometryArrayState.java
index 2558d78..4487c90 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedGeometryArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -51,8 +51,8 @@
 import org.scijava.java3d.IndexedGeometryArray;
 import org.scijava.java3d.IndexedGeometryStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedGeometryStripArrayState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedGeometryStripArrayState.java
index 5a282da..d68f572 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedGeometryStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.IndexedGeometryStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedLineArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedLineArrayState.java
index ac912d9..c80eaa9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedLineArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.IndexedLineArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedLineArrayState extends IndexedGeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedLineStripArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedLineStripArrayState.java
index 0b3d921..fd7c4ed 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedLineStripArrayState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.IndexedLineStripArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedLineStripArrayState extends IndexedGeometryStripArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedPointArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedPointArrayState.java
index 4ee57b9..fd08733 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedPointArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.IndexedPointArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedPointArrayState extends IndexedGeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedQuadArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedQuadArrayState.java
index c3880da..703f341 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedQuadArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.IndexedQuadArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedQuadArrayState extends IndexedGeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleArrayState.java
index 377afaf..50bc806 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.IndexedTriangleArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedTriangleArrayState extends IndexedGeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleFanArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleFanArrayState.java
index cc9cab6..4c37143 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleFanArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.IndexedTriangleFanArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedTriangleFanArrayState extends IndexedGeometryStripArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleStripArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleStripArrayState.java
index 20015b9..6457eb4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/IndexedTriangleStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.IndexedTriangleStripArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedTriangleStripArrayState extends IndexedGeometryStripArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/InterpolatorState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/InterpolatorState.java
index 83ccc7b..d0fdfee 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/InterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.Alpha;
 import org.scijava.java3d.Interpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LODState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LODState.java
index 4c62869..7c9898a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LODState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.LOD;
 import org.scijava.java3d.Switch;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LeafState.java
similarity index 90%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LeafState.java
index 6533832..dfb9a8d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LeafState.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LightState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LightState.java
index 0385de4..cd78784 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.java3d.Light;
 import org.scijava.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineArrayState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineArrayState.java
index 5cdf5ae..68b1e89 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineArrayState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.LineArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LineArrayState extends GeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineAttributesState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineAttributesState.java
index f01830a..3ee5d04 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.LineAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LineAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineStripArrayState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineStripArrayState.java
index 7df41ae..7ff6426 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LineStripArrayState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.LineStripArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LineStripArrayState extends GeometryStripArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LinearFogState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LinearFogState.java
index 26bcedd..eb63a90 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LinearFogState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.LinearFog;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LinearFogState extends FogState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LinkState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LinkState.java
index a71f53b..e9ee141 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/LinkState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.Link;
 import org.scijava.java3d.SharedGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LinkState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MaterialState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MaterialState.java
index ad94468..bb675cf 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MaterialState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.Material;
 import org.scijava.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class MaterialState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MediaContainerState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MediaContainerState.java
index 46ec6db..3716fe1 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MediaContainerState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 
 import org.scijava.java3d.MediaContainer;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class MediaContainerState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ModelClipState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ModelClipState.java
index 347e423..1ff9911 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ModelClipState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.java3d.ModelClip;
 import org.scijava.vecmath.Vector4d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ModelClipState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MorphState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MorphState.java
index e1109a5..59465fd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/MorphState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.GeometryArray;
 import org.scijava.java3d.Morph;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class MorphState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NodeComponentState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NodeComponentState.java
index 61bf9c4..6847cec 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NodeComponentState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.NodeComponent;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NodeState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NodeState.java
index d3f4506..5345f68 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NodeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.Node;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NullSceneGraphObjectState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NullSceneGraphObjectState.java
index d40a56a..fd4ad54 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/NullSceneGraphObjectState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class NullSceneGraphObjectState extends SceneGraphObjectState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/OrderedGroupState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/OrderedGroupState.java
index 20d9c92..10eae3e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/OrderedGroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.OrderedGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class OrderedGroupState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/OrientedShape3DState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/OrientedShape3DState.java
index 102db54..41b469c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/OrientedShape3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class OrientedShape3DState extends Shape3DState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PathInterpolatorState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PathInterpolatorState.java
index ed6489f..4cee51a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.PathInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointAttributesState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointAttributesState.java
index c08bbed..07c5bc6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.PointAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PointAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointLightState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointLightState.java
index f6e6a4b..f584c47 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointLightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.PointLight;
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PointLightState extends LightState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointSoundState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointSoundState.java
index 1f2ed99..1e4341a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PointSoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.PointSound;
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PointSoundState extends SoundState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PolygonAttributesState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PolygonAttributesState.java
index 33c8ba6..3345ac2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PolygonAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.PolygonAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PolygonAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PositionInterpolatorState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PositionInterpolatorState.java
index a7a9e40..054bee0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PositionInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PositionInterpolatorState extends TransformInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PositionPathInterpolatorState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PositionPathInterpolatorState.java
index 843a6c3..dd9bf5a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/PositionPathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -49,8 +49,8 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PositionPathInterpolatorState extends PathInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/QuadArrayState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/QuadArrayState.java
index 2900906..5ea6bde 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/QuadArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.QuadArray;
 import org.scijava.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class QuadArrayState extends GeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RasterState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RasterState.java
index e874010..530a9ae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RasterState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.awt.Dimension;
 import java.awt.Point;
@@ -50,8 +50,8 @@
 import org.scijava.java3d.Raster;
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RasterState extends GeometryState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RenderingAttributesState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RenderingAttributesState.java
index 22ee289..94be54f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RenderingAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.RenderingAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RenderingAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotPosPathInterpolatorState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotPosPathInterpolatorState.java
index aa4319d..959d63a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotPosPathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -50,8 +50,8 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Quat4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotPosPathInterpolatorState extends PathInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotPosScalePathInterpolatorState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotPosScalePathInterpolatorState.java
index 3bffbc6..ef16fc8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotPosScalePathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -50,8 +50,8 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Quat4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotPosScalePathInterpolatorState extends PathInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotationInterpolatorState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotationInterpolatorState.java
index 7a97d87..f10c868 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotationInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotationInterpolatorState extends TransformInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotationPathInterpolatorState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotationPathInterpolatorState.java
index f1f5c9e..1369444 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/RotationPathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -49,8 +49,8 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.vecmath.Quat4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotationPathInterpolatorState extends PathInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ScaleInterpolatorState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ScaleInterpolatorState.java
index 4e80bab..228936b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ScaleInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ScaleInterpolatorState extends TransformInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SceneGraphObjectState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SceneGraphObjectState.java
index 3460528..4b20598 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SceneGraphObjectState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -51,9 +51,9 @@
 
 import org.scijava.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.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SGIORuntimeException;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class SceneGraphObjectState {
 
@@ -89,8 +89,8 @@ public SceneGraphObjectState( SymbolTableData symbol, Controller control ) {
             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.scijava.java3d.utils.scenegraph.io.SceneGraphIO)
+                    ((org.scijava.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 SceneGraphObjectState( SymbolTableData symbol, Controller control ) {
      * 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.scijava.java3d.utils.scenegraph.io.SceneGraphIO;
         out.writeBoolean( sgIO );
         out.writeInt( symbol.nodeID );
 
@@ -124,7 +124,7 @@ public void writeObject( DataOutput out ) throws IOException {
         if (sgIO) {
             ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
 	    DataOutputStream tmpOut = new DataOutputStream( byteStream );
-            ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).writeSceneGraphObject( tmpOut );
+            ((org.scijava.java3d.utils.scenegraph.io.SceneGraphIO)node).writeSceneGraphObject( tmpOut );
 	    tmpOut.close();
 	    out.writeInt( byteStream.size() );
 	    out.write( byteStream.toByteArray() );
@@ -159,15 +159,15 @@ public void readObject( DataInput in ) throws IOException {
 
         if ( sgIO ) {
 	    if (control.getCurrentFileVersion()==1)
-                ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).readSceneGraphObject( in );
+                ((org.scijava.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.scijava.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.scijava.java3d.utils.scenegraph.io.SceneGraphIO)node).readSceneGraphObject( tmpIn );
 		    tmpIn.close();
                 } else {
 	    	    in.skipBytes( size );
@@ -495,8 +495,8 @@ private String getClassName( Class c ) {
      */
     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.scijava.java3d.utils.scenegraph.io.SceneGraphIO)
+                ((org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Shape3DState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Shape3DState.java
index 3b14e68..a215623 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Shape3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.Geometry;
 import org.scijava.java3d.Shape3D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Shape3DState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SharedGroupState.java
similarity index 91%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SharedGroupState.java
index 56dbf7b..703ac6b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SharedGroupState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.SharedGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SharedGroupState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SoundState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SoundState.java
index d52622a..56a14c3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.MediaContainer;
 import org.scijava.java3d.Sound;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SoundscapeState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SoundscapeState.java
index 9b5479a..9033c61 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SoundscapeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.BoundingLeaf;
 import org.scijava.java3d.Soundscape;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SoundscapeState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SpotLightState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SpotLightState.java
index 6b63bb6..d05425b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SpotLightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.vecmath.Point3f;
 import org.scijava.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 // issue 654: should inherit from PointLightState, but too hard to refactor
 public class SpotLightState extends LightState {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SwitchState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SwitchState.java
index 9ca76a4..1257676 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SwitchState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.Switch;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SwitchState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SwitchValueInterpolatorState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SwitchValueInterpolatorState.java
index 4d701a3..416a7de 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/SwitchValueInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.Switch;
 import org.scijava.java3d.SwitchValueInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SwitchValueInterpolatorState extends InterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TexCoordGenerationState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TexCoordGenerationState.java
index eb2cf82..b4353b9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TexCoordGenerationState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.TexCoordGeneration;
 import org.scijava.vecmath.Vector4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TexCoordGenerationState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Text3DState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Text3DState.java
index a9e5da3..afb4959 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Text3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.Text3D;
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Text3DState extends GeometryState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Texture2DState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Texture2DState.java
index 64ea68d..2ac9988 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Texture2DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.Texture2D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Texture2DState extends TextureState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Texture3DState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Texture3DState.java
index 95c0320..88b2d34 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/Texture3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.Texture3D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Texture3DState extends TextureState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureAttributesState.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureAttributesState.java
index cbbaabc..9ea03a8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.vecmath.Color4f;
 import org.scijava.vecmath.Matrix4d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureCubeMapState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureCubeMapState.java
index 54558e5..ade0757 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureCubeMapState.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import org.scijava.java3d.ImageComponent;
 import org.scijava.java3d.ImageComponent2D;
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.TextureCubeMap;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureCubeMapState extends TextureState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureState.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureState.java
index 0c121bb..7e372e6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -49,8 +49,8 @@
 import org.scijava.vecmath.Color4f;
 import org.scijava.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureUnitStateState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureUnitStateState.java
index c3649bb..22d48ff 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TextureUnitStateState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,8 +48,8 @@
 import org.scijava.java3d.TextureAttributes;
 import org.scijava.java3d.TextureUnitState;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureUnitStateState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransformGroupState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransformGroupState.java
index d9b9507..bdf5f1f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransformGroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TransformGroupState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransformInterpolatorState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransformInterpolatorState.java
index 4c7ead2..3cd265e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransformInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.java3d.TransformInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransparencyAttributesState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransparencyAttributesState.java
index 0216557..519595c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransparencyAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.TransparencyAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TransparencyAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransparencyInterpolatorState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransparencyInterpolatorState.java
index d9c03e7..f2a4234 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TransparencyInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,8 +47,8 @@
 import org.scijava.java3d.TransparencyAttributes;
 import org.scijava.java3d.TransparencyInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TransparencyInterpolatorState extends InterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleArrayState.java
index 85d29ce..5bcbd2b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.TriangleArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TriangleArrayState extends GeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleFanArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleFanArrayState.java
index 935dd9a..415dd13 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleFanArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.TriangleFanArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TriangleFanArrayState extends GeometryStripArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleStripArrayState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleStripArrayState.java
index 8b882d4..f9e058f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/TriangleStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,8 +46,8 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.java3d.TriangleStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TriangleStripArrayState extends GeometryStripArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ViewPlatformState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ViewPlatformState.java
index 0db8e8d..fcde497 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/ViewPlatformState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,8 +45,8 @@
 
 import org.scijava.java3d.ViewPlatform;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ViewPlatformState extends LeafState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
similarity index 91%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
index c6e6392..f0ad09a 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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.behaviors.interpolators;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,11 +47,11 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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.scijava.java3d.utils.behaviors.interpolators.KBKeyFrame;
+import org.scijava.java3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.TransformInterpolatorState;
 
 public class KBRotPosScaleSplinePathInterpolatorState extends TransformInterpolatorState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
similarity index 90%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
index edb055f..c04c473 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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.behaviors.interpolators;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,11 +47,11 @@
 import org.scijava.java3d.Transform3D;
 import org.scijava.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.scijava.java3d.utils.behaviors.interpolators.RotPosScaleTCBSplinePathInterpolator;
+import org.scijava.java3d.utils.behaviors.interpolators.TCBKeyFrame;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.TransformInterpolatorState;
 
 public class RotPosScaleTCBSplinePathInterpolatorState extends TransformInterpolatorState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/mouse/MouseBehaviorState.java
similarity index 87%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/mouse/MouseBehaviorState.java
index 0bad5a2..82e83f9 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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/behaviors/mouse/MouseBehaviorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.mouse;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.behaviors.mouse;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,10 +45,10 @@
 
 import org.scijava.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.scijava.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/BoxState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/BoxState.java
index 6248e66..e1d541e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/BoxState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,9 +46,9 @@
 import org.scijava.java3d.Appearance;
 import org.scijava.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.scijava.java3d.utils.geometry.Box;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BoxState extends PrimitiveState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/ColorCubeState.java
similarity index 89%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/ColorCubeState.java
index bdf489a..68eb2bb 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/ColorCubeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,10 +46,10 @@
 import org.scijava.java3d.SceneGraphObject;
 import org.scijava.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.scijava.java3d.utils.geometry.ColorCube;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.Shape3DState;
 
 public class ColorCubeState extends Shape3DState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/ConeState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/ConeState.java
index 81b2f84..d2f942a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/ConeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,9 +46,9 @@
 import org.scijava.java3d.Appearance;
 import org.scijava.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.scijava.java3d.utils.geometry.Cone;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ConeState extends PrimitiveState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/CylinderState.java
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/CylinderState.java
index 34e6345..003e944 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/CylinderState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,9 +46,9 @@
 import org.scijava.java3d.Appearance;
 import org.scijava.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.scijava.java3d.utils.geometry.Cylinder;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class CylinderState extends PrimitiveState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/PrimitiveState.java
similarity index 88%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/PrimitiveState.java
index 2c70298..f7de730 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/PrimitiveState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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.scijava.java3d.utils.geometry.Primitive;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/SphereState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/SphereState.java
index 3ba2d43..358b939 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/SphereState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,9 +46,9 @@
 import org.scijava.java3d.Appearance;
 import org.scijava.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.scijava.java3d.utils.geometry.Sphere;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SphereState extends PrimitiveState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/Text2DState.java
similarity index 93%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/Text2DState.java
index 518b8a0..b6016a6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/geometry/Text2DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,10 +47,10 @@
 import org.scijava.java3d.Shape3D;
 import org.scijava.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.scijava.java3d.utils.geometry.Text2D;
+import org.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.LeafState;
 
 public class Text2DState extends LeafState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURL.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURL.java
index 697daae..d523210 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURL.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.image;
 
 public class ImageComponent2DURL extends org.scijava.java3d.ImageComponent2D {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURLIOListener.java
similarity index 96%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURLIOListener.java
index 671b9e7..e160a96 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURLIOListener.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURLState.java
similarity index 92%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURLState.java
index 0425a1f..0fb811e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/image/ImageComponent2DURLState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.image;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,9 +45,9 @@
 
 import org.scijava.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.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.ImageComponentState;
 
 public class ImageComponent2DURLState extends ImageComponentState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/PlatformGeometryState.java
similarity index 84%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/PlatformGeometryState.java
index ee43a75..ba3a646 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/PlatformGeometryState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.BranchGroupState;
+import org.scijava.java3d.utils.universe.PlatformGeometry;
 
 public class PlatformGeometryState extends BranchGroupState {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/SimpleUniverseState.java
similarity index 94%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/SimpleUniverseState.java
index 737a741..60c6489 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/SimpleUniverseState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.utils.universe;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -53,15 +53,15 @@
 import org.scijava.java3d.TransformGroup;
 import org.scijava.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.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.SceneGraphObjectState;
+import org.scijava.java3d.utils.universe.ConfiguredUniverse;
+import org.scijava.java3d.utils.universe.MultiTransformGroup;
+import org.scijava.java3d.utils.universe.PlatformGeometry;
+import org.scijava.java3d.utils.universe.SimpleUniverse;
+import org.scijava.java3d.utils.universe.ViewerAvatar;
+import org.scijava.java3d.utils.universe.ViewingPlatform;
 
 public class SimpleUniverseState extends java.lang.Object {
 
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/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/ViewerAvatarState.java
similarity index 84%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/ViewerAvatarState.java
index eec4625..0dc3a5c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/io/state/org/scijava/java3d/utils/universe/ViewerAvatarState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.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.scijava.java3d.utils.scenegraph.io.retained.Controller;
+import org.scijava.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.scijava.java3d.utils.scenegraph.io.state.org.scijava.java3d.BranchGroupState;
+import org.scijava.java3d.utils.universe.ViewerAvatar;
 
 public class ViewerAvatarState extends BranchGroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
index 8a6c99b..3620c8e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.transparency;
+package org.scijava.java3d.utils.scenegraph.transparency;
 
 import java.util.Comparator;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java b/src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/TransparencySortController.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/TransparencySortController.java
index a826fbc..3bd7a33 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/TransparencySortController.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.transparency;
+package org.scijava.java3d.utils.scenegraph.transparency;
 
 import java.util.Comparator;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/package.html b/src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/package.html
similarity index 78%
rename from src/classes/share/com/sun/j3d/utils/scenegraph/transparency/package.html
rename to src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/package.html
index 710fa54..720ecae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/scenegraph/transparency/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.scenegraph.transparency
+  org.scijava.java3d.utils.scenegraph.transparency
 
 
 
Provides transparency sorting utility classes.

diff --git a/src/classes/share/com/sun/j3d/utils/shader/StringIO.java b/src/classes/share/org/scijava/java3d/utils/shader/StringIO.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/shader/StringIO.java
rename to src/classes/share/org/scijava/java3d/utils/shader/StringIO.java
index 1393289..c3056f7 100644
--- a/src/classes/share/com/sun/j3d/utils/shader/StringIO.java
+++ b/src/classes/share/org/scijava/java3d/utils/shader/StringIO.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.shader;
+package org.scijava.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/scijava/java3d/utils/shader/package.html
similarity index 82%
rename from src/classes/share/com/sun/j3d/utils/shader/package.html
rename to src/classes/share/org/scijava/java3d/utils/shader/package.html
index b5102d9..f239f83 100644
--- a/src/classes/share/com/sun/j3d/utils/shader/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/shader/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.shader
+  org.scijava.java3d.utils.shader
 
 
 
Provides shader utility classes.

diff --git a/src/classes/share/com/sun/j3d/utils/timer/J3DTimer.java b/src/classes/share/org/scijava/java3d/utils/timer/J3DTimer.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/timer/J3DTimer.java
rename to src/classes/share/org/scijava/java3d/utils/timer/J3DTimer.java
index 8d8661f..64381d4 100644
--- a/src/classes/share/com/sun/j3d/utils/timer/J3DTimer.java
+++ b/src/classes/share/org/scijava/java3d/utils/timer/J3DTimer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.timer;
+package org.scijava.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/scijava/java3d/utils/timer/package.html
similarity index 84%
rename from src/classes/share/com/sun/j3d/utils/timer/package.html
rename to src/classes/share/org/scijava/java3d/utils/timer/package.html
index b842c0a..2f84f31 100644
--- a/src/classes/share/com/sun/j3d/utils/timer/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/timer/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.timer
+  org.scijava.java3d.utils.timer
 
 
 
Deprecated: Use java.lang.System.nanoTime() instead.

diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigCommand.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigCommand.java
index de6ce5d..6a49041 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigCommand.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.text.DecimalFormat;
 import java.text.FieldPosition;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigContainer.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigContainer.java
index 7e61bfa..5c85448 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigContainer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -389,7 +389,7 @@ private ConfigObject createConfigObject(ConfigCommand cmd) {
 	// 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.scijava.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/scijava/java3d/utils/universe/ConfigDevice.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigDevice.java
index 6a0fe04..fad6b58 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigDevice.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 import org.scijava.java3d.InputDevice;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigObject.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigObject.java
index 8051ada..c0f1f00 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigObject.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -142,10 +142,10 @@ void setClassLoader( ClassLoader classLoader ) {
      *
      * (New{configType} {instanceName} {className})

      *
-     * For example, (NewDevice tracker com.sun.j3d.input.LogitechTracker) will
+     * For example, (NewDevice tracker org.scijava.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.scijava.java3d.input.LogitechTracker,
      * evaluate its properties, and allow references to it in the
      * configuration file by the name "tracker".

      *
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigPhysicalBody.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigPhysicalBody.java
index 78786f4..429f4d3 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigPhysicalBody.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import org.scijava.java3d.PhysicalBody;
 import org.scijava.java3d.Transform3D;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigPhysicalEnvironment.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigPhysicalEnvironment.java
index 47849f9..b5ce0e9 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigPhysicalEnvironment.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.util.ArrayList;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigScreen.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigScreen.java
index 3c1ed25..9a8b61e 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigScreen.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.awt.Window;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigSensor.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigSensor.java
index 1c2f598..81af411 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigSensor.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import org.scijava.java3d.Sensor;
 import org.scijava.vecmath.Point3d;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigSexpression.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigSexpression.java
index df813b2..70a903a 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigSexpression.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigView.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigView.java
index 92f2f3a..c7ba75d 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigView.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigViewPlatform.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigViewPlatform.java
index 45a0426..0798111 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigViewPlatform.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.util.ArrayList;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java b/src/classes/share/org/scijava/java3d/utils/universe/ConfigViewPlatformBehavior.java
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfigViewPlatformBehavior.java
index 0334fb5..d5175c6 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfigViewPlatformBehavior.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import org.scijava.java3d.Bounds;
 import org.scijava.java3d.Transform3D;
 import org.scijava.vecmath.Matrix4d;
 
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
+import org.scijava.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/scijava/java3d/utils/universe/ConfiguredUniverse.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ConfiguredUniverse.java
index 81082c4..dda7d94 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ConfiguredUniverse.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import java.net.URL;
 import java.util.Collection;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java b/src/classes/share/org/scijava/java3d/utils/universe/LocaleFactory.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
rename to src/classes/share/org/scijava/java3d/utils/universe/LocaleFactory.java
index 2f95f54..d2b1e66 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/LocaleFactory.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import org.scijava.java3d.HiResCoord;
 import org.scijava.java3d.Locale;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java b/src/classes/share/org/scijava/java3d/utils/universe/MultiTransformGroup.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
rename to src/classes/share/org/scijava/java3d/utils/universe/MultiTransformGroup.java
index b94bb97..0c4befa 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/MultiTransformGroup.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import org.scijava.java3d.TransformGroup;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java b/src/classes/share/org/scijava/java3d/utils/universe/PlatformGeometry.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
rename to src/classes/share/org/scijava/java3d/utils/universe/PlatformGeometry.java
index bfdc3e1..5928153 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/PlatformGeometry.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import org.scijava.java3d.BranchGroup;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java b/src/classes/share/org/scijava/java3d/utils/universe/SimpleUniverse.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
rename to src/classes/share/org/scijava/java3d/utils/universe/SimpleUniverse.java
index 56833b8..a659689 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/SimpleUniverse.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
@@ -51,7 +51,7 @@
 import org.scijava.java3d.View;
 import org.scijava.java3d.VirtualUniverse;
 
-import com.sun.j3d.utils.geometry.Primitive;
+import org.scijava.java3d.utils.geometry.Primitive;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java b/src/classes/share/org/scijava/java3d/utils/universe/ViewInfo.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ViewInfo.java
index 28f8189..350a9a7 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ViewInfo.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.scijava.java3d.utils.universe ;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/Viewer.java b/src/classes/share/org/scijava/java3d/utils/universe/Viewer.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/Viewer.java
rename to src/classes/share/org/scijava/java3d/utils/universe/Viewer.java
index 5531512..86f86d8 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/Viewer.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/Viewer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
@@ -64,7 +64,7 @@
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import com.sun.j3d.audioengines.AudioEngine3DL2;
+import org.scijava.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/scijava/java3d/utils/universe/ViewerAvatar.java
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ViewerAvatar.java
index 5458741..7583351 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ViewerAvatar.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import org.scijava.java3d.BranchGroup;
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java b/src/classes/share/org/scijava/java3d/utils/universe/ViewingPlatform.java
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
rename to src/classes/share/org/scijava/java3d/utils/universe/ViewingPlatform.java
index c5c9a52..fdf1e05 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
+++ b/src/classes/share/org/scijava/java3d/utils/universe/ViewingPlatform.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.scijava.java3d.utils.universe;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -50,8 +50,8 @@
 import org.scijava.java3d.ViewPlatform;
 import org.scijava.vecmath.Vector3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
+import org.scijava.java3d.internal.J3dUtilsI18N;
+import org.scijava.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/scijava/java3d/utils/universe/doc-files/config-examples.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/config-examples.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/config-syntax.html
similarity index 99%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html
rename to src/classes/share/org/scijava/java3d/utils/universe/doc-files/config-syntax.html
index 0500117..8597ea2 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html
+++ b/src/classes/share/org/scijava/java3d/utils/universe/doc-files/config-syntax.html
@@ -1241,7 +1241,7 @@ 

 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 
-setViewingPlatform
+setViewingPlatform
 method.  When the behavior is initialized, the canvases used by the
 ViewingPlatform can be retrieved by calling its 
 getViewers method and
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-behavior.html b/src/classes/share/org/scijava/java3d/utils/universe/doc-files/j3d1x1-behavior.html
similarity index 98%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-behavior.html
rename to src/classes/share/org/scijava/java3d/utils/universe/doc-files/j3d1x1-behavior.html
index 97c46d8..7c931c0 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-behavior.html
+++ b/src/classes/share/org/scijava/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.scijava.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/scijava/java3d/utils/universe/doc-files/j3d1x1-stereo.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-stereo.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/j3d1x1-vr.html
similarity index 95%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-vr.html
rename to src/classes/share/org/scijava/java3d/utils/universe/doc-files/j3d1x1-vr.html
index 4c18317..8448bf3 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-vr.html
+++ b/src/classes/share/org/scijava/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.scijava.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.scijava.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.scijava.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.scijava.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/scijava/java3d/utils/universe/doc-files/j3d1x1-window.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-window.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/j3d1x1.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/j3d1x2-flat.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x2-flat.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/j3d1x2-rot30.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x2-rot30.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/j3d1x3-cave-vr.html
similarity index 97%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-cave-vr.html
rename to src/classes/share/org/scijava/java3d/utils/universe/doc-files/j3d1x3-cave-vr.html
index fcc58b4..fbbe256 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-cave-vr.html
+++ b/src/classes/share/org/scijava/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.scijava.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.scijava.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.scijava.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/scijava/java3d/utils/universe/doc-files/j3d1x3-cave.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-cave.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/j3d1x3-rot45.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-rot45.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/doc-files/j3d2x2-flat.html
similarity index 100%
rename from src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d2x2-flat.html
rename to src/classes/share/org/scijava/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/scijava/java3d/utils/universe/package.html
similarity index 85%
rename from src/classes/share/com/sun/j3d/utils/universe/package.html
rename to src/classes/share/org/scijava/java3d/utils/universe/package.html
index 1ef0eaf..a1450be 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/package.html
+++ b/src/classes/share/org/scijava/java3d/utils/universe/package.html
@@ -3,7 +3,7 @@
 
   
-  com.sun.j3d.utils.universe
+  org.scijava.java3d.utils.universe
 
 
 
Provides utility classes for setting up the Java 3D universe,

From 71c466bb333c7e09795c70f93f1e4cc269d2dd03 Mon Sep 17 00:00:00 2001
From: Curtis Rueden 
Date: Wed, 18 Nov 2015 12:08:31 -0600
Subject: [PATCH 14/18] Update and flesh out the README

---
 README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 39d33eb..3b4e7d0 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,53 @@
 
 This is a Mavenized version of the latest
 [Java 3D](https://en.wikipedia.org/wiki/Java_3D) `j3dutils` component,
-[built on JOGL 2.3.2](http://forum.jogamp.org/Java3D-now-works-with-JOGL-2-0-td3732206.html).
+[built on JOGL 2.x](http://forum.jogamp.org/Java3D-now-works-with-JOGL-2-0-td3732206.html),
+with a renamed package prefix to avoid conflicts with old versions of Java 3D.
+
+## Background and rationale
+
+Historically, Java 3D was installed as an extension to the Java Runtime
+Environment, meaning that JAR files and native libraries were placed in the
+`lib/ext` directory of the JRE installation, or manually appended to the Java
+extensions via the `java.ext.dirs` system property.
+
+However, that approach has many downsides:
+
+* Users must install Java 3D manually, independent of the application.
+* Thus, at runtime, the application cannot manage the version of Java 3D in
+  the same was that it manages versions of its regular dependencies.
+* Similarly, at build time, the Java 3D dependency must be treated
+  specially (e.g., with Maven, using `provided` scope in the POM).
+
+These days, Java 3D 1.6 is [built on top of
+JOGL 2.x](http://forum.jogamp.org/Java3D-now-works-with-JOGL-2-0-td3732206.html),
+and [available on GitHub](https://github.com/hharrison/java3d-core). But old
+installations of Java 3D still lurk, waiting to disrupt applications at
+runtime: libraries present on the Java extensions path take precedence over
+those on the regular class path.
+
+Failure to manage Java 3D installations as needed can result in cryptic
+version-skew-related error messages, such as `NoSuchMethodError` or
+even native-library-related errors, including JVM crashes. This situation is
+especially prevalent on OS X, where Java 3D 1.3 was pre-installed in
+`/System/Library/Java/Extensions` on older versions of the OS, and left in
+place after OS upgrades (despite Java itself being uninstalled).
+
+Furthermore, OS X 10.11 "El Capitan" introduced a new security feature called
+System Integrity Protection (SIP) which prevents users from deleting the
+obsolete Java 3D libraries from `/System/Library/Java/Extensions`. And the
+default extensions path of Oracle Java 8 includes this directory, making it
+impossible to use Java 3D with Java 8 out of the box in this scenario.
+
+This fork of Java 3D avoids the issue by changing the package prefix, so that
+legacy code can be easily refactored to use it without danger from the obsolete
+versions of Java 3D.
 
 ## Project status
 
-This is a temporary fork, until the upstream project accepts
-[hharrison/java3d-utils#2](https://github.com/hharrison/java3d-utils/pull/2) and
-[follow-up patches](https://github.com/hharrison/java3d-utils/compare/master...ctrueden:maven).
+This project is a temporary fork, until upstream Java 3D makes some progress.
+See: [Java 3D: Use Maven to build, and publish Maven
+artifacts](http://forum.jogamp.org/Java-3D-Use-Maven-to-build-and-publish-Maven-artifacts-tp4035555p4035810.html)
 
 ## How to use it
 
@@ -18,11 +58,11 @@ To use from your Maven project, add the following dependency to your POM:
 
 	org.scijava
   j3dutils
-  1.6.0-scijava-1
+  1.6.0-scijava-2
 
 ```
 
-## See also
+## Related projects
 
 * https://github.com/scijava/java3d-core
 * https://github.com/scijava/vecmath

From c638239d251d5d4398417da23f0f3629ebedb1ca Mon Sep 17 00:00:00 2001
From: Curtis Rueden 
Date: Wed, 18 Nov 2015 12:49:15 -0600
Subject: [PATCH 15/18] POM: change the maintainer

I am maintaining this fork; Harvey Harrison maintains upstream.
---
 pom.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00113b7..917d36c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,16 @@
 
 	
 		
-			hharrison
-			Harvey Harrison
-			https://github.com/hharrison
+			ctrueden
+			Curtis Rueden
+			ctrueden@wisc.edu
+			http://loci.wisc.edu/people/curtis-rueden
+			UW-Madison LOCI
+			http://loci.wisc.edu/
+			
+				maintainer
+			
+			-6
 		
 	
 

From b7cad57183aa1bb5f7c325dedfa885d6e8e771d2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden 
Date: Wed, 18 Nov 2015 15:42:02 -0600
Subject: [PATCH 16/18] Bump to next development cycle

Signed-off-by: Jenkins 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 917d36c..9441cb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	org.scijava
 	j3dutils
-	1.6.0-scijava-2-SNAPSHOT
+	1.6.0-scijava-3-SNAPSHOT
 
 	Java 3D Utils
 	Utility functions for the Java 3D Graphics API

From fb5d0e73f4e7410921adde8661a8d7e85d2f058d Mon Sep 17 00:00:00 2001
From: Curtis Rueden 
Date: Wed, 18 Nov 2015 15:55:17 -0600
Subject: [PATCH 17/18] README: correct minor issues

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3b4e7d0..6e6c8d8 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ However, that approach has many downsides:
 
 * Users must install Java 3D manually, independent of the application.
 * Thus, at runtime, the application cannot manage the version of Java 3D in
-  the same was that it manages versions of its regular dependencies.
+  the same way that it manages versions of its regular dependencies.
 * Similarly, at build time, the Java 3D dependency must be treated
   specially (e.g., with Maven, using `provided` scope in the POM).
 
@@ -47,8 +47,8 @@ versions of Java 3D.
 ## Project status
 
 This project is a temporary fork, until upstream Java 3D makes some progress.
-See: [Java 3D: Use Maven to build, and publish Maven
-artifacts](http://forum.jogamp.org/Java-3D-Use-Maven-to-build-and-publish-Maven-artifacts-tp4035555p4035810.html)
+See:
+* [Java 3D: Use Maven to build, and publish Maven artifacts](http://forum.jogamp.org/Java-3D-Use-Maven-to-build-and-publish-Maven-artifacts-tp4035555p4035810.html)
 
 ## How to use it
 
@@ -56,7 +56,7 @@ To use from your Maven project, add the following dependency to your POM:
 
 ```xml
 
-	org.scijava
+  org.scijava
   j3dutils
   1.6.0-scijava-2
 

From 820c65a6067e0b827f59ff79bb8602754907cf5b Mon Sep 17 00:00:00 2001
From: Curtis Rueden 
Date: Mon, 8 Nov 2021 15:38:19 -0600
Subject: [PATCH 18/18] POM: Stop using git:// protocol with github.com

The GitHub platform is discontinuing support for it.

See: https://github.blog/2021-09-01-improving-git-protocol-security-github/#whats-changing
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9441cb2..4543622 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 	
 
 	
-		scm:git:git://github.com/scijava/java3d-utils
+		scm:git:https://github.com/scijava/java3d-utils
 		scm:git:git@github.com:scijava/java3d-utils
 		HEAD
 		https://github.com/scijava/java3d-utils