diff --git a/examples/nbody/.gitignore b/examples/nbody/.gitignore
deleted file mode 100644
index 995897440568f8eb3da5dc0424ec57a0aab1f8da..0000000000000000000000000000000000000000
--- a/examples/nbody/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.libs/
-/classes/
diff --git a/examples/nbody/.project b/examples/nbody/.project
deleted file mode 100644
index f3cf594da207a5f5c31bf1478f1502ecfbc8e6b3..0000000000000000000000000000000000000000
--- a/examples/nbody/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>nbody</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/examples/nbody/agent.sh b/examples/nbody/agent.sh
deleted file mode 100644
index 3a2ee3722e70445282de35c6205459bf7c251026..0000000000000000000000000000000000000000
--- a/examples/nbody/agent.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-java \
-  -agentpath:../../com.syncleus.aparapi.jni/dist/libaparapi_x86_64.so\
-  -Dcom.syncleus.aparapi.useAgent=true\
-  -Djava.library.path=../third-party/jogamp \
-  -Dcom.syncleus.aparapi.executionMode=$1 \
-  -Dbodies=$2 \
-  -Dheight=600 \
-  -Dwidth=600 \
-  -classpath ../third-party/jogamp/jogl-all.jar:../third-party/jogamp/gluegen-rt.jar:../../com.syncleus.aparapi/dist/aparapi.jar:nbody.jar \
-  com.syncleus.aparapi.examples.nbody.Main
diff --git a/examples/nbody/build.xml b/examples/nbody/build.xml
deleted file mode 100644
index ed4b7cd0c6fea28965c896224aa31c4c71424d15..0000000000000000000000000000000000000000
--- a/examples/nbody/build.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="nbody" default="build" basedir=".">
-
-	<!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
-	<!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
-	<property name="build.compiler" value="javac1.7" />
-	<property name="ant.build.javac.source" value="1.7" />
-	<property name="ant.build.javac.target" value="1.7" />
-
-	<property name="libs.root" value="${basedir}/.libs" />
-
-	<property name="jogl.all.jar" value="jogl-all.jar" />
-	<property name="jogl.all.natives.macosx.jar" value="jogl-all-natives-macosx-universal.jar" />
-	<property name="jogl.all.natives.windows.i586.jar" value="jogl-all-natives-windows-i586.jar" />
-	<property name="jogl.all.natives.windows.amd64.jar" value="jogl-all-natives-windows-amd64.jar" />
-	<property name="jogl.all.natives.linux.i586.jar" value="jogl-all-natives-linux-i586.jar" />
-	<property name="jogl.all.natives.linux.amd64.jar" value="jogl-all-natives-linux-amd64.jar" />
-
-	<property name="gluegen.rt.jar" value="gluegen-rt.jar" />
-	<property name="gluegen.rt.natives.macosx.jar" value="gluegen-rt-natives-macosx-universal.jar" />
-	<property name="gluegen.rt.natives.windows.i586.jar" value="gluegen-rt-natives-windows-i586.jar" />
-	<property name="gluegen.rt.natives.windows.amd64.jar" value="gluegen-rt-natives-windows-amd64.jar" />
-	<property name="gluegen.rt.natives.linux.i586.jar" value="gluegen-rt-natives-linux-i586.jar" />
-	<property name="gluegen.rt.natives.linux.amd64.jar" value="gluegen-rt-natives-linux-amd64.jar" />
-
-	<property name="jogamp.url" value="http://jogamp.org/deployment/archive/rc/gluegen_52-joal_32-jogl_66-jocl_41/jar" />
-
-	<property name="jogl.all.url" value="${jogamp.url}/${jogl.all.jar}" />
-	<property name="jogl.all.natives.macosx.url" value="${jogamp.url}/${jogl.all.natives.macosx.jar}" />
-	<property name="jogl.all.natives.windows.i586.url" value="${jogamp.url}/${jogl.all.natives.windows.i586.jar}" />
-	<property name="jogl.all.natives.windows.amd64.url" value="${jogamp.url}/${jogl.all.natives.windows.amd64.jar}" />
-	<property name="jogl.all.natives.linux.i586.url" value="${jogamp.url}/${jogl.all.natives.linux.i586.jar}" />
-	<property name="jogl.all.natives.linux.amd64.url" value="${jogamp.url}/${jogl.all.natives.linux.amd64.jar}" />
-
-	<property name="gluegen.rt.url" value="${jogamp.url}/${gluegen.rt.jar}" />
-	<property name="gluegen.rt.natives.macosx.url" value="${jogamp.url}/${gluegen.rt.natives.macosx.jar}" />
-	<property name="gluegen.rt.natives.windows.i586.url" value="${jogamp.url}/${gluegen.rt.natives.windows.1586.jar}" />
-	<property name="gluegen.rt.natives.windows.amd64.url" value="${jogamp.url}/${gluegen.rt.natives.windows.amd64.jar}" />
-	<property name="gluegen.rt.natives.linux.i586.url" value="${jogamp.url}/${gluegen.rt.natives.linux.i586.jar}" />
-	<property name="gluegen.rt.natives.linux.amd64.url" value="${jogamp.url}/${gluegen.rt.natives.linux.amd64.jar}" />
-
-	<path id="compiler.class.path">
-		<pathelement path="../../com.syncleus.aparapi/dist/aparapi.jar" />
-		<pathelement path="${libs.root}/${jogl.all.jar}" />
-		<pathelement path="${libs.root}/${jogl.all.natives.macosx.jar}" />
-		<pathelement path="${libs.root}/${jogl.all.natives.windows.i586.jar}" />
-		<pathelement path="${libs.root}/${jogl.all.natives.windows.amd64.jar}" />
-		<pathelement path="${libs.root}/${jogl.all.natives.linux.i586.jar}" />
-		<pathelement path="${libs.root}/${jogl.all.natives.linux.amd64.jar}" />
-		<pathelement path="${libs.root}/${gluegen.rt.jar}" />
-		<pathelement path="${libs.root}/${gluegen.rt.natives.macosx.jar}" />
-		<pathelement path="${libs.root}/${gluegen.rt.natives.windows.i586.jar}" />
-		<pathelement path="${libs.root}/${gluegen.rt.natives.windows.amd64.jar}" />
-		<pathelement path="${libs.root}/${gluegen.rt.natives.linux.i586.jar}" />
-		<pathelement path="${libs.root}/${gluegen.rt.natives.linux.amd64.jar}" />
-		<pathelement path="classes" />
-	</path>
-
-	<path id="runtime.class.path" cache="true">
-		<path refid="compiler.class.path" />
-		<pathelement path="${ant.project.name}.jar" />
-	</path>
-
-	<target name="install.deps">
-		<mkdir dir="${libs.root}" />
-		<!-- Cleanup all existing deps -->
-		<delete failonerror="false" includeEmptyDirs="true">
-			<fileset dir="${libs.root}" includes="*/" />
-		</delete>
-		<!-- Download and unzip requested deps -->
-		<get src="${jogl.all.url}" dest="${libs.root}/${jogl.all.jar}" />
-		<get src="${jogl.all.natives.macosx.url}" dest="${libs.root}/${jogl.all.natives.macosx.jar}" />
-		<get src="${jogl.all.natives.macosx.url}" dest="${libs.root}/${jogl.all.natives.windows.i586.jar}" />
-		<get src="${jogl.all.natives.macosx.url}" dest="${libs.root}/${jogl.all.natives.windows.amd64.jar}" />
-		<get src="${jogl.all.natives.macosx.url}" dest="${libs.root}/${jogl.all.natives.linux.i586.jar}" />
-		<get src="${jogl.all.natives.macosx.url}" dest="${libs.root}/${jogl.all.natives.linux.amd64.jar}" />
-		<get src="${gluegen.rt.url}" dest="${libs.root}/${gluegen.rt.jar}" />
-		<get src="${gluegen.rt.natives.macosx.url}" dest="${libs.root}/${gluegen.rt.natives.macosx.jar}" />
-		<get src="${gluegen.rt.natives.macosx.url}" dest="${libs.root}/${gluegen.rt.natives.windows.i586.jar}" />
-		<get src="${gluegen.rt.natives.macosx.url}" dest="${libs.root}/${gluegen.rt.natives.windows.amd64.jar}" />
-		<get src="${gluegen.rt.natives.macosx.url}" dest="${libs.root}/${gluegen.rt.natives.linux.i586.jar}" />
-		<get src="${gluegen.rt.natives.macosx.url}" dest="${libs.root}/${gluegen.rt.natives.linux.amd64.jar}" />
-	</target>
-
-	<target name="build" depends="clean">
-		<mkdir dir="classes" />
-		<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false">
-			<classpath refid="compiler.class.path" />
-		</javac>
-		<copy todir="classes/com/amd/aparapi/examples/nbody" file="src/com/amd/aparapi/examples/nbody/particle.jpg" />
-		<jar jarfile="${ant.project.name}.jar" basedir="classes" />
-	</target>
-
-	<target name="clean">
-		<delete dir="classes" />
-		<delete file="${ant.project.name}.jar" />
-	</target>
-
-	<target name="run-jtp">
-		<java classname="com.syncleus.aparapi.examples.nbody.Main" fork="true">
-			<classpath refid="runtime.class.path" />
-			<sysproperty key="java.library.path" path="..\..\com.syncleus.aparapi.jni\dist;jogamp" />
-			<sysproperty key="com.syncleus.aparapi.executionMode" value="JTP" />
-			<sysproperty key="bodies" value="16384" />
-			<sysproperty key="height" value="800" />
-			<sysproperty key="width" value="800" />
-		</java>
-	</target>
-
-	<target name="run-gpu">
-		<java classname="com.syncleus.aparapi.examples.nbody.Main" fork="true">
-			<classpath refid="runtime.class.path" />
-			<sysproperty key="java.library.path" path="..\..\com.syncleus.aparapi.jni\dist;jogamp" />
-			<sysproperty key="com.syncleus.aparapi.executionMode" value="GPU" />
-			<sysproperty key="bodies" value="16384" />
-			<sysproperty key="height" value="800" />
-			<sysproperty key="width" value="800" />
-		</java>
-	</target>
-
-	<target name="run" depends="run-gpu" />
-
-</project>
diff --git a/examples/nbody/local.bat b/examples/nbody/local.bat
deleted file mode 100644
index 0ecc5a22280e96eab78ddd981d471b5ad07aaa11..0000000000000000000000000000000000000000
--- a/examples/nbody/local.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-java ^
-  -Djava.library.path=..\..\com.syncleus.aparapi.jni\dist;..\third-party\jogamp ^
-  -Dcom.syncleus.aparapi.executionMode=%1 ^
-  -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true ^
-  -Dcom.syncleus.aparapi.enableVerboseJNI=false ^
-  -Dcom.syncleus.aparapi.enableProfiling=true ^
-  -Dbodies=%2 ^
-  -Dheight=600 ^
-  -Dwidth=600 ^
-  -classpath ..\third-party\jogamp\gluegen-rt.jar;..\third-party\jogamp\jogl.all.jar;..\..\com.syncleus.aparapi\dist\aparapi.jar;nbody.jar ^
-  com.syncleus.aparapi.examples.nbody.Local
-
-
diff --git a/examples/nbody/local.sh b/examples/nbody/local.sh
deleted file mode 100644
index 0e58d8ec66a60e3e2e7e25ed5428f6d2e238217d..0000000000000000000000000000000000000000
--- a/examples/nbody/local.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-java \
-  -Djava.library.path=../../com.syncleus.aparapi.jni/dist:../third-party/jogamp \
-  -Dcom.syncleus.aparapi.executionMode=$1 \
-  -Dbodies=$2 \
-  -Dheight=600 \
-  -Dwidth=600 \
-  -classpath ../third-party/jogamp/jogl-all.jar:../third-party/jogamp/gluegen-rt.jar:../../com.syncleus.aparapi/dist/aparapi.jar:nbody.jar \
-  com.syncleus.aparapi.examples.nbody.Local
-
diff --git a/examples/nbody/nbody-agent.bat b/examples/nbody/nbody-agent.bat
deleted file mode 100644
index 84446a980fdbc66360f64397170eec24943355cc..0000000000000000000000000000000000000000
--- a/examples/nbody/nbody-agent.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-
-java ^
-  -agentpath:../../com.syncleus.aparapi.jni/dist/aparapi_x86_64.dll ^
-  -Dcom.syncleus.aparapi.useAgent=true ^
-  -Djava.library.path=..\third-party\jogamp ^
-  -Dcom.syncleus.aparapi.executionMode=%1 ^
-  -Dcom.syncleus.aparapi.enableProfiling=false ^
-  -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true ^
-  -Dbodies=%2 ^
-  -Dheight=600 ^
-  -Dwidth=600 ^
-  -classpath ..\third-party\jogamp\gluegen-rt.jar;..\third-party\jogamp\jogl-all.jar;..\..\com.syncleus.aparapi\dist\aparapi.jar;nbody.jar ^
-  com.syncleus.aparapi.examples.nbody.Main
-
-
diff --git a/examples/nbody/nbody.bat b/examples/nbody/nbody.bat
deleted file mode 100644
index 1a046cba052042f6aa4b8d04882f97431a5471b2..0000000000000000000000000000000000000000
--- a/examples/nbody/nbody.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-java ^
-  -Djava.library.path=..\..\com.syncleus.aparapi.jni\dist;..\third-party\jogamp ^
-  -Dcom.syncleus.aparapi.executionMode=%1 ^
-  -Dcom.syncleus.aparapi.enableProfiling=false ^
-  -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true ^
-  -Dcom.syncleus.aparapi.logLevel=SEVERE ^
-  -Dbodies=%2 ^
-  -Dheight=600 ^
-  -Dwidth=600 ^
-  -classpath ..\third-party\jogamp\gluegen-rt.jar;..\third-party\jogamp\jogl-all.jar;..\..\com.syncleus.aparapi\dist\aparapi.jar;nbody.jar ^
-  com.syncleus.aparapi.examples.nbody.Main
-
-
diff --git a/examples/nbody/nbody.sh b/examples/nbody/nbody.sh
deleted file mode 100644
index f27a90d62dca34ab80e97fca744adacef8eb963a..0000000000000000000000000000000000000000
--- a/examples/nbody/nbody.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-java \
-  -Djava.library.path=../../com.syncleus.aparapi.jni/dist:../third-party/jogamp \
-  -Dcom.syncleus.aparapi.executionMode=$1 \
-  -Dbodies=$2 \
-  -Dheight=600 \
-  -Dwidth=600 \
-  -classpath ../third-party/jogamp/jogl-all.jar:../third-party/jogamp/gluegen-rt.jar:../../com.syncleus.aparapi/dist/aparapi.jar:nbody.jar \
-  com.syncleus.aparapi.examples.nbody.Main
-
diff --git a/examples/nbody/seq.bat b/examples/nbody/seq.bat
deleted file mode 100644
index 0258d331d09c57d85974e71247c3c4bc5e96326e..0000000000000000000000000000000000000000
--- a/examples/nbody/seq.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-java ^
-  -Djava.library.path=..\third-party\jogamp ^
-  -Dbodies=%1 ^
-  -Dheight=600 ^
-  -Dwidth=600 ^
-  -classpath ..\third-party\jogamp\gluegen-rt.jar;..\third-party\jogamp\jogl-all.jar;nbody.jar ^
-  com.syncleus.aparapi.examples.nbody.Seq
-
-
diff --git a/examples/nbody/seq.sh b/examples/nbody/seq.sh
deleted file mode 100644
index ef0675741bd4deba014af855b3121f993c4b197d..0000000000000000000000000000000000000000
--- a/examples/nbody/seq.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-java \
-  -Djava.library.path=../../com.syncleus.aparapi.jni/dist:../third-party/jogamp \
-  -Dcom.syncleus.aparapi.executionMode=$1 \
-  -Dbodies=$2 \
-  -Dheight=600 \
-  -Dwidth=600 \
-  -classpath ../third-party/jogamp/jogl-all.jar:../third-party/jogamp/gluegen-rt.jar:../../com.syncleus.aparapi/dist/aparapi.jar:nbody.jar \
-  com.syncleus.aparapi.examples.nbody.Seq
-
diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/duke.jpg b/examples/nbody/src/com/amd/aparapi/examples/nbody/duke.jpg
deleted file mode 100644
index 2729fd2fc9cef1a95cb291aa633fb037fd6cf9ab..0000000000000000000000000000000000000000
Binary files a/examples/nbody/src/com/amd/aparapi/examples/nbody/duke.jpg and /dev/null differ
diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/particle.jpg b/examples/nbody/src/com/amd/aparapi/examples/nbody/particle.jpg
deleted file mode 100644
index 70e28ac5ea0a5ae58736f61f46ef5a326fbfbde0..0000000000000000000000000000000000000000
Binary files a/examples/nbody/src/com/amd/aparapi/examples/nbody/particle.jpg and /dev/null differ
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index 8c9706f661f3c1f30b477916f018c3ca49129db7..038dc2dbb8507fb593e41878619bb62e516fdc97 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -45,6 +45,9 @@ public class All {
         System.out.println(" 28) Javaone - Game of Life");
         System.out.println(" 29) Javaone - Mandlebrot");
         System.out.println(" 30) Javaone - NBody");
+        System.out.println(" 31) NBody");
+        System.out.println(" 32) NBody - Local");
+        System.out.println(" 33) NBody - Sequential");
         System.out.println();
 
         Scanner in = new Scanner(System.in);
@@ -165,6 +168,15 @@ public class All {
             case "30":
                 com.syncleus.aparapi.examples.javaonedemo.NBody.main(args);
                 break;
+            case "31":
+                com.syncleus.aparapi.examples.nbody.Main.main(args);
+                break;
+            case "32":
+                com.syncleus.aparapi.examples.nbody.Local.main(args);
+                break;
+            case "33":
+                com.syncleus.aparapi.examples.nbody.Seq.main(args);
+                break;
             default:
                 System.out.println("Invalid selection.");
         }
diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/Local.java b/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java
similarity index 93%
rename from examples/nbody/src/com/amd/aparapi/examples/nbody/Local.java
rename to src/main/java/com/syncleus/aparapi/examples/nbody/Local.java
index 24d30567dce4c8aa3c0eeed3c1caa8caeeb1977d..9c76bd7def81463b27132947457db240281cc6d9 100644
--- a/examples/nbody/src/com/amd/aparapi/examples/nbody/Local.java
+++ b/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java
@@ -1,3 +1,13 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
 /*
 Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
 All rights reserved.
@@ -46,15 +56,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.glu.GLU;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java b/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java
similarity index 92%
rename from examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
rename to src/main/java/com/syncleus/aparapi/examples/nbody/Main.java
index 2cfd32ab175c273883995689ce92ab3ac5c8f26f..5ca45361460f58a432c70183c03139ea4bdc3147 100644
--- a/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
+++ b/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java
@@ -1,3 +1,13 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
 /*
 Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
 All rights reserved.
@@ -46,16 +56,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.glu.GLU;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/Seq.java b/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java
similarity index 92%
rename from examples/nbody/src/com/amd/aparapi/examples/nbody/Seq.java
rename to src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java
index 4ba2d2a2c80785cf29838c1d8a6258f10e20ba23..b2cb25290e0fd00c579d78efe24a6c7e5b0410a6 100644
--- a/examples/nbody/src/com/amd/aparapi/examples/nbody/Seq.java
+++ b/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java
@@ -1,3 +1,13 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
 /*
 Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
 All rights reserved.
@@ -46,16 +56,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.glu.GLU;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/moon.jpg b/src/main/resources/moon.jpg
similarity index 100%
rename from examples/nbody/src/com/amd/aparapi/examples/nbody/moon.jpg
rename to src/main/resources/moon.jpg