36 files changed, 127 insertions, 157 deletions
diff --git a/nbproject/configs/BitonicSort.properties b/nbproject/configs/BitonicSort.properties
index afddef4..87fc951 100644
--- a/nbproject/configs/BitonicSort.properties
+++ b/nbproject/configs/BitonicSort.properties
@@ -1 +1 @@
-main.class=com.mbien.opencl.demos.bitonicsort.BitonicSort
+main.class=com.jogamp.opencl.demos.bitonicsort.BitonicSort
diff --git a/nbproject/configs/GLCLMandel.properties b/nbproject/configs/GLCLMandel.properties
index fac72c7..fab0042 100644
--- a/nbproject/configs/GLCLMandel.properties
+++ b/nbproject/configs/GLCLMandel.properties
@@ -1 +1 @@
-main.class=com.mbien.opencl.demos.fractal.MultiDeviceFractal
+main.class=com.jogamp.opencl.demos.fractal.MultiDeviceFractal
diff --git a/nbproject/configs/GLCLinterop.properties b/nbproject/configs/GLCLinterop.properties
index 710c784..eff8ca4 100644
--- a/nbproject/configs/GLCLinterop.properties
+++ b/nbproject/configs/GLCLinterop.properties
@@ -1 +1 @@
-main.class=com.mbien.opencl.demos.joglinterop.GLCLInteroperabilityDemo
+main.class=com.jogamp.opencl.demos.joglinterop.GLCLInteroperabilityDemo
diff --git a/nbproject/configs/Julia3d.properties b/nbproject/configs/Julia3d.properties
index 3fa79e8..e11756d 100644
--- a/nbproject/configs/Julia3d.properties
+++ b/nbproject/configs/Julia3d.properties
@@ -1 +1 @@
-main.class=com.mbien.opencl.demos.julia3d.Julia3d
+main.class=com.jogamp.opencl.demos.julia3d.Julia3d
diff --git a/nbproject/configs/RadixSort.properties b/nbproject/configs/RadixSort.properties
index 41e68f5..d3c5458 100644
--- a/nbproject/configs/RadixSort.properties
+++ b/nbproject/configs/RadixSort.properties
@@ -1 +1 @@
-main.class=com.mbien.opencl.demos.radixsort.RadixSortDemo
+main.class=com.jogamp.opencl.demos.radixsort.RadixSortDemo
diff --git a/nbproject/project.properties b/nbproject/project.properties
index a21489a..c1425c6 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,5 +1,5 @@
 application.title=JOCL Demos
-application.vendor=mbien
+application.vendor=jogamp
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -52,7 +52,7 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-main.class=com.mbien.opencl.demos.hellojocl.HelloJOCL
+main.class=com.jogamp.opencl.demos.hellojocl.HelloJOCL
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 no.dependencies=true
diff --git a/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.cl b/src/com/jogamp/opencl/demos/bitonicsort/BitonicSort.cl
index a8d0e1d..a8d0e1d 100644
--- a/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.cl
+++ b/src/com/jogamp/opencl/demos/bitonicsort/BitonicSort.cl
diff --git a/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.java b/src/com/jogamp/opencl/demos/bitonicsort/BitonicSort.java
index ed5b32e..3d954f2 100644
--- a/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.java
+++ b/src/com/jogamp/opencl/demos/bitonicsort/BitonicSort.java
@@ -1,22 +1,22 @@
 /*
  * 18:42 Saturday, February 27 2010
  */
-package com.mbien.opencl.demos.bitonicsort;
-
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLProgram;
+package com.jogamp.opencl.demos.bitonicsort;
+
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLProgram;
 import java.io.IOException;
 import java.nio.IntBuffer;
 import java.util.Map;
 import java.util.Random;
 
 import static java.lang.System.*;
-import static com.mbien.opencl.CLMemory.Mem.*;
-import static com.mbien.opencl.CLProgram.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLProgram.*;
 
 /**
  * Bitonic sort optimized for GPUs.
diff --git a/src/com/mbien/opencl/demos/fractal/Mandelbrot.cl b/src/com/jogamp/opencl/demos/fractal/Mandelbrot.cl
index 640c775..640c775 100644
--- a/src/com/mbien/opencl/demos/fractal/Mandelbrot.cl
+++ b/src/com/jogamp/opencl/demos/fractal/Mandelbrot.cl
diff --git a/src/com/mbien/opencl/demos/fractal/MultiDeviceFractal.java b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
index 265add8..26770b6 100644
--- a/src/com/mbien/opencl/demos/fractal/MultiDeviceFractal.java
+++ b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
@@ -1,17 +1,17 @@
-package com.mbien.opencl.demos.fractal;
-
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.CLEvent;
-import com.mbien.opencl.CLEventList;
-import com.mbien.opencl.CLException;
-import com.mbien.opencl.gl.CLGLBuffer;
-import com.mbien.opencl.gl.CLGLContext;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLPlatform;
-import com.mbien.opencl.CLProgram;
-import com.mbien.opencl.CLProgram.CompilerOptions;
+package com.jogamp.opencl.demos.fractal;
+
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLEvent;
+import com.jogamp.opencl.CLEventList;
+import com.jogamp.opencl.CLException;
+import com.jogamp.opencl.gl.CLGLBuffer;
+import com.jogamp.opencl.gl.CLGLContext;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLPlatform;
+import com.jogamp.opencl.CLProgram;
+import com.jogamp.opencl.CLProgram.CompilerOptions;
 import com.jogamp.opengl.util.awt.TextRenderer;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -40,10 +40,9 @@ import javax.swing.SwingUtilities;
 
 import static com.jogamp.common.nio.Buffers.*;
 import static javax.media.opengl.GL2.*;
-import static com.mbien.opencl.CLMemory.Mem.*;
-import static com.mbien.opencl.CLEvent.ProfilingCommand.*;
-import static com.mbien.opencl.CLCommandQueue.Mode.*;
-import static com.mbien.opencl.CLDevice.Type.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLEvent.ProfilingCommand.*;
+import static com.jogamp.opencl.CLCommandQueue.Mode.*;
 import static java.lang.Math.*;
 
 /**
diff --git a/src/com/mbien/opencl/demos/fractal/MultiDeviceFractal.java.orig b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java.orig
index fc09d19..403aae3 100644
--- a/src/com/mbien/opencl/demos/fractal/MultiDeviceFractal.java.orig
+++ b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java.orig
@@ -1,17 +1,17 @@
-package com.mbien.opencl.demos.fractal;
-
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.CLEvent;
-import com.mbien.opencl.CLEventList;
-import com.mbien.opencl.CLException;
-import com.mbien.opencl.CLGLBuffer;
-import com.mbien.opencl.CLGLContext;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLProgram;
-import com.mbien.opencl.CLProgram.CompilerOptions;
+package com.jogamp.opencl.demos.fractal;
+
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLEvent;
+import com.jogamp.opencl.CLEventList;
+import com.jogamp.opencl.CLException;
+import com.jogamp.opencl.CLGLBuffer;
+import com.jogamp.opencl.CLGLContext;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLProgram;
+import com.jogamp.opencl.CLProgram.CompilerOptions;
 import com.sun.opengl.util.awt.TextRenderer;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -40,10 +40,10 @@ import javax.swing.SwingUtilities;
 
 import static com.sun.gluegen.runtime.BufferFactory.*;
 import static javax.media.opengl.GL2.*;
-import static com.mbien.opencl.CLMemory.Mem.*;
-import static com.mbien.opencl.CLEvent.ProfilingCommand.*;
-import static com.mbien.opencl.CLCommandQueue.Mode.*;
-import static com.mbien.opencl.CLDevice.Type.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLEvent.ProfilingCommand.*;
+import static com.jogamp.opencl.CLCommandQueue.Mode.*;
+import static com.jogamp.opencl.CLDevice.Type.*;
 import static java.lang.Math.*;
 
 /**
diff --git a/src/com/mbien/opencl/demos/hellojocl/HelloJOCL.java b/src/com/jogamp/opencl/demos/hellojocl/HelloJOCL.java
index acbd84c..31fabab 100644
--- a/src/com/mbien/opencl/demos/hellojocl/HelloJOCL.java
+++ b/src/com/jogamp/opencl/demos/hellojocl/HelloJOCL.java
@@ -1,16 +1,16 @@
-package com.mbien.opencl.demos.hellojocl;
+package com.jogamp.opencl.demos.hellojocl;
 
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLProgram;
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLProgram;
 import java.io.IOException;
 import java.nio.FloatBuffer;
 import java.util.Random;
 
 import static java.lang.System.*;
-import static com.mbien.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
 
 /**
  * Hello Java OpenCL example. Adds all elements of buffer A to buffer B
diff --git a/src/com/mbien/opencl/demos/hellojocl/VectorAdd.cl b/src/com/jogamp/opencl/demos/hellojocl/VectorAdd.cl
index ac9dde2..ac9dde2 100644
--- a/src/com/mbien/opencl/demos/hellojocl/VectorAdd.cl
+++ b/src/com/jogamp/opencl/demos/hellojocl/VectorAdd.cl
diff --git a/src/com/mbien/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java b/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
index 74783f3..24af1fe 100644
--- a/src/com/mbien/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
+++ b/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
@@ -1,12 +1,12 @@
-package com.mbien.opencl.demos.joglinterop;
-
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.gl.CLGLBuffer;
-import com.mbien.opencl.gl.CLGLContext;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLPlatform;
-import com.mbien.opencl.CLProgram;
+package com.jogamp.opencl.demos.joglinterop;
+
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.gl.CLGLBuffer;
+import com.jogamp.opencl.gl.CLGLContext;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLPlatform;
+import com.jogamp.opencl.CLProgram;
 import com.jogamp.opengl.util.Animator;
 import java.io.IOException;
 import javax.media.opengl.DebugGL2;
diff --git a/src/com/mbien/opencl/demos/joglinterop/JoglInterop.cl b/src/com/jogamp/opencl/demos/joglinterop/JoglInterop.cl
index 0f0bcfc..0f0bcfc 100644
--- a/src/com/mbien/opencl/demos/joglinterop/JoglInterop.cl
+++ b/src/com/jogamp/opencl/demos/joglinterop/JoglInterop.cl
diff --git a/src/com/mbien/opencl/demos/joglinterop/UserSceneInteraction.java b/src/com/jogamp/opencl/demos/joglinterop/UserSceneInteraction.java
index bec2d28..fc0f054 100644
--- a/src/com/mbien/opencl/demos/joglinterop/UserSceneInteraction.java
+++ b/src/com/jogamp/opencl/demos/joglinterop/UserSceneInteraction.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl.demos.joglinterop;
+package com.jogamp.opencl.demos.joglinterop;
 
 import java.awt.Component;
 import java.awt.Point;
diff --git a/src/com/mbien/opencl/demos/julia3d/Julia3d.java b/src/com/jogamp/opencl/demos/julia3d/Julia3d.java
index 5d5378f..38633c6 100644
--- a/src/com/mbien/opencl/demos/julia3d/Julia3d.java
+++ b/src/com/jogamp/opencl/demos/julia3d/Julia3d.java
@@ -1,24 +1,24 @@
-package com.mbien.opencl.demos.julia3d;
-
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLPlatform;
-import com.mbien.opencl.CLProgram;
-import com.mbien.opencl.demos.julia3d.structs.Camera;
-import com.mbien.opencl.demos.julia3d.structs.RenderingConfig;
-import com.mbien.opencl.demos.julia3d.structs.Vec;
+package com.jogamp.opencl.demos.julia3d;
+
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLPlatform;
+import com.jogamp.opencl.CLProgram;
+import com.jogamp.opencl.demos.julia3d.structs.Camera;
+import com.jogamp.opencl.demos.julia3d.structs.RenderingConfig;
+import com.jogamp.opencl.demos.julia3d.structs.Vec;
 import java.io.IOException;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import javax.swing.SwingUtilities;
 
-import static com.mbien.opencl.CLMemory.Mem.*;
-import static com.mbien.opencl.CLProgram.CompilerOptions.*;
-import static com.mbien.opencl.demos.julia3d.UserSceneController.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLProgram.CompilerOptions.*;
+import static com.jogamp.opencl.demos.julia3d.UserSceneController.*;
 
 /**
  * This sample has been ported from David Buciarelli's juliaGPU v1.2 written in C.
diff --git a/src/com/mbien/opencl/demos/julia3d/Renderer.java b/src/com/jogamp/opencl/demos/julia3d/Renderer.java
index 9266aba..ce97e4a 100644
--- a/src/com/mbien/opencl/demos/julia3d/Renderer.java
+++ b/src/com/jogamp/opencl/demos/julia3d/Renderer.java
@@ -1,6 +1,6 @@
-package com.mbien.opencl.demos.julia3d;
+package com.jogamp.opencl.demos.julia3d;
 
-import com.mbien.opencl.demos.julia3d.structs.RenderingConfig;
+import com.jogamp.opencl.demos.julia3d.structs.RenderingConfig;
 import com.jogamp.opengl.util.awt.TextRenderer;
 import java.awt.Dimension;
 import java.awt.Font;
diff --git a/src/com/mbien/opencl/demos/julia3d/UserSceneController.java b/src/com/jogamp/opencl/demos/julia3d/UserSceneController.java
index 849de3a..fda54be 100644
--- a/src/com/mbien/opencl/demos/julia3d/UserSceneController.java
+++ b/src/com/jogamp/opencl/demos/julia3d/UserSceneController.java
@@ -1,7 +1,7 @@
-package com.mbien.opencl.demos.julia3d;
+package com.jogamp.opencl.demos.julia3d;
 
-import com.mbien.opencl.demos.julia3d.structs.RenderingConfig;
-import com.mbien.opencl.demos.julia3d.structs.Vec;
+import com.jogamp.opencl.demos.julia3d.structs.RenderingConfig;
+import com.jogamp.opencl.demos.julia3d.structs.Vec;
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.event.KeyAdapter;
@@ -11,7 +11,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 
 import static java.lang.Math.*;
-import static com.mbien.opencl.demos.julia3d.Renderer.*;
+import static com.jogamp.opencl.demos.julia3d.Renderer.*;
 
 /**
  * Utility class for interacting with a scene. Supports rotation and zoom around origin.
diff --git a/src/com/mbien/opencl/demos/julia3d/config.h b/src/com/jogamp/opencl/demos/julia3d/config.h
index 72df3ff..72df3ff 100644
--- a/src/com/mbien/opencl/demos/julia3d/config.h
+++ b/src/com/jogamp/opencl/demos/julia3d/config.h
diff --git a/src/com/mbien/opencl/demos/julia3d/mandelbrot_kernel.cl b/src/com/jogamp/opencl/demos/julia3d/mandelbrot_kernel.cl
index d5acd02..d5acd02 100644
--- a/src/com/mbien/opencl/demos/julia3d/mandelbrot_kernel.cl
+++ b/src/com/jogamp/opencl/demos/julia3d/mandelbrot_kernel.cl
diff --git a/src/com/mbien/opencl/demos/julia3d/rendering_kernel.cl b/src/com/jogamp/opencl/demos/julia3d/rendering_kernel.cl
index 9c25c1b..9c25c1b 100644
--- a/src/com/mbien/opencl/demos/julia3d/rendering_kernel.cl
+++ b/src/com/jogamp/opencl/demos/julia3d/rendering_kernel.cl
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/Camera.java b/src/com/jogamp/opencl/demos/julia3d/structs/Camera.java
index 50d5868..68c567c 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/Camera.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/Camera.java
@@ -1,9 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 import com.jogamp.common.nio.*;
 
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/Camera32.java b/src/com/jogamp/opencl/demos/julia3d/structs/Camera32.java
index 85dea51..1811583 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/Camera32.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/Camera32.java
@@ -1,11 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
-
-import com.jogamp.gluegen.runtime.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 
 class Camera32 extends Camera {
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/Camera64.java b/src/com/jogamp/opencl/demos/julia3d/structs/Camera64.java
index afe4acd..f82d3b3 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/Camera64.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/Camera64.java
@@ -1,11 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
-
-import com.jogamp.gluegen.runtime.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 
 class Camera64 extends Camera {
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/RenderingConfig.java b/src/com/jogamp/opencl/demos/julia3d/structs/RenderingConfig.java
index 5bc65b5..4b14f1a 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/RenderingConfig.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/RenderingConfig.java
@@ -1,9 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 import com.jogamp.common.nio.*;
 
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/RenderingConfig32.java b/src/com/jogamp/opencl/demos/julia3d/structs/RenderingConfig32.java
index 3898d60..27f40e6 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/RenderingConfig32.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/RenderingConfig32.java
@@ -1,11 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
-
-import com.jogamp.gluegen.runtime.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 
 class RenderingConfig32 extends RenderingConfig {
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/RenderingConfig64.java b/src/com/jogamp/opencl/demos/julia3d/structs/RenderingConfig64.java
index e3a0267..e60987e 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/RenderingConfig64.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/RenderingConfig64.java
@@ -1,11 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
-
-import com.jogamp.gluegen.runtime.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 
 class RenderingConfig64 extends RenderingConfig {
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/Vec.java b/src/com/jogamp/opencl/demos/julia3d/structs/Vec.java
index 3bd6b18..d4b2d48 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/Vec.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/Vec.java
@@ -1,7 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 
 import com.jogamp.common.nio.*;
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/Vec32.java b/src/com/jogamp/opencl/demos/julia3d/structs/Vec32.java
index 3c0ee5d..e7668ac 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/Vec32.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/Vec32.java
@@ -1,11 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
-
-import com.jogamp.gluegen.runtime.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 
 class Vec32 extends Vec {
diff --git a/src/com/mbien/opencl/demos/julia3d/structs/Vec64.java b/src/com/jogamp/opencl/demos/julia3d/structs/Vec64.java
index 5952021..60750a4 100644
--- a/src/com/mbien/opencl/demos/julia3d/structs/Vec64.java
+++ b/src/com/jogamp/opencl/demos/julia3d/structs/Vec64.java
@@ -1,11 +1,7 @@
 /* !---- DO NOT EDIT: This file autogenerated by com/sun/gluegen/JavaEmitter.java on Tue Feb 09 18:20:26 CET 2010 ----! */
 
 
-package com.mbien.opencl.demos.julia3d.structs;
-
-import java.nio.*;
-
-import com.jogamp.gluegen.runtime.*;
+package com.jogamp.opencl.demos.julia3d.structs;
 
 
 class Vec64 extends Vec {
diff --git a/src/com/mbien/opencl/demos/radixsort/RadixSort.cl b/src/com/jogamp/opencl/demos/radixsort/RadixSort.cl
index d014692..d014692 100644
--- a/src/com/mbien/opencl/demos/radixsort/RadixSort.cl
+++ b/src/com/jogamp/opencl/demos/radixsort/RadixSort.cl
diff --git a/src/com/mbien/opencl/demos/radixsort/RadixSort.java b/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
index 783c094..e2a7b46 100644
--- a/src/com/mbien/opencl/demos/radixsort/RadixSort.java
+++ b/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
@@ -2,21 +2,20 @@
  * 20:38 Sunday, February 28 2010
  */
 
-package com.mbien.opencl.demos.radixsort;
-
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLProgram;
-import com.mbien.opencl.CLResource;
+package com.jogamp.opencl.demos.radixsort;
+
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLProgram;
+import com.jogamp.opencl.CLResource;
 import java.io.IOException;
 import java.nio.IntBuffer;
 
-import static com.mbien.opencl.CLMemory.Mem.*;
-import static com.mbien.opencl.CLProgram.*;
-import static com.mbien.opencl.CLProgram.CompilerOptions.*;
-import static java.lang.System.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLProgram.*;
+import static com.jogamp.opencl.CLProgram.CompilerOptions.*;
 
 /**
  *
diff --git a/src/com/mbien/opencl/demos/radixsort/RadixSortDemo.java b/src/com/jogamp/opencl/demos/radixsort/RadixSortDemo.java
index 93bc071..2ce429a 100644
--- a/src/com/mbien/opencl/demos/radixsort/RadixSortDemo.java
+++ b/src/com/jogamp/opencl/demos/radixsort/RadixSortDemo.java
@@ -2,19 +2,19 @@
  * 20:48 Sunday, February 28 2010
  */
 
-package com.mbien.opencl.demos.radixsort;
+package com.jogamp.opencl.demos.radixsort;
 
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLPlatform;
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLPlatform;
 import java.io.IOException;
 import java.nio.IntBuffer;
 import java.util.Random;
 
-import static com.mbien.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
 import static java.lang.System.*;
-import static com.mbien.opencl.CLDevice.Type.*;
+import static com.jogamp.opencl.CLDevice.Type.*;
 
 /**
  * GPU radix sort demo.
diff --git a/src/com/mbien/opencl/demos/radixsort/Scan.java b/src/com/jogamp/opencl/demos/radixsort/Scan.java
index 1426e9b..3d364ed 100644
--- a/src/com/mbien/opencl/demos/radixsort/Scan.java
+++ b/src/com/jogamp/opencl/demos/radixsort/Scan.java
@@ -1,18 +1,18 @@
 /*
  * 22:12 Sunday, February 28 2010
  */
-package com.mbien.opencl.demos.radixsort;
-
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLKernel;
-import com.mbien.opencl.CLProgram;
-import com.mbien.opencl.CLResource;
+package com.jogamp.opencl.demos.radixsort;
+
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLKernel;
+import com.jogamp.opencl.CLProgram;
+import com.jogamp.opencl.CLResource;
 import java.io.IOException;
 
-import static com.mbien.opencl.CLMemory.Mem.*;
-import static com.mbien.opencl.CLProgram.CompilerOptions.*;
+import static com.jogamp.opencl.CLMemory.Mem.*;
+import static com.jogamp.opencl.CLProgram.CompilerOptions.*;
 
 /**
  *
diff --git a/src/com/mbien/opencl/demos/radixsort/Scan_b.cl b/src/com/jogamp/opencl/demos/radixsort/Scan_b.cl
index 32fd4dd..32fd4dd 100644
--- a/src/com/mbien/opencl/demos/radixsort/Scan_b.cl
+++ b/src/com/jogamp/opencl/demos/radixsort/Scan_b.cl