diff --git a/README.md b/README.md
index 632d9c364544b55dde3546b292b3257a62d6f7eb..f8a09db984eb52b698cef0753ac8738f253f8f25 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,27 @@ We plan to implement Binary downloads at [GitHub Releases](https://help.github.c
Watch this space!
+Getting Started
+=======
+
+If you are an official Contributor than Clone the repository and work on it as needed.
+
+If you are an interested developer and just want to experiment with Aparapi then Fork the repository and submit Pull requests.
+
+Users:
+
+Download known working binary releases from [Aparapi Releases](https://github.com/aparapi/aparapi/releases).
+
+Developers:
+
+Every single project in Aparapi, including the root of the entire repository are Eclipse projects, althought execution entirely from the command-line is also supported.
+
+Steps:
+
+- Clone/Fork the repository to your local machine
+- Import 'aparapi' to your Eclipse workspace making sure to import 'nested projects'
+- Open the appropriate Ant build.xml files in your Eclipse Ant view
+
Thank you,
diff --git a/samples/blackscholes/.classpath b/samples/blackscholes/.classpath
index d0b04da999673df65240caa28a17d7f842855cd4..253bb2788028a84693dc5510159153b8a57307c8 100644
--- a/samples/blackscholes/.classpath
+++ b/samples/blackscholes/.classpath
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi">
- <attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi">
+ <attributes>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
diff --git a/samples/blackscholes/.gitignore b/samples/blackscholes/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..840e7d3120ee3206168d49bf62df2c269c38e17e
--- /dev/null
+++ b/samples/blackscholes/.gitignore
@@ -0,0 +1 @@
+/classes/
diff --git a/samples/blackscholes/blackscholes.bat b/samples/blackscholes/blackscholes.bat
index 8890c0e6afd8ffbac16135cd2fdff6b173457b24..1625a241ecc21de8deb316f5660390ba90d0b334 100644
--- a/samples/blackscholes/blackscholes.bat
+++ b/samples/blackscholes/blackscholes.bat
@@ -6,4 +6,4 @@ java ^
-Dsize=%2 ^
-Diterations=%3 ^
-classpath blackscholes.jar;..\..\com.amd.aparapi\dist\aparapi.jar ^
- com.amd.aparapi.samples.blackscholes.Main
+ com.amd.aparapi.sample.blackscholes.Main
diff --git a/samples/blackscholes/blackscholes.sh b/samples/blackscholes/blackscholes.sh
index abf0f0a612750c389c4a080e45ab66f148e47a28..a60abf2ba0cbb4f0f8b3eba162e19219ff24e8b6 100644
--- a/samples/blackscholes/blackscholes.sh
+++ b/samples/blackscholes/blackscholes.sh
@@ -4,4 +4,4 @@ java \
-Dsize=$2 \
-Diterations=$3 \
-classpath blackscholes.jar:..\..\com.amd.aparapi\dist\aparapi.jar \
- com.amd.aparapi.samples.blackscholes.Main
+ com.amd.aparapi.sample.blackscholes.Main
diff --git a/samples/blackscholes/build.xml b/samples/blackscholes/build.xml
index 14ac01d6454ba7f0633ffde26a71a049e001c67c..bc102d61a04ebfe7a72afb66ef96a97991a7324d 100644
--- a/samples/blackscholes/build.xml
+++ b/samples/blackscholes/build.xml
@@ -2,19 +2,52 @@
<project name="blackscholes" default="build" basedir=".">
- <target name="build" depends="clean">
- <mkdir dir="classes"/>
- <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
- <classpath>
- <pathelement path="../../com.amd.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>
+ <!-- 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.amd.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.amd.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.amd.aparapi.sample.blackscholes.Main" fork="true">
+ <classpath refid="runtime.class.path" />
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist" />
+ <sysproperty key="com.amd.aparapi.executionMode" value="JTP" />
+ </java>
+ </target>
+
+ <target name="run-gpu">
+ <java classname="com.amd.aparapi.sample.blackscholes.Main" fork="true">
+ <classpath refid="runtime.class.path" />
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist" />
+ <sysproperty key="com.amd.aparapi.executionMode" value="GPU" />
+ </java>
+ </target>
+
+ <target name="run" depends="run-gpu" />
</project>
diff --git a/samples/blackscholes/src/com/amd/aparapi/samples/blackscholes/Main.java b/samples/blackscholes/src/com/amd/aparapi/sample/blackscholes/Main.java
similarity index 96%
rename from samples/blackscholes/src/com/amd/aparapi/samples/blackscholes/Main.java
rename to samples/blackscholes/src/com/amd/aparapi/sample/blackscholes/Main.java
index 60c311427db70f5b00f929684b98ef0266ca62ca..bdc1486254513bbc07b61b1cb84e3313debca650 100644
--- a/samples/blackscholes/src/com/amd/aparapi/samples/blackscholes/Main.java
+++ b/samples/blackscholes/src/com/amd/aparapi/sample/blackscholes/Main.java
@@ -35,7 +35,7 @@ of EAR). For the most current Country Group listings, or for additional informa
under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/.
*/
-package com.amd.aparapi.samples.blackscholes;
+package com.amd.aparapi.sample.blackscholes;
import com.amd.aparapi.Kernel;
import com.amd.aparapi.Range;