diff --git a/samples/mdarray/.gitignore b/samples/mdarray/.gitignore
deleted file mode 100644
index 840e7d3120ee3206168d49bf62df2c269c38e17e..0000000000000000000000000000000000000000
--- a/samples/mdarray/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/classes/
diff --git a/samples/mdarray/.project b/samples/mdarray/.project
deleted file mode 100644
index 2273fb14a347b04d3172b14c20b8f16215e5f601..0000000000000000000000000000000000000000
--- a/samples/mdarray/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>mdarray</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/mdarray/build.xml b/samples/mdarray/build.xml
deleted file mode 100644
index f4ceaf094b3da3d6eecd7bb125e086078b30a2a0..0000000000000000000000000000000000000000
--- a/samples/mdarray/build.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="mdarray" 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" fork="true" memorymaximumsize="1024m">
-			<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="gov.pnnl.aparapi.sample.mdarray.MDArray" 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" />
-			<sysproperty key="com.syncleus.aparapi.logLevel" value="WARNING" />
-			<sysproperty key="com.syncleus.aparapi.enableVerboseJNI" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableExecutionModeReporting" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableShowGeneratedOpenCL" value="false" />
-		</java>
-	</target>
-
-	<target name="run-gpu">
-		<java classname="gov.pnnl.aparapi.sample.mdarray.MDArray" fork="true">
-			<classpath refid="runtime.class.path" />
-			<sysproperty key="java.library.path" path="../../com.syncleus.aparapi.jni/dist" />
-			<jvmarg value="-Xmx5G" />
-			<jvmarg value="-Xms5G" />
-			<sysproperty key="com.syncleus.aparapi.executionMode" value="GPU" />
-			<sysproperty key="com.syncleus.aparapi.logLevel" value="WARNING" />
-			<sysproperty key="com.syncleus.aparapi.enableVerboseJNI" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableExecutionModeReporting" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableShowGeneratedOpenCL" value="false" />
-		</java>
-	</target>
-
-	<target name="run-gpuv">
-		<java classname="gov.pnnl.aparapi.sample.mdarray.MDArray" 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" />
-			<sysproperty key="com.syncleus.aparapi.logLevel" value="WARNING" />
-			<sysproperty key="com.syncleus.aparapi.enableVerboseJNI" value="true" />
-			<sysproperty key="com.syncleus.aparapi.enableExecutionModeReporting" value="true" />
-			<sysproperty key="com.syncleus.aparapi.enableShowGeneratedOpenCL" value="true" />
-		</java>
-	</target>
-
-	<target name="run-cpu">
-		<java classname="gov.pnnl.aparapi.sample.mdarray.MDArray" 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="CPU" />
-			<sysproperty key="com.syncleus.aparapi.logLevel" value="WARNING" />
-			<sysproperty key="com.syncleus.aparapi.enableVerboseJNI" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableExecutionModeReporting" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableShowGeneratedOpenCL" value="false" />
-		</java>
-	</target>
-
-	<target name="run-multi">
-		<java classname="gov.pnnl.aparapi.sample.mdarray.MDArray" 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,CPU,JTP" />
-			<sysproperty key="com.syncleus.aparapi.logLevel" value="WARNING" />
-			<sysproperty key="com.syncleus.aparapi.enableVerboseJNI" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableExecutionModeReporting" value="false" />
-			<sysproperty key="com.syncleus.aparapi.enableShowGeneratedOpenCL" value="false" />
-		</java>
-	</target>
-
-	<target name="run" depends="run-gpu" />
-
-	<target name="run-instruction-decoder-viewer">
-		<java classname="gov.pnnl.aparapi.sample.mdarray.MDArray" fork="true">
-			<classpath refid="runtime.class.path" />
-			<sysproperty key="java.library.path" path="../../com.syncleus.aparapi.jni/dist" />
-			<sysproperty key="com.syncleus.aparapi.enableShowGeneratedOpenCL" value="true" />
-			<sysproperty key="com.syncleus.aparapi.enableInstructionDecodeViewer" value="true" />
-		</java>
-	</target>
-
-	<target name="run-show-generated-opencl">
-		<java classname="gov.pnnl.aparapi.sample.mdarray.MDArray" fork="true">
-			<classpath refid="runtime.class.path" />
-			<sysproperty key="java.library.path" path="../../com.syncleus.aparapi.jni/dist" />
-			<sysproperty key="com.syncleus.aparapi.enableShowGeneratedOpenCL" value="true" />
-		</java>
-	</target>
-
-</project>
diff --git a/samples/mdarray/mdarray.bat b/samples/mdarray/mdarray.bat
deleted file mode 100644
index 24777f68b65caed70e0f3bc79e45f5696fb188cf..0000000000000000000000000000000000000000
--- a/samples/mdarray/mdarray.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-java ^
-  -Djava.library.path=..\..\com.syncleus.aparapi.jni\dist ^
-  -Dcom.syncleus.aparapi.executionMode=%1 ^
-  -Dcom.syncleus.aparapi.enableProfiling=false ^
-  -classpath ..\..\com.syncleus.aparapi\dist\aparapi.jar;mdarray.jar ^
-  gov.pnnl.aparapi.sample.mdarray.MDArray 
\ No newline at end of file
diff --git a/samples/mdarray/mdarray.sh b/samples/mdarray/mdarray.sh
deleted file mode 100644
index ca950e00b74fada27e0bbe35a0bf3e41771e153b..0000000000000000000000000000000000000000
--- a/samples/mdarray/mdarray.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -Djava.library.path=../../com.syncleus.aparapi.jni/dist -cp ../../com.syncleus.aparapi/dist/aparapi.jar:./mdarray.jar gov.pnnl.aparapi.sample.mdarray.MDArray
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index 448a8c5ac7ebd05dae00d5c5880476e0e7b31839..d31b6d4b06c59813fec0dd1d22a52f0d4605aa98 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -27,6 +27,7 @@ public class All {
         System.out.println("  10) Progress and cancel demo");
         System.out.println("  11) Info");
         System.out.println("  12) Medians");
+        System.out.println("  13) MDArray");
         System.out.println();
 
         Scanner in = new Scanner(System.in);
@@ -93,6 +94,9 @@ public class All {
             case "12":
                 com.syncleus.aparapi.examples.median.MedianDemo.main(args);
                 break;
+            case "13":
+                com.syncleus.aparapi.examples.mdarray.MDArray.main(args);
+                break;
             default:
                 System.out.println("Invalid selection.");
         }
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java
similarity index 54%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul1D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java
index 744dfec7c4fe02e7974e67fd18e7d29440ad4ff7..30515e70961fd6f684a6d8c583a49f7b0107dcd9 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul1D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class BMatMul1D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java
similarity index 53%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul2D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java
index 05cc9d56038447d60dac0555eb8a9ee9a34a9c53..d03e80c91b3b398eb4d25f40819eba6c105f5850 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul2D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class BMatMul2D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java
similarity index 59%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul3D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java
index a2e5402258c6cd92b50db0fa2255f8a964a15b77..244a8a904a87a789939d1b74cdb5bcb48f09a70e 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/BMatMul3D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class BMatMul3D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java
similarity index 54%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul1D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java
index 9f43fd320bb5d7e58201b98ddcb95bd7f0401973..0752d2992905729481cf38cc1da9daf088b44aef 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul1D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class DMatMul1D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java
similarity index 54%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul2D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java
index 4f42d192d70bed75b539637e0afd0d9f6ba9f64b..de6c240f111eff89c8b5ce5c7da5e844ddc14802 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul2D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class DMatMul2D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java
similarity index 56%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul3D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java
index 266d556f38cc984c67eaadc4b606bf52087a8ce6..f4b97f887a3df9af5a2b55dd820d2721dc499c4a 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/DMatMul3D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class DMatMul3D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java
similarity index 53%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul1D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java
index ec10aeeeebeae679ff66b981206882f9cb386f1c..4596efb0d1bffb90ed5c039f9367b8f04336eba9 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul1D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class FMatMul1D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java
similarity index 53%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul2D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java
index 8c74a0449a885c92960259c1a6a0e74dbf1fd299..1d4daf28893971265cb850751b8a4b98a1137034 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul2D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class FMatMul2D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java
similarity index 56%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul3D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java
index b2cfb436b5a160ed7656c9af64fee8711a3290a1..c1360b5347a4891b20b83471ac2e37e88c67b586 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/FMatMul3D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class FMatMul3D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java
similarity index 53%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul1D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java
index 3dc6e512638f74d53702fed4ff8bda833be858a4..0d7a57944f12c795144be3eda3afd9e90165d3c5 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul1D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class IMatMul1D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java
similarity index 53%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul2D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java
index bf7390530fa5340117a72e81803ac21408749010..0f23dc8c5d0f0b4861dfc9a5ca2fca966e675ea4 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul2D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class IMatMul2D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java
similarity index 55%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul3D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java
index 403f62dd527fa77a51ebcb7d864e4b671871f97b..71f83ef8a09293fad8a628b31d6a05d7233b9860 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/IMatMul3D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class IMatMul3D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java
similarity index 53%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul1D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java
index 8a1f7b6ad88fdd4a83a34e419a52dc66c5ce97bd..b1e08cb959cc4e4a2cf2a5eb497a4146bbc95fce 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul1D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class LMatMul1D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java
similarity index 53%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul2D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java
index c60b44576aea25e9b1b7ecfead2bc89d728edb08..65d16c4939c4ac5e9e552b076387b23220564513 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul2D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class LMatMul2D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java
similarity index 56%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul3D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java
index 80b544882bc110a821cf538f71a58065f2bc1970..98c08419c3e426ce2448896626291db3a5cbd30f 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/LMatMul3D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class LMatMul3D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/MDArray.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java
similarity index 95%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/MDArray.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java
index f9df2ff442443e23e441cb711f9c5a2b7c4e9818..38819b1643d1a1bb569a3814a3af0028e415f08a 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/MDArray.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java
@@ -1,8 +1,18 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
 
 import com.syncleus.aparapi.Kernel;
 
-class MDArray {
+public class MDArray {
 
    static int N = 1 << 10;
 
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java
similarity index 54%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul1D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java
index 84f6c287bee0ab8f8056703ac01e8885642d7095..71e4ab4ba7863e4412964a68154e2c86929b91cb 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul1D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class SMatMul1D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java
similarity index 54%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul2D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java
index 3008869f0bb84258b32f4335b7789d9460854dfb..2d46af4f122134da9adcdcbc5a367cb482380f0e 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul2D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class SMatMul2D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java
similarity index 56%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul3D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java
index bb9df48ce0ea1db874947596d0d813f9868d66fe..8558a669ffda715efd778f3965819e02e231dc7b 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/SMatMul3D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class SMatMul3D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java
similarity index 54%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul1D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java
index f5920f73ddefebee729e96bab5b756a37ca5f543..f94092547b44b14084494710bed1f20ba0f02434 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul1D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class ZMatMul1D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java
similarity index 54%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul2D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java
index 81af2646dc41f6be3613969c640c1775392e00dc..0ddd5913abd735f2b698f5ebe81df4c916abc62d 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul2D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class ZMatMul2D extends Kernel{
diff --git a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java
similarity index 57%
rename from samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul3D.java
rename to src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java
index 424737ae9b7f86f10ffa937bb06850977beb0066..d0a0940f2aa104f5b3fe0638230cc5654ccd5b05 100644
--- a/samples/mdarray/src/gov/pnnl/aparapi/sample/mdarray/ZMatMul3D.java
+++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java
@@ -1,4 +1,15 @@
-package gov.pnnl.aparapi.sample.mdarray;
+/**
+ * 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.
+ */
+package com.syncleus.aparapi.examples.mdarray;
+
 import com.syncleus.aparapi.Kernel;
 
 class ZMatMul3D extends Kernel{