diff --git a/plugins/OSX/build.xml b/plugins/OSX/build.xml
index 659f766..264eebf 100644
--- a/plugins/OSX/build.xml
+++ b/plugins/OSX/build.xml
@@ -1,80 +1,82 @@
 <?xml version="1.0" ?>
-<project basedir="." default="all" name="OSX Plugin">
-    <description>OSX JInput Plugin</description>
-    <property name="src" location="src" />
-    <property name="build" location="classes"/>
-    <property name="bin" location="bin" />
-    <property name="plugins" location="plugins" />
-    
-    <target name="init">
-		<mkdir dir="${build}"/>
-		<mkdir dir="${bin}"/>
-		<condition property="macosx">
-			<and>
-				<os family="mac" />
-				<os family="unix" />
-			</and>
-		</condition>
-    </target>
+<project name="OS X Plugin, Native code" basedir="." default="compileNativeJinputLib">
+	<description>OSX JInput Native Plugin</description>
 
-    <target depends="init" name="compile">
-        <javac debug="true" deprecation="true" destdir="${build}" source="1.4" srcdir="src/java">
-            <classpath>
-                <pathelement location="../../coreAPI/bin/jinput-core.jar"/>
-                <pathelement location="../../lib/jutils.jar"/>
-            </classpath>
-        </javac>
-    </target>
-
-	<target depends="init,compile" name="jar">
-        <jar jarfile="${bin}/HIDWrapper.jar" compress="true" basedir="${build}">
-            <include name="**/*.class"/>
-        </jar> 
-    </target>
-
-    <target depends="compileNativeJinputLib,jar" description="Build everything." name="all">
-    </target>
-
-    <target name="javadoc" depends="init" description="Javadoc for OS X plugin for JInput.">
-        <mkdir dir="apidocs"/>
-        <javadoc packagenames="net.java.games.input.*" 
-                 destdir="apidocs"
-                 additionalparam="-source 1.4"
-                 link="../../../coreAPI/apidocs">
-            <sourcepath>
-                <pathelement location="src/java"/>
-            </sourcepath>
-             <classpath>
-                <pathelement location="../../coreAPI/bin/jinput-core.jar"/>
-                <pathelement location="../../lib/jutils.jar"/>
-            </classpath>
-        </javadoc>
-    </target>
-
-    <target description="Clean all build products." name="clean">
-		<delete dir="classes" failonerror="no"/>
-		<delete dir="bin" failonerror="no"/>
-		<delete dir="apidocs" failonerror="no"/>
-		<ant inheritAll="false" antfile="src/native/build.xml" target="clean"/>
-    </target>
-
-    <target depends="init,compile" name="createJNIHeaders">
-        <javah destdir="src/native">
-            <classpath>
-                <pathelement path="${build}"/>
-                <pathelement location="../../coreAPI/classes"/>
-            </classpath>
-			<class name="net.java.games.input.OSXHIDDeviceIterator"/>
-			<class name="net.java.games.input.OSXHIDDevice"/>
-			<class name="net.java.games.input.OSXHIDQueue"/>
-        </javah>
-    </target>
+	<target name="init">
+		<mkdir dir="target/natives"/>
+	</target>
 
+	<target name="compile">
+		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
+			<arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I../../../../common/src/native -I.."/>
+			<mapper type="glob" from="*.c" to="*.o"/>
+			<fileset dir="." includes="*.c"/>
+			<fileset dir="../../../common/src/native" includes="*.c"/>
+		</apply>
+	</target>
 	
-    <target name="compileNativeJinputLib" depends="init,createJNIHeaders" if="macosx">
-        <ant dir="src/native" target="compileNativeJinputLib"/>
-		<copy todir="${bin}">
-			<fileset dir="src/native" includes="*.jnilib"/>
-		</copy>
-    </target>
+	<target name="link">
+		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
+			<arg line="${linkerflags} -dynamiclib -o ${libname} -framework JavaVM -framework CoreFoundation -framework IOKit -framework CoreServices"/>
+			<fileset dir="${objdir}" includes="*.o"/>
+		</apply>
+		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
+			<arg line="-S -X"/>
+			<fileset dir="." includes="${libname}"/>
+		</apply>
+	</target>
+	
+	<target name="compileNativeJinputLib" depends="init">
+		<property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
+		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
+		<property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.5.sdk"/>
+		<property name="ppc_flags" value="-isysroot ${universal_sdkroot} -arch ppc -mmacosx-version-min=10.3"/>
+		<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386 -mmacosx-version-min=10.4"/>
+		<property name="x86_64_flags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
+		<antcall target="compile">
+			<param name="dstdir" location="target/natives/ppc"/>
+			<param name="compiler" value="gcc-4.0"/>
+			<param name="sdkroot" location="${universal_sdkroot}"/>
+			<param name="cflags" value="${ppc_flags}"/>
+		</antcall>
+		<antcall target="link">
+			<param name="objdir" location="target/natives/ppc"/>
+			<param name="libname" value="libjinput-osx-ppc.jnilib"/>
+			<param name="linker" value="gcc-4.0"/>
+			<param name="linkerflags" value="${ppc_flags}"/>
+		</antcall>
+		<antcall target="compile">
+			<param name="dstdir" location="target/natives/i386"/>
+			<param name="compiler" value="gcc-4.0"/>
+			<param name="sdkroot" location="${universal_sdkroot}"/>
+			<param name="cflags" value="${universal_flags}"/>
+		</antcall>
+		<antcall target="link">
+			<param name="objdir" location="target/natives/i386"/>
+			<param name="libname" value="libjinput-osx-i386.jnilib"/>
+			<param name="linker" value="gcc-4.0"/>
+			<param name="linkerflags" value="${universal_flags}"/>
+		</antcall>
+		<antcall target="compile">
+			<param name="dstdir" location="target/natives/x86_64"/>
+			<param name="compiler" value="gcc-4.0"/>
+			<param name="sdkroot" location="${x86_64_sdkroot}"/>
+			<param name="cflags" value="${x86_64_flags}"/>
+		</antcall>
+		<antcall target="link">
+			<param name="objdir" location="target/natives/x86_64"/>
+			<param name="libname" value="libjinput-osx-x86_64.jnilib"/>
+			<param name="linker" value="gcc-4.0"/>
+			<param name="linkerflags" value="${x86_64_flags}"/>
+		</antcall>
+		<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
+			<arg value="-create"/>
+			<srcfile/>
+			<arg value="-output"/>
+			<arg path="libjinput-osx.jnilib"/>
+			<fileset file="target/natives/ppc/libjinput-osx-ppc.jnilib"/>
+			<fileset file="target/natives/i386/libjinput-osx-i386.jnilib"/>
+			<fileset file="target/natives/x86_64/libjinput-osx-x86_64.jnilib"/>
+		</apply>
+	</target>
 </project>
diff --git a/plugins/OSX/pom.xml b/plugins/OSX/pom.xml
new file mode 100644
index 0000000..0d08c28
--- /dev/null
+++ b/plugins/OSX/pom.xml
@@ -0,0 +1,75 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>osx-plugin</artifactId>
+    <packaging>jar</packaging>
+    <name>JInput - OSX Plugin</name>
+
+    <parent>
+        <groupId>net.java.jinput</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.0.8-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.java.jinput</groupId>
+            <artifactId>coreapi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-h</arg>
+                        <arg>${project.build.directory}/generated-sources/natives</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target>
+                                <ant dir="." target="compileNativeJinputLib"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classesDirectory>${project.build.directory}/natives</classesDirectory>
+                            <classifier>natives-osx</classifier>
+                            <includes>
+                                <include>*.jnilib</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/plugins/OSX/src/java/net/java/games/input/ButtonUsage.java b/plugins/OSX/src/main/java/net/java/games/input/ButtonUsage.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/ButtonUsage.java
rename to plugins/OSX/src/main/java/net/java/games/input/ButtonUsage.java
diff --git a/plugins/OSX/src/java/net/java/games/input/ElementType.java b/plugins/OSX/src/main/java/net/java/games/input/ElementType.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/ElementType.java
rename to plugins/OSX/src/main/java/net/java/games/input/ElementType.java
diff --git a/plugins/OSX/src/java/net/java/games/input/GenericDesktopUsage.java b/plugins/OSX/src/main/java/net/java/games/input/GenericDesktopUsage.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/GenericDesktopUsage.java
rename to plugins/OSX/src/main/java/net/java/games/input/GenericDesktopUsage.java
diff --git a/plugins/OSX/src/java/net/java/games/input/KeyboardUsage.java b/plugins/OSX/src/main/java/net/java/games/input/KeyboardUsage.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/KeyboardUsage.java
rename to plugins/OSX/src/main/java/net/java/games/input/KeyboardUsage.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXAbstractController.java b/plugins/OSX/src/main/java/net/java/games/input/OSXAbstractController.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXAbstractController.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXAbstractController.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXComponent.java b/plugins/OSX/src/main/java/net/java/games/input/OSXComponent.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXComponent.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXComponent.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXControllers.java b/plugins/OSX/src/main/java/net/java/games/input/OSXControllers.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXControllers.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXControllers.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java b/plugins/OSX/src/main/java/net/java/games/input/OSXEnvironmentPlugin.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXEnvironmentPlugin.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXEvent.java b/plugins/OSX/src/main/java/net/java/games/input/OSXEvent.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXEvent.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXEvent.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDDevice.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDDevice.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDDeviceIterator.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDDeviceIterator.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXHIDDeviceIterator.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDDeviceIterator.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDElement.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDElement.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXHIDElement.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDElement.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDQueue.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDQueue.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXHIDQueue.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDQueue.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXKeyboard.java b/plugins/OSX/src/main/java/net/java/games/input/OSXKeyboard.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXKeyboard.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXKeyboard.java
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXMouse.java b/plugins/OSX/src/main/java/net/java/games/input/OSXMouse.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/OSXMouse.java
rename to plugins/OSX/src/main/java/net/java/games/input/OSXMouse.java
diff --git a/plugins/OSX/src/java/net/java/games/input/Usage.java b/plugins/OSX/src/main/java/net/java/games/input/Usage.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/Usage.java
rename to plugins/OSX/src/main/java/net/java/games/input/Usage.java
diff --git a/plugins/OSX/src/java/net/java/games/input/UsagePage.java b/plugins/OSX/src/main/java/net/java/games/input/UsagePage.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/UsagePage.java
rename to plugins/OSX/src/main/java/net/java/games/input/UsagePage.java
diff --git a/plugins/OSX/src/java/net/java/games/input/UsagePair.java b/plugins/OSX/src/main/java/net/java/games/input/UsagePair.java
similarity index 100%
rename from plugins/OSX/src/java/net/java/games/input/UsagePair.java
rename to plugins/OSX/src/main/java/net/java/games/input/UsagePair.java
diff --git a/plugins/OSX/src/native/.gitignore b/plugins/OSX/src/main/native/.gitignore
similarity index 100%
rename from plugins/OSX/src/native/.gitignore
rename to plugins/OSX/src/main/native/.gitignore
diff --git a/plugins/OSX/src/native/macosxutil.c b/plugins/OSX/src/main/native/macosxutil.c
similarity index 100%
rename from plugins/OSX/src/native/macosxutil.c
rename to plugins/OSX/src/main/native/macosxutil.c
diff --git a/plugins/OSX/src/native/macosxutil.h b/plugins/OSX/src/main/native/macosxutil.h
similarity index 100%
rename from plugins/OSX/src/native/macosxutil.h
rename to plugins/OSX/src/main/native/macosxutil.h
diff --git a/plugins/OSX/src/native/net_java_games_input_OSXHIDDevice.c b/plugins/OSX/src/main/native/net_java_games_input_OSXHIDDevice.c
similarity index 100%
rename from plugins/OSX/src/native/net_java_games_input_OSXHIDDevice.c
rename to plugins/OSX/src/main/native/net_java_games_input_OSXHIDDevice.c
diff --git a/plugins/OSX/src/native/net_java_games_input_OSXHIDDeviceIterator.c b/plugins/OSX/src/main/native/net_java_games_input_OSXHIDDeviceIterator.c
similarity index 100%
rename from plugins/OSX/src/native/net_java_games_input_OSXHIDDeviceIterator.c
rename to plugins/OSX/src/main/native/net_java_games_input_OSXHIDDeviceIterator.c
diff --git a/plugins/OSX/src/native/net_java_games_input_OSXHIDQueue.c b/plugins/OSX/src/main/native/net_java_games_input_OSXHIDQueue.c
similarity index 100%
rename from plugins/OSX/src/native/net_java_games_input_OSXHIDQueue.c
rename to plugins/OSX/src/main/native/net_java_games_input_OSXHIDQueue.c
diff --git a/plugins/OSX/src/native/build.xml b/plugins/OSX/src/native/build.xml
deleted file mode 100644
index 8dd4662..0000000
--- a/plugins/OSX/src/native/build.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OS X Plugin, Native code" basedir="." default="compileNativeJinputLib">
-	<description>OSX JInput Native Plugin</description>
-
-	<target name="init">
-		<mkdir dir="ppc"/>
-		<mkdir dir="i386"/>
-		<mkdir dir="x86_64"/>
-	</target>
-	
-	<target name="clean">
-		<delete failonerror="false">
-			<fileset dir="i386"/>
-			<fileset dir="x86_64"/>
-			<fileset dir="ppc"/>
-			<fileset file="libjinput-osx.jnilib"/>
-		</delete>
-	</target>
-
-	<target name="compile">
-		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
-			<arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I../../../../common/src/native -I.."/>
-			<mapper type="glob" from="*.c" to="*.o"/>
-			<fileset dir="." includes="*.c"/>
-			<fileset dir="../../../common/src/native" includes="*.c"/>
-		</apply>
-	</target>
-	
-	<target name="link">
-		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
-			<arg line="${linkerflags} -dynamiclib -o ${libname} -framework JavaVM -framework CoreFoundation -framework IOKit -framework CoreServices"/>
-			<fileset dir="${objdir}" includes="*.o"/>
-		</apply>
-		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
-			<arg line="-S -X"/>
-			<fileset dir="." includes="${libname}"/>
-		</apply>
-	</target>
-	
-	<target name="compileNativeJinputLib" depends="init">
-		<property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
-		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
-		<property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.5.sdk"/>
-		<property name="ppc_flags" value="-isysroot ${universal_sdkroot} -arch ppc -mmacosx-version-min=10.3"/>
-		<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386 -mmacosx-version-min=10.4"/>
-		<property name="x86_64_flags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
-		<antcall target="compile">
-			<param name="dstdir" location="ppc"/>
-			<param name="compiler" value="gcc-4.0"/>
-			<param name="sdkroot" location="${universal_sdkroot}"/>
-			<param name="cflags" value="${ppc_flags}"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="ppc"/>
-			<param name="libname" value="libjinput-osx-ppc.jnilib"/>
-			<param name="linker" value="gcc-4.0"/>
-			<param name="linkerflags" value="${ppc_flags}"/>
-		</antcall>
-		<antcall target="compile">
-			<param name="dstdir" location="i386"/>
-			<param name="compiler" value="gcc-4.0"/>
-			<param name="sdkroot" location="${universal_sdkroot}"/>
-			<param name="cflags" value="${universal_flags}"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="i386"/>
-			<param name="libname" value="libjinput-osx-i386.jnilib"/>
-			<param name="linker" value="gcc-4.0"/>
-			<param name="linkerflags" value="${universal_flags}"/>
-		</antcall>
-		<antcall target="compile">
-			<param name="dstdir" location="x86_64"/>
-			<param name="compiler" value="gcc-4.0"/>
-			<param name="sdkroot" location="${x86_64_sdkroot}"/>
-			<param name="cflags" value="${x86_64_flags}"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="x86_64"/>
-			<param name="libname" value="libjinput-osx-x86_64.jnilib"/>
-			<param name="linker" value="gcc-4.0"/>
-			<param name="linkerflags" value="${x86_64_flags}"/>
-		</antcall>
-		<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
-			<arg value="-create"/>
-			<srcfile/>
-			<arg value="-output"/>
-			<arg path="libjinput-osx.jnilib"/>
-			<fileset file="ppc/libjinput-osx-ppc.jnilib"/>
-			<fileset file="i386/libjinput-osx-i386.jnilib"/>
-			<fileset file="x86_64/libjinput-osx-x86_64.jnilib"/>
-		</apply>
-	</target>
-</project>