diff --git a/samples/squares/.gitignore b/samples/squares/.gitignore
deleted file mode 100644
index 840e7d3120ee3206168d49bf62df2c269c38e17e..0000000000000000000000000000000000000000
--- a/samples/squares/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/classes/
diff --git a/samples/squares/.project b/samples/squares/.project
deleted file mode 100644
index af3434719541ff260bf69ffa5267cee6b461a001..0000000000000000000000000000000000000000
--- a/samples/squares/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>squares</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/squares/build.xml b/samples/squares/build.xml
deleted file mode 100644
index 94a01da2b003a665f6a2f6bce7a361a0cc11d552..0000000000000000000000000000000000000000
--- a/samples/squares/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="squares" 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-gpu">
-		<java classname="com.syncleus.aparapi.sample.squares.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-jtp">
-		<java classname="com.syncleus.aparapi.sample.squares.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" depends="run-gpu" />
-
-</project>
diff --git a/samples/squares/squares.bat b/samples/squares/squares.bat
deleted file mode 100644
index 8cd3dedf57ad35189c6a4ef869a7371d4a5f75e2..0000000000000000000000000000000000000000
--- a/samples/squares/squares.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-java ^
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist ^
- -Dcom.syncleus.aparapi.executionMode=%1 ^
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar;squares.jar ^
- com.syncleus.aparapi.sample.squares.Main
-
diff --git a/samples/squares/squares.sh b/samples/squares/squares.sh
deleted file mode 100644
index 1d82d4b6bd861c0ed71fe24678f7904f10b901ad..0000000000000000000000000000000000000000
--- a/samples/squares/squares.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:squares.jar \
- com.syncleus.aparapi.sample.squares.Main
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index 662950bbef5c06cdc4593601a1042a76cd69f4d7..04cb7b2d6ac9f601ffd4654971f8edc824468b47 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -22,6 +22,7 @@ public class All {
         System.out.println("  5) Convolution (OpenCL)");
         System.out.println("  6) Convolution (pure Java)");
         System.out.println("  7) Blacksholes");
+        System.out.println("  8) Squares");
         System.out.println();
 
         Scanner in = new Scanner(System.in);
@@ -73,6 +74,9 @@ public class All {
             case "7":
                 com.syncleus.aparapi.examples.blackscholes.Main.main(args);
                 break;
+            case "8":
+                com.syncleus.aparapi.examples.squares.Main.main(args);
+                break;
             default:
                 System.out.println("Invalid selection.");
         }
diff --git a/samples/squares/src/com/amd/aparapi/sample/squares/Main.java b/src/main/java/com/syncleus/aparapi/examples/squares/Main.java
similarity index 90%
rename from samples/squares/src/com/amd/aparapi/sample/squares/Main.java
rename to src/main/java/com/syncleus/aparapi/examples/squares/Main.java
index 22bd73ec1f5fe375ba98d496d1cd8b1c994b989f..7b8bc2380418004d71ef0ad4b15ba7499ac7e34d 100644
--- a/samples/squares/src/com/amd/aparapi/sample/squares/Main.java
+++ b/src/main/java/com/syncleus/aparapi/examples/squares/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.squares;
+package com.syncleus.aparapi.examples.squares;
 
 import com.syncleus.aparapi.Kernel;
 import com.syncleus.aparapi.Range;