diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/ProfilingDemoNoBinaryCaching.java b/samples/configuration/src/com/amd/aparapi/sample/configuration/ProfilingDemoNoBinaryCaching.java
deleted file mode 100644
index c2036ecd1938e0ea3ab2dc0463bdeae71ea558d7..0000000000000000000000000000000000000000
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/ProfilingDemoNoBinaryCaching.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.syncleus.aparapi.sample.configuration;
-
-import com.syncleus.aparapi.internal.kernel.*;
-
-/**
- * Created by Barney on 13/09/2015.
- */
-public class ProfilingDemoNoBinaryCaching {
-
-   public static void main(String[] ignored) {
-      KernelRunner.BINARY_CACHING_DISABLED = true;
-      ProfilingDemo.main(null);
-   }
-}
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index b15c81502fdf33e82b94d7b601836a41a6daa908..513331cd140b5459bdf7767cfd6b63ec39ba641a 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -34,6 +34,13 @@ public class All {
         System.out.println("  17) Extension - Histogram Ideal");
         System.out.println("  18) Extension - Mandel");
         System.out.println("  19) Extension - Square");
+        System.out.println("  20) Configuration - Auto cleanup arrays");
+        System.out.println("  21) Configuration - Cleanup arrays");
+        System.out.println("  22) Configuration - Configuration");
+        System.out.println("  23) Configuration - Custom Configuration");
+        System.out.println("  24) Configuration - Legacy Configuration");
+        System.out.println("  25) Configuration - Profiling");
+        System.out.println("  26) Configuration - Profiling (no binary)");
         System.out.println();
 
         Scanner in = new Scanner(System.in);
@@ -121,6 +128,27 @@ public class All {
             case "19":
                 com.syncleus.aparapi.examples.extension.SquareExample.main(args);
                 break;
+            case "20":
+                com.syncleus.aparapi.examples.configuration.AutoCleanUpArraysDemo.main(args);
+                break;
+            case "21":
+                com.syncleus.aparapi.examples.configuration.CleanUpArraysDemo.main(args);
+                break;
+            case "22":
+                com.syncleus.aparapi.examples.configuration.ConfigurationDemo.main(args);
+                break;
+            case "23":
+                com.syncleus.aparapi.examples.configuration.CustomConfigurationDemo.main(args);
+                break;
+            case "24":
+                com.syncleus.aparapi.examples.configuration.LegacyConfigurationDemo.main(args);
+                break;
+            case "25":
+                com.syncleus.aparapi.examples.configuration.ProfilingDemo.main(args);
+                break;
+            case "26":
+                com.syncleus.aparapi.examples.configuration.ProfilingDemoNoBinaryCaching.main(args);
+                break;
             default:
                 System.out.println("Invalid selection.");
         }
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/AutoCleanUpArraysDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
similarity index 58%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/AutoCleanUpArraysDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
index a32df5c60a2080e136c3080c725a94c1eb86c4e4..00178408262324df8fb4481d19a9c761569fde7f 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/AutoCleanUpArraysDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
@@ -1,6 +1,16 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
-import com.syncleus.aparapi.sample.mandel.*;
+import com.syncleus.aparapi.examples.mandel.*;
 
 public class AutoCleanUpArraysDemo {
    public static void main(String[] ignored) {
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/CleanUpArraysDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java
similarity index 69%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/CleanUpArraysDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java
index c4fe039a9eceaa788c841dbdef0a6d2779d1c6ed..8e39e4dc6dde8fe0fd777356a83bd71c9e2887d3 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/CleanUpArraysDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java
@@ -1,6 +1,16 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
-import com.syncleus.aparapi.sample.mandel.*;
+import com.syncleus.aparapi.examples.mandel.*;
 
 public class CleanUpArraysDemo {
    public static void main(String[] ignored) {
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/ConfigurationDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java
similarity index 85%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/ConfigurationDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java
index 87f362d9afca8d89d45d8f6b6f5aaafdd733bff8..0aef950c1d338cdd9339c5a44a9dc2d9ea2cde22 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/ConfigurationDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
 import com.syncleus.aparapi.*;
 import com.syncleus.aparapi.internal.kernel.*;
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/CustomConfigurationDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java
similarity index 76%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/CustomConfigurationDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java
index 795298641ac59fcb3c7d875ccdfb0e05bff9d6f5..ad22f1fa0b2adea2db2fcd242e1e5de488eff13a 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/CustomConfigurationDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
 import com.syncleus.aparapi.device.*;
 import com.syncleus.aparapi.internal.kernel.*;
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/KernelOkayInOpenCL.java b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java
similarity index 52%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/KernelOkayInOpenCL.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java
index 5e11d3b63409e83ca9ff7b08e5c92cb4106bba48..c4f8b2b2e8780331dfbb32817e7f9cd4f48a806f 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/KernelOkayInOpenCL.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
 /**
  * Created by Barney on 24/08/2015.
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/KernelWithAlternateFallbackAlgorithm.java b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
similarity index 61%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/KernelWithAlternateFallbackAlgorithm.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
index 53dfac7d28422e6a084df928d6d215285826c744..e91947ff8f800bee674b72f7ddf9bd3818885ce6 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/KernelWithAlternateFallbackAlgorithm.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
 import com.syncleus.aparapi.*;
 
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/KernelWithoutAlternateFallbackAlgorithm.java b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
similarity index 50%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/KernelWithoutAlternateFallbackAlgorithm.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
index 0a77c87a51403a912b01b388c235b0ecd82a20ae..13df43d507de3c4eb71cd1222ad0e15d86ef2351 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/KernelWithoutAlternateFallbackAlgorithm.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
 import com.syncleus.aparapi.*;
 
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/LegacyConfigurationDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java
similarity index 69%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/LegacyConfigurationDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java
index 547a91549abea22a7a677639a0020b8b77b78ea1..e68967dd5c3f0eafbdfcc500f11e86c0a8e29749 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/LegacyConfigurationDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
 import com.syncleus.aparapi.*;
 import com.syncleus.aparapi.internal.kernel.*;
diff --git a/samples/configuration/src/com/amd/aparapi/sample/configuration/ProfilingDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java
similarity index 83%
rename from samples/configuration/src/com/amd/aparapi/sample/configuration/ProfilingDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java
index c0927f6963dde2dd27a2583faee8529d11798974..dcec233a65656152c73205ad14de84a83c50b664 100644
--- a/samples/configuration/src/com/amd/aparapi/sample/configuration/ProfilingDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java
@@ -1,9 +1,19 @@
-package com.syncleus.aparapi.sample.configuration;
+/**
+ * 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.configuration;
 
 import com.syncleus.aparapi.*;
 import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.sample.blackscholes.Main.*;
-import com.syncleus.aparapi.sample.mandel.*;
+import com.syncleus.aparapi.examples.blackscholes.Main.*;
+import com.syncleus.aparapi.examples.mandel.*;
 
 /**
  * Demonstrate new enhanced profiling capability, profiling the kernel from the blackscholes sample.
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ff4c23ec736e5e2cc712bd21e30e90434547c3d
--- /dev/null
+++ b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java
@@ -0,0 +1,24 @@
+/**
+ * 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.configuration;
+
+import com.syncleus.aparapi.internal.kernel.*;
+
+/**
+ * Created by Barney on 13/09/2015.
+ */
+public class ProfilingDemoNoBinaryCaching {
+
+   public static void main(String[] ignored) {
+      KernelRunner.BINARY_CACHING_DISABLED = true;
+      ProfilingDemo.main(null);
+   }
+}