diff --git a/samples/add/.gitignore b/samples/add/.gitignore
deleted file mode 100644
index 840e7d3120ee3206168d49bf62df2c269c38e17e..0000000000000000000000000000000000000000
--- a/samples/add/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/classes/
diff --git a/samples/add/.project b/samples/add/.project
deleted file mode 100644
index 11a89faa96c807782bfd646f1687acc7f0ad1d9f..0000000000000000000000000000000000000000
--- a/samples/add/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>add</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/samples/add/add.bat b/samples/add/add.bat
deleted file mode 100644
index f0ee716849fb4a04c34001be58ddaf76e1101183..0000000000000000000000000000000000000000
--- a/samples/add/add.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-java ^
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist ^
- -Dcom.syncleus.aparapi.executionMode=%1 ^
- -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true ^
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar;add.jar ^
- com.syncleus.aparapi.sample.add.Main
-
diff --git a/samples/add/add.sh b/samples/add/add.sh
deleted file mode 100644
index 2ba5d85cae3ea8077c3ce399e251d1e177c5a996..0000000000000000000000000000000000000000
--- a/samples/add/add.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-java \
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist \
- -Dcom.syncleus.aparapi.executionMode=%1 \
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar:add.jar \
- com.syncleus.aparapi.sample.add.Main
diff --git a/samples/add/build.xml b/samples/add/build.xml
deleted file mode 100644
index f28c0b58c0405670ecbc14ac797f2c5171bff410..0000000000000000000000000000000000000000
--- a/samples/add/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="add" 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" />
-
-	<path id="compiler.class.path">
-		<pathelement path="../../com.syncleus.aparapi/dist/aparapi.jar" />
-	</path>
-
-	<path id="runtime.class.path" cache="true">
-		<path refid="compiler.class.path" />
-		<pathelement path="${ant.project.name}.jar" />
-	</path>
-
-	<target name="build" depends="clean">
-		<mkdir dir="classes" />
-		<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false">
-			<classpath>
-				<pathelement path="../../com.syncleus.aparapi/dist/aparapi.jar" />
-			</classpath>
-		</javac>
-		<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.sample.add.Main" fork="true">
-			<classpath refid="runtime.class.path" />
-			<sysproperty key="java.library.path" path="..\..\com.syncleus.aparapi.jni\dist" />
-			<sysproperty key="com.syncleus.aparapi.executionMode" value="JTP" />
-		</java>
-	</target>
-
-	<target name="run-gpu">
-		<java classname="com.syncleus.aparapi.sample.add.Main" fork="true">
-			<classpath refid="runtime.class.path" />
-			<sysproperty key="java.library.path" path="..\..\com.syncleus.aparapi.jni\dist" />
-			<sysproperty key="com.syncleus.aparapi.executionMode" value="GPU" />
-		</java>
-	</target>
-
-	<target name="run" depends="run-gpu" />
-
-</project>
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index d31b6d4b06c59813fec0dd1d22a52f0d4605aa98..5fc5fb7794a74767564112475085df9b1f1e7aaf 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -28,6 +28,7 @@ public class All {
         System.out.println("  11) Info");
         System.out.println("  12) Medians");
         System.out.println("  13) MDArray");
+        System.out.println("  14) Add");
         System.out.println();
 
         Scanner in = new Scanner(System.in);
@@ -97,6 +98,9 @@ public class All {
             case "13":
                 com.syncleus.aparapi.examples.mdarray.MDArray.main(args);
                 break;
+            case "14":
+                com.syncleus.aparapi.examples.add.Main.main(args);
+                break;
             default:
                 System.out.println("Invalid selection.");
         }
diff --git a/samples/add/src/com/amd/aparapi/sample/add/Main.java b/src/main/java/com/syncleus/aparapi/examples/add/Main.java
similarity index 88%
rename from samples/add/src/com/amd/aparapi/sample/add/Main.java
rename to src/main/java/com/syncleus/aparapi/examples/add/Main.java
index 2fd0c55ed5d8399081cf73758593f61d9275d392..8d0d63806eb9723f37c1091dbe13ac49e03463fd 100644
--- a/samples/add/src/com/amd/aparapi/sample/add/Main.java
+++ b/src/main/java/com/syncleus/aparapi/examples/add/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.
@@ -36,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.sample.add;
+package com.syncleus.aparapi.examples.add;
 
 import com.syncleus.aparapi.Kernel;
 import com.syncleus.aparapi.Range;