diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index 04cb7b2d6ac9f601ffd4654971f8edc824468b47..31f2af8bf13d8289d588ffa5e4ec7c4e0eb80e79 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -23,6 +23,8 @@ public class All {
         System.out.println("  6) Convolution (pure Java)");
         System.out.println("  7) Blacksholes");
         System.out.println("  8) Squares");
+        System.out.println("  9) Multipass swing worker");
+        System.out.println("  10) Progress and cancel demo");
         System.out.println();
 
         Scanner in = new Scanner(System.in);
@@ -77,6 +79,12 @@ public class All {
             case "8":
                 com.syncleus.aparapi.examples.squares.Main.main(args);
                 break;
+            case "9":
+                com.syncleus.aparapi.examples.progress.MultiPassKernelSwingWorkerDemo.main(args);
+                break;
+            case "10":
+                com.syncleus.aparapi.examples.progress.ProgressAndCancelDemo.main(args);
+                break;
             default:
                 System.out.println("Invalid selection.");
         }
diff --git a/samples/progress/src/com/amd/aparapi/sample/progress/LongRunningKernel.java b/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
similarity index 64%
rename from samples/progress/src/com/amd/aparapi/sample/progress/LongRunningKernel.java
rename to src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
index 856f5b75ab633ce0fd2a1645b573c1c34e5e5881..e3799f01c17c6c2309fc74b754d2186a93ff97aa 100644
--- a/samples/progress/src/com/amd/aparapi/sample/progress/LongRunningKernel.java
+++ b/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.progress;
+/**
+ * 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.progress;
 
 import com.syncleus.aparapi.Kernel;
 
diff --git a/samples/progress/src/com/amd/aparapi/sample/progress/MultiPassKernelSwingWorkerDemo.java b/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
similarity index 89%
rename from samples/progress/src/com/amd/aparapi/sample/progress/MultiPassKernelSwingWorkerDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
index 728e43b76932868b58a09cb09cc24e6b4371ca16..0cf5ef16fca25074801b8edfc507ef7ee626ca26 100644
--- a/samples/progress/src/com/amd/aparapi/sample/progress/MultiPassKernelSwingWorkerDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.progress;
+/**
+ * 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.progress;
 
 import com.syncleus.aparapi.*;
 import com.syncleus.aparapi.internal.kernel.*;
diff --git a/samples/progress/src/com/amd/aparapi/sample/progress/ProgressAndCancelDemo.java b/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
similarity index 90%
rename from samples/progress/src/com/amd/aparapi/sample/progress/ProgressAndCancelDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
index 8684c00b9ed8d07893250c5a8119103a7e2b4643..c09c510e146cb6a2df975e3aa8d3547eed16edaf 100644
--- a/samples/progress/src/com/amd/aparapi/sample/progress/ProgressAndCancelDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.progress;
+/**
+ * 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.progress;
 
 import com.syncleus.aparapi.internal.kernel.*;