diff --git a/plugins/windows/build.xml b/plugins/windows/build.xml
deleted file mode 100644
index 906a986..0000000
--- a/plugins/windows/build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<project name="Direct Input Plugin" basedir=".">
-    <target name="init">
-        <mkdir dir="target/natives"/>
-    </target>
-
-    <target name="compile_native" depends="init,create_jniheaders">
-        <ant dir="src/native" target="compile"/>
-    </target>
-
-</project>
diff --git a/plugins/windows/pom.xml b/plugins/windows/pom.xml
index d7da89c..e7458ab 100644
--- a/plugins/windows/pom.xml
+++ b/plugins/windows/pom.xml
@@ -43,7 +43,7 @@
                         <phase>compile</phase>
                         <configuration>
                             <target>
-                                <ant dir="." target="compile_native"/>
+                                <ant dir="${project.build.sourceDirectory}/main/native"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/plugins/windows/src/java/net/java/games/input/DIAbstractController.java b/plugins/windows/src/main/java/net/java/games/input/DIAbstractController.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIAbstractController.java
rename to plugins/windows/src/main/java/net/java/games/input/DIAbstractController.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIComponent.java b/plugins/windows/src/main/java/net/java/games/input/DIComponent.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIComponent.java
rename to plugins/windows/src/main/java/net/java/games/input/DIComponent.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIControllers.java b/plugins/windows/src/main/java/net/java/games/input/DIControllers.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIControllers.java
rename to plugins/windows/src/main/java/net/java/games/input/DIControllers.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIDeviceObject.java b/plugins/windows/src/main/java/net/java/games/input/DIDeviceObject.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIDeviceObject.java
rename to plugins/windows/src/main/java/net/java/games/input/DIDeviceObject.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIDeviceObjectData.java b/plugins/windows/src/main/java/net/java/games/input/DIDeviceObjectData.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIDeviceObjectData.java
rename to plugins/windows/src/main/java/net/java/games/input/DIDeviceObjectData.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIEffectInfo.java b/plugins/windows/src/main/java/net/java/games/input/DIEffectInfo.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIEffectInfo.java
rename to plugins/windows/src/main/java/net/java/games/input/DIEffectInfo.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIIdentifierMap.java b/plugins/windows/src/main/java/net/java/games/input/DIIdentifierMap.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIIdentifierMap.java
rename to plugins/windows/src/main/java/net/java/games/input/DIIdentifierMap.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIKeyboard.java b/plugins/windows/src/main/java/net/java/games/input/DIKeyboard.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIKeyboard.java
rename to plugins/windows/src/main/java/net/java/games/input/DIKeyboard.java
diff --git a/plugins/windows/src/java/net/java/games/input/DIMouse.java b/plugins/windows/src/main/java/net/java/games/input/DIMouse.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DIMouse.java
rename to plugins/windows/src/main/java/net/java/games/input/DIMouse.java
diff --git a/plugins/windows/src/java/net/java/games/input/DataQueue.java b/plugins/windows/src/main/java/net/java/games/input/DataQueue.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DataQueue.java
rename to plugins/windows/src/main/java/net/java/games/input/DataQueue.java
diff --git a/plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java b/plugins/windows/src/main/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java
rename to plugins/windows/src/main/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java
diff --git a/plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java b/plugins/windows/src/main/java/net/java/games/input/DirectInputEnvironmentPlugin.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java
rename to plugins/windows/src/main/java/net/java/games/input/DirectInputEnvironmentPlugin.java
diff --git a/plugins/windows/src/java/net/java/games/input/DummyWindow.java b/plugins/windows/src/main/java/net/java/games/input/DummyWindow.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/DummyWindow.java
rename to plugins/windows/src/main/java/net/java/games/input/DummyWindow.java
diff --git a/plugins/windows/src/java/net/java/games/input/IDirectInput.java b/plugins/windows/src/main/java/net/java/games/input/IDirectInput.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/IDirectInput.java
rename to plugins/windows/src/main/java/net/java/games/input/IDirectInput.java
diff --git a/plugins/windows/src/java/net/java/games/input/IDirectInputDevice.java b/plugins/windows/src/main/java/net/java/games/input/IDirectInputDevice.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/IDirectInputDevice.java
rename to plugins/windows/src/main/java/net/java/games/input/IDirectInputDevice.java
diff --git a/plugins/windows/src/java/net/java/games/input/IDirectInputEffect.java b/plugins/windows/src/main/java/net/java/games/input/IDirectInputEffect.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/IDirectInputEffect.java
rename to plugins/windows/src/main/java/net/java/games/input/IDirectInputEffect.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawDevice.java b/plugins/windows/src/main/java/net/java/games/input/RawDevice.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawDevice.java
rename to plugins/windows/src/main/java/net/java/games/input/RawDevice.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawDeviceInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawDeviceInfo.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawDeviceInfo.java
rename to plugins/windows/src/main/java/net/java/games/input/RawDeviceInfo.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawHIDInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawHIDInfo.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawHIDInfo.java
rename to plugins/windows/src/main/java/net/java/games/input/RawHIDInfo.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawIdentifierMap.java b/plugins/windows/src/main/java/net/java/games/input/RawIdentifierMap.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawIdentifierMap.java
rename to plugins/windows/src/main/java/net/java/games/input/RawIdentifierMap.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java b/plugins/windows/src/main/java/net/java/games/input/RawInputEnvironmentPlugin.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java
rename to plugins/windows/src/main/java/net/java/games/input/RawInputEnvironmentPlugin.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawInputEventQueue.java b/plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawInputEventQueue.java
rename to plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawKeyboard.java b/plugins/windows/src/main/java/net/java/games/input/RawKeyboard.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawKeyboard.java
rename to plugins/windows/src/main/java/net/java/games/input/RawKeyboard.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawKeyboardEvent.java b/plugins/windows/src/main/java/net/java/games/input/RawKeyboardEvent.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawKeyboardEvent.java
rename to plugins/windows/src/main/java/net/java/games/input/RawKeyboardEvent.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawKeyboardInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawKeyboardInfo.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawKeyboardInfo.java
rename to plugins/windows/src/main/java/net/java/games/input/RawKeyboardInfo.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawMouse.java b/plugins/windows/src/main/java/net/java/games/input/RawMouse.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawMouse.java
rename to plugins/windows/src/main/java/net/java/games/input/RawMouse.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawMouseEvent.java b/plugins/windows/src/main/java/net/java/games/input/RawMouseEvent.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawMouseEvent.java
rename to plugins/windows/src/main/java/net/java/games/input/RawMouseEvent.java
diff --git a/plugins/windows/src/java/net/java/games/input/RawMouseInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawMouseInfo.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/RawMouseInfo.java
rename to plugins/windows/src/main/java/net/java/games/input/RawMouseInfo.java
diff --git a/plugins/windows/src/java/net/java/games/input/SetupAPIDevice.java b/plugins/windows/src/main/java/net/java/games/input/SetupAPIDevice.java
similarity index 100%
rename from plugins/windows/src/java/net/java/games/input/SetupAPIDevice.java
rename to plugins/windows/src/main/java/net/java/games/input/SetupAPIDevice.java
diff --git a/plugins/windows/src/native/.gitignore b/plugins/windows/src/main/native/.gitignore
similarity index 100%
rename from plugins/windows/src/native/.gitignore
rename to plugins/windows/src/main/native/.gitignore
diff --git a/plugins/windows/src/native/build.xml b/plugins/windows/src/main/native/build.xml
similarity index 98%
rename from plugins/windows/src/native/build.xml
rename to plugins/windows/src/main/native/build.xml
index 75548ec..e766bda 100644
--- a/plugins/windows/src/native/build.xml
+++ b/plugins/windows/src/main/native/build.xml
@@ -5,6 +5,10 @@
 	<property name="dxhome" location="${env.DXSDK_DIR}"/>
 	<property name="sdkhome" location="${env.WindowsSdkDir}"/>
 
+	<target name="init">
+		<mkdir dir="target/natives"/>
+	</target>
+
 	<target name="compile_dir">
 		<echo message="${compiledir}"/>
 		<echo message="sdkhome: ${sdkhome}"/>
diff --git a/plugins/windows/src/native/dx8/.gitignore b/plugins/windows/src/main/native/dx8/.gitignore
similarity index 100%
rename from plugins/windows/src/native/dx8/.gitignore
rename to plugins/windows/src/main/native/dx8/.gitignore
diff --git a/plugins/windows/src/native/dx8/dxversion.h b/plugins/windows/src/main/native/dx8/dxversion.h
similarity index 100%
rename from plugins/windows/src/native/dx8/dxversion.h
rename to plugins/windows/src/main/native/dx8/dxversion.h
diff --git a/plugins/windows/src/native/dx8/net_java_games_input_IDirectInput.c b/plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInput.c
similarity index 100%
rename from plugins/windows/src/native/dx8/net_java_games_input_IDirectInput.c
rename to plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInput.c
diff --git a/plugins/windows/src/native/dx8/net_java_games_input_IDirectInputDevice.c b/plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputDevice.c
similarity index 100%
rename from plugins/windows/src/native/dx8/net_java_games_input_IDirectInputDevice.c
rename to plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputDevice.c
diff --git a/plugins/windows/src/native/dx8/net_java_games_input_IDirectInputEffect.c b/plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputEffect.c
similarity index 100%
rename from plugins/windows/src/native/dx8/net_java_games_input_IDirectInputEffect.c
rename to plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputEffect.c
diff --git a/plugins/windows/src/native/net_java_games_input_DummyWindow.c b/plugins/windows/src/main/native/net_java_games_input_DummyWindow.c
similarity index 100%
rename from plugins/windows/src/native/net_java_games_input_DummyWindow.c
rename to plugins/windows/src/main/native/net_java_games_input_DummyWindow.c
diff --git a/plugins/windows/src/native/raw/.gitignore b/plugins/windows/src/main/native/raw/.gitignore
similarity index 100%
rename from plugins/windows/src/native/raw/.gitignore
rename to plugins/windows/src/main/native/raw/.gitignore
diff --git a/plugins/windows/src/native/raw/net_java_games_input_RawDevice.c b/plugins/windows/src/main/native/raw/net_java_games_input_RawDevice.c
similarity index 100%
rename from plugins/windows/src/native/raw/net_java_games_input_RawDevice.c
rename to plugins/windows/src/main/native/raw/net_java_games_input_RawDevice.c
diff --git a/plugins/windows/src/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c b/plugins/windows/src/main/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c
similarity index 100%
rename from plugins/windows/src/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c
rename to plugins/windows/src/main/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c
diff --git a/plugins/windows/src/native/raw/net_java_games_input_RawInputEventQueue.c b/plugins/windows/src/main/native/raw/net_java_games_input_RawInputEventQueue.c
similarity index 100%
rename from plugins/windows/src/native/raw/net_java_games_input_RawInputEventQueue.c
rename to plugins/windows/src/main/native/raw/net_java_games_input_RawInputEventQueue.c
diff --git a/plugins/windows/src/native/raw/rawwinver.h b/plugins/windows/src/main/native/raw/rawwinver.h
similarity index 100%
rename from plugins/windows/src/native/raw/rawwinver.h
rename to plugins/windows/src/main/native/raw/rawwinver.h
diff --git a/plugins/windows/src/native/winutil.c b/plugins/windows/src/main/native/winutil.c
similarity index 100%
rename from plugins/windows/src/native/winutil.c
rename to plugins/windows/src/main/native/winutil.c
diff --git a/plugins/windows/src/native/winutil.h b/plugins/windows/src/main/native/winutil.h
similarity index 100%
rename from plugins/windows/src/native/winutil.h
rename to plugins/windows/src/main/native/winutil.h