diff --git a/examples/effects/build.xml b/examples/effects/build.xml
index 9366c791d6885dbf534325a36692cb2a264e9816..7874c120ccc12021d7cc1b888ce698c7651cb452 100644
--- a/examples/effects/build.xml
+++ b/examples/effects/build.xml
@@ -3,7 +3,7 @@
<project name="effects" default="build" basedir=".">
<path id="compiler.class.path">
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</path>
<path id="runtime.class.path" cache="true">
@@ -27,7 +27,7 @@
<target name="run-gpu" >
<java classname="com.amd.aparapi.examples.effects.Main" fork="true">
<classpath refid="runtime.class.path"/>
- <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/>
<sysproperty key="com.amd.aparapi.executionMode" value="GPU"/>
</java>
</target>
@@ -35,7 +35,7 @@
<target name="run-jtp" >
<java classname="com.amd.aparapi.examples.effects.Main" fork="true">
<classpath refid="runtime.class.path"/>
- <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/>
<sysproperty key="com.amd.aparapi.executionMode" value="JTP"/>
</java>
</target>
diff --git a/examples/nbody/build.xml b/examples/nbody/build.xml
index eaa5927ec4a4974f0fc489e5db89b8a42e6d2142..3b4fee4578d21e1df133ac47a8546776db32be28 100644
--- a/examples/nbody/build.xml
+++ b/examples/nbody/build.xml
@@ -4,7 +4,7 @@
<property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_28-joal_17-jogl_41-jocl_25/jar/"/>
<path id="compiler.class.path">
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
<pathelement path="jogamp/jogl.all.jar"/>
<pathelement path="jogamp/gluegen-rt.jar"/>
</path>
@@ -150,7 +150,7 @@
<target name="run-jtp">
<java classname="com.amd.aparapi.examples.nbody.Main" fork="true">
<classpath refid="runtime.class.path"/>
- <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni;jogamp"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist;jogamp"/>
<sysproperty key="com.amd.aparapi.executionMode" value="JTP"/>
<sysproperty key="bodies" value="16384"/>
<sysproperty key="height" value="800"/>
@@ -161,7 +161,7 @@
<target name="run-gpu">
<java classname="com.amd.aparapi.examples.nbody.Main" fork="true">
<classpath refid="runtime.class.path"/>
- <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni;jogamp"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist;jogamp"/>
<sysproperty key="com.amd.aparapi.executionMode" value="GPU"/>
<sysproperty key="bodies" value="16384"/>
<sysproperty key="height" value="800"/>
diff --git a/examples/nbody/local.bat b/examples/nbody/local.bat
index 9fe4eb04eb0d4e890106ca8ad0a8da5bfc3d2473..5b0611b4b6394ba8bb3d23cb2a74324dc4477826 100644
--- a/examples/nbody/local.bat
+++ b/examples/nbody/local.bat
@@ -1,14 +1,14 @@
@echo off
java ^
- -Djava.library.path=..\..\com.amd.aparapi.jni;jogamp ^
+ -Djava.library.path=..\..\com.amd.aparapi.jni\dist;jogamp ^
-Dcom.amd.aparapi.executionMode=%1 ^
-Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
-Dcom.amd.aparapi.enableVerboseJNI=false ^
-Dbodies=%2 ^
-Dheight=600 ^
-Dwidth=600 ^
- -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\aparapi.jar;nbody.jar ^
+ -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;nbody.jar ^
com.amd.aparapi.examples.nbody.Local
diff --git a/examples/nbody/nbody.bat b/examples/nbody/nbody.bat
index e5bd4180e50955fe44eb731a2543a1318824e87f..d125428faf71ce701b89debd24edecfe2d3058a3 100644
--- a/examples/nbody/nbody.bat
+++ b/examples/nbody/nbody.bat
@@ -1,12 +1,12 @@
@echo off
java ^
- -Djava.library.path=..\..\com.amd.aparapi.jni;jogamp ^
+ -Djava.library.path=..\..\com.amd.aparapi.jni\dist;jogamp ^
-Dcom.amd.aparapi.executionMode=%1 ^
-Dbodies=%2 ^
-Dheight=600 ^
-Dwidth=600 ^
- -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\aparapi.jar;nbody.jar ^
+ -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;nbody.jar ^
com.amd.aparapi.examples.nbody.Main
diff --git a/examples/nbody/nbody.sh b/examples/nbody/nbody.sh
index 63af264e64e0893093a8202358c5fb641e629e2d..5e3ada39a153513c50ff2e1f48a324094a08847e 100644
--- a/examples/nbody/nbody.sh
+++ b/examples/nbody/nbody.sh
@@ -1,10 +1,10 @@
java \
- -Djava.library.path=../../com.amd.aparapi.jni:jogamp \
+ -Djava.library.path=../../com.amd.aparapi.jni/dist:jogamp \
-Dcom.amd.aparapi.executionMode=$1 \
-Dbodies=$1 \
-Dheight=600 \
-Dwidth=600 \
- -classpath jogamp/jogl.all.jar:jogamp/gluegen-rt.jar:../../com.amd.aparapi/aparapi.jar:nbody.jar \
+ -classpath jogamp/jogl.all.jar:jogamp/gluegen-rt.jar:../../com.amd.aparapi/dist/aparapi.jar:nbody.jar \
com.amd.aparapi.examples.nbody.Main
diff --git a/samples/blackscholes/blackscholes.sh b/samples/blackscholes/blackscholes.sh
index f45b682aab659bca8e52ed3464421f3bdee02b49..abf0f0a612750c389c4a080e45ab66f148e47a28 100644
--- a/samples/blackscholes/blackscholes.sh
+++ b/samples/blackscholes/blackscholes.sh
@@ -1,7 +1,7 @@
java \
- -Djava.library.path=..\..\com.amd.aparapi.jni \
+ -Djava.library.path=..\..\com.amd.aparapi.jni\dist \
-Dcom.amd.aparapi.executionMode=$1 \
-Dsize=$2 \
-Diterations=$3 \
- -classpath blackscholes.jar:..\..\com.amd.aparapi\aparapi.jar \
+ -classpath blackscholes.jar:..\..\com.amd.aparapi\dist\aparapi.jar \
com.amd.aparapi.samples.blackscholes.Main
diff --git a/samples/blackscholes/build.xml b/samples/blackscholes/build.xml
index 4b36816836aeee31155498a5562cac169e226bd4..14ac01d6454ba7f0633ffde26a71a049e001c67c 100644
--- a/samples/blackscholes/build.xml
+++ b/samples/blackscholes/build.xml
@@ -6,7 +6,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/convolution/build.xml b/samples/convolution/build.xml
index 90979e334ff82caa213a1027e54266a24bb65aca..d5d2018b1c2085c83bd33fa6244241aa0cdde512 100644
--- a/samples/convolution/build.xml
+++ b/samples/convolution/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/convolution/conv.bat b/samples/convolution/conv.bat
index ac0c4aab2b405198e1f7516ee3ed5d9adb71e131..f6a9b3b067f3fddfafde221edaf5308b35930f70 100644
--- a/samples/convolution/conv.bat
+++ b/samples/convolution/conv.bat
@@ -1,6 +1,6 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;convolution.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;convolution.jar ^
com.amd.aparapi.sample.convolution.Main
diff --git a/samples/life/build.xml b/samples/life/build.xml
index 3f18acb6ddec58bf60d6c27ff89f2c45b1165d94..a64631dfc995bfa5df9265c3ca3f85907e73c443 100644
--- a/samples/life/build.xml
+++ b/samples/life/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/life/life.bat b/samples/life/life.bat
index 4a35d22f8bc14eb34dce93e6e9421b9ac0aa347c..09c28c5b92c79c1aa6aefb6d5010a0d12da549c8 100644
--- a/samples/life/life.bat
+++ b/samples/life/life.bat
@@ -1,7 +1,7 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;life.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;life.jar ^
com.amd.aparapi.sample.life.Main
diff --git a/samples/life/life.sh b/samples/life/life.sh
index b8c0038b14ecbc862a6351edba8fe23aec32a2c8..9cf1daf198d1f38c0b537f3564590bc3e2bf52c3 100644
--- a/samples/life/life.sh
+++ b/samples/life/life.sh
@@ -1,5 +1,5 @@
java\
- -Djava.library.path=../../com.amd.aparapi.jni\
+ -Djava.library.path=../../com.amd.aparapi.jni/dist\
-Dcom.amd.aparapi.executionMode=$1\
- -classpath ../../com.amd.aparapi/aparapi.jar:life.jar\
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:life.jar\
com.amd.aparapi.sample.life.Main
diff --git a/samples/mandel/build.xml b/samples/mandel/build.xml
index 32878ce6a9cfdd6d8b3370644c5c2239b64bd663..046dfb00297727c8bb9c3aec017f365d7876d07f 100644
--- a/samples/mandel/build.xml
+++ b/samples/mandel/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/mandel/mandel.bat b/samples/mandel/mandel.bat
index 294092c6168e29d6e1a0c2ac6a71aa176a12cc24..daadd4883f5813e56f67fe25a6076ebec3377b54 100644
--- a/samples/mandel/mandel.bat
+++ b/samples/mandel/mandel.bat
@@ -1,7 +1,7 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;mandel.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;mandel.jar ^
com.amd.aparapi.sample.mandel.Main
diff --git a/samples/mandel/mandel.sh b/samples/mandel/mandel.sh
index 8b9bd527028f3545605321eb8b1a6e80a8d8ef65..892969dfd16d2ff4d214c1614ed57946041e48c2 100644
--- a/samples/mandel/mandel.sh
+++ b/samples/mandel/mandel.sh
@@ -1,5 +1,5 @@
java\
- -Djava.library.path=../../com.amd.aparapi.jni\
+ -Djava.library.path=../../com.amd.aparapi.jni/dist\
-Dcom.amd.aparapi.executionMode=$1\
- -classpath ../../com.amd.aparapi/aparapi.jar:mandel.jar\
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:mandel.jar\
com.amd.aparapi.sample.mandel.Main
diff --git a/samples/mandel/mandel2D.bat b/samples/mandel/mandel2D.bat
index 93e67e077cccab1762bd22405ad426df138b58b1..a3825670d08eaf2a43bd36c6c3b65dad818061e9 100644
--- a/samples/mandel/mandel2D.bat
+++ b/samples/mandel/mandel2D.bat
@@ -1,7 +1,7 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;mandel.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;mandel.jar ^
com.amd.aparapi.sample.mandel.Main2D
diff --git a/samples/mandel/mandel2D.sh b/samples/mandel/mandel2D.sh
index 99a1c45c882d6c93f4fbf23ecde2c5698d1cadac..238ab197e79ea4581fc495013d30d0c1c9c9620f 100644
--- a/samples/mandel/mandel2D.sh
+++ b/samples/mandel/mandel2D.sh
@@ -1,5 +1,5 @@
java\
- -Djava.library.path=../../com.amd.aparapi.jni\
+ -Djava.library.path=../../com.amd.aparapi.jni/dist\
-Dcom.amd.aparapi.executionMode=$1\
- -classpath ../../com.amd.aparapi/aparapi.jar:mandel.jar\
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:mandel.jar\
com.amd.aparapi.sample.mandel.Main2D
diff --git a/samples/squares/build.xml b/samples/squares/build.xml
index 291ebc9d39c03e631d7f97956e2975c66809efcc..df44d67ba732c6e5c32b0b248a5988b08a97e20a 100644
--- a/samples/squares/build.xml
+++ b/samples/squares/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/squares/squares.bat b/samples/squares/squares.bat
index b18ef57f297dc433eb00f53aa2d050f8d6200034..9e45a96d2a0dc253a88f4a79a9d0ea1a91f93317 100644
--- a/samples/squares/squares.bat
+++ b/samples/squares/squares.bat
@@ -1,6 +1,6 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;squares.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;squares.jar ^
com.amd.aparapi.sample.squares.Main
diff --git a/samples/squares/squares.sh b/samples/squares/squares.sh
index 9e086eb7213cb4d5bfa2b62cc8047b434046adf4..3fe88051b4ec2091322246c7380dc752575f0b76 100644
--- a/samples/squares/squares.sh
+++ b/samples/squares/squares.sh
@@ -1,5 +1,5 @@
java \
- -Djava.library.path=../../com.amd.aparapi.jni \
+ -Djava.library.path=../../com.amd.aparapi.jni/dist \
-Dcom.amd.aparapi.executionMode=%1 \
- -classpath ../../com.amd.aparapi/aparapi.jar:squares.jar \
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:squares.jar \
com.amd.aparapi.sample.squares.Main