diff --git a/com.amd.aparapi/pom.xml b/com.amd.aparapi/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..76ee41596ac76f4e657c804d3bc7762399b168f1
--- /dev/null
+++ b/com.amd.aparapi/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.amd</groupId>
+    <artifactId>Aparapi</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+    <distributionManagement>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>Caxia-snapshots</name>
+            <url>http://caxia.certeza/artifactory/libs-snapshot-local</url>
+        </snapshotRepository>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/Config.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/Config.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/Config.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/Config.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/Kernel.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/Kernel.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/Kernel.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/Kernel.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/ProfileInfo.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/ProfileInfo.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/ProfileInfo.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/ProfileInfo.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/Range.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/Range.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/Range.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/Range.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/annotation/Experimental.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/annotation/Experimental.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/annotation/Experimental.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/annotation/Experimental.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/annotation/package-info.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/annotation/package-info.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/annotation/package-info.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/annotation/package-info.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/device/Device.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/device/Device.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/device/Device.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/device/Device.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/device/JavaDevice.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/device/JavaDevice.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/device/JavaDevice.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/device/JavaDevice.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/device/OpenCLDevice.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/device/OpenCLDevice.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/device/OpenCLDevice.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/device/OpenCLDevice.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/device/package-info.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/device/package-info.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/device/package-info.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/device/package-info.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/exception/DeprecatedException.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/exception/DeprecatedException.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/exception/DeprecatedException.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/exception/DeprecatedException.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/exception/package-info.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/exception/package-info.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/exception/package-info.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/exception/package-info.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/DocMe.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/DocMe.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/DocMe.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/DocMe.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/RemoveMe.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/RemoveMe.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/RemoveMe.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/RemoveMe.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/Unused.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/Unused.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/Unused.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/Unused.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/UsedByJNICode.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/UsedByJNICode.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/annotation/UsedByJNICode.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/annotation/UsedByJNICode.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/AparapiException.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/AparapiException.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/AparapiException.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/AparapiException.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/ClassParseException.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/ClassParseException.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/ClassParseException.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/ClassParseException.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/CodeGenException.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/CodeGenException.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/CodeGenException.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/CodeGenException.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/RangeException.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/RangeException.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/exception/RangeException.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/exception/RangeException.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/BranchSet.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/BranchSet.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/BranchSet.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/BranchSet.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/ExpressionList.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/ExpressionList.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/ExpressionList.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/ExpressionList.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/Instruction.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/Instruction.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/Instruction.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/Instruction.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/InstructionPattern.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/InstructionPattern.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/InstructionPattern.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/InstructionPattern.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/InstructionSet.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/InstructionSet.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/InstructionSet.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/InstructionSet.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/InstructionTransformer.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/InstructionTransformer.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/instruction/InstructionTransformer.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/instruction/InstructionTransformer.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/ConfigJNI.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/ConfigJNI.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/ConfigJNI.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/ConfigJNI.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/KernelArgJNI.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/KernelArgJNI.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/KernelArgJNI.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/KernelArgJNI.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/KernelRunnerJNI.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/KernelRunnerJNI.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/KernelRunnerJNI.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/KernelRunnerJNI.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/OpenCLJNI.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/OpenCLJNI.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/OpenCLJNI.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/OpenCLJNI.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/RangeJNI.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/RangeJNI.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/RangeJNI.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/jni/RangeJNI.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelArg.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelArg.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelArg.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelArg.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelDeviceProfile.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelDeviceProfile.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelDeviceProfile.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelDeviceProfile.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManager.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelManager.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManager.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelManager.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManagers.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelManagers.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManagers.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelManagers.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelPreferences.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelPreferences.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelPreferences.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelPreferences.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelProfile.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelProfile.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelProfile.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelProfile.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelRunner.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelRunner.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/ProfilingEvent.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/ProfilingEvent.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/ProfilingEvent.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/ProfilingEvent.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/CacheEnabler.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/CacheEnabler.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/CacheEnabler.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/CacheEnabler.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/ClassModel.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/ClassModel.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/ClassModel.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/ClassModel.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/Entrypoint.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/Entrypoint.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/Entrypoint.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/Entrypoint.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/EntrypointKey.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/EntrypointKey.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/EntrypointKey.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/EntrypointKey.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/Memoizer.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/Memoizer.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/Memoizer.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/Memoizer.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/MethodKey.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/MethodKey.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/MethodKey.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/MethodKey.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/MethodModel.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/MethodModel.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/MethodModel.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/MethodModel.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/Supplier.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/Supplier.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/Supplier.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/Supplier.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/model/ValueCache.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/ValueCache.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/model/ValueCache.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/model/ValueCache.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLArgDescriptor.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLArgDescriptor.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLArgDescriptor.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLArgDescriptor.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLKernel.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLKernel.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLKernel.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLKernel.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLLoader.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLLoader.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLLoader.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLLoader.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLMem.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLMem.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLMem.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLMem.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLProgram.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLProgram.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLProgram.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/opencl/OpenCLProgram.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/reader/ByteBuffer.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/reader/ByteBuffer.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/reader/ByteBuffer.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/reader/ByteBuffer.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/reader/ByteReader.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/reader/ByteReader.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/reader/ByteReader.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/reader/ByteReader.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/tool/InstructionHelper.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/tool/InstructionHelper.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/tool/InstructionHelper.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/tool/InstructionHelper.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/tool/InstructionViewer.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/tool/InstructionViewer.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/tool/InstructionViewer.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/tool/InstructionViewer.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/tool/package-info.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/tool/package-info.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/tool/package-info.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/tool/package-info.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/util/OpenCLUtil.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/util/OpenCLUtil.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/util/OpenCLUtil.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/util/OpenCLUtil.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/util/Reflection.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/util/Reflection.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/util/Reflection.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/util/Reflection.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/util/UnsafeWrapper.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/util/UnsafeWrapper.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/util/UnsafeWrapper.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/util/UnsafeWrapper.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/writer/BlockWriter.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/writer/BlockWriter.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/writer/BlockWriter.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/writer/BlockWriter.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/writer/KernelWriter.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/internal/writer/KernelWriter.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/internal/writer/KernelWriter.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/writer/KernelWriter.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/opencl/OpenCL.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/opencl/OpenCL.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/opencl/OpenCL.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/opencl/OpenCL.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/opencl/OpenCLAdapter.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/opencl/OpenCLAdapter.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/opencl/OpenCLAdapter.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/opencl/OpenCLAdapter.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/opencl/package-info.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/opencl/package-info.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/opencl/package-info.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/opencl/package-info.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/package-info.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/package-info.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/package-info.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/package-info.java
diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/util/swing/MultiPassKernelSwingWorker.java b/com.amd.aparapi/src/main/java/com/amd/aparapi/util/swing/MultiPassKernelSwingWorker.java
similarity index 100%
rename from com.amd.aparapi/src/java/com/amd/aparapi/util/swing/MultiPassKernelSwingWorker.java
rename to com.amd.aparapi/src/main/java/com/amd/aparapi/util/swing/MultiPassKernelSwingWorker.java
diff --git a/com.amd.aparapi/src/test/ConvolutionLargeTest.java b/com.amd.aparapi/src/test/java/ConvolutionLargeTest.java
similarity index 100%
rename from com.amd.aparapi/src/test/ConvolutionLargeTest.java
rename to com.amd.aparapi/src/test/java/ConvolutionLargeTest.java