diff --git a/.classpath b/java/.classpath
similarity index 100%
rename from .classpath
rename to java/.classpath
diff --git a/.project b/java/.project
similarity index 100%
rename from .project
rename to java/.project
diff --git a/build.gradle b/java/build.gradle
similarity index 100%
rename from build.gradle
rename to java/build.gradle
diff --git a/src/main/java/wiiusej/WiiUseApi.java b/java/src/main/java/wiiusej/WiiUseApi.java
similarity index 100%
rename from src/main/java/wiiusej/WiiUseApi.java
rename to java/src/main/java/wiiusej/WiiUseApi.java
diff --git a/src/main/java/wiiusej/WiiUseApiManager.java b/java/src/main/java/wiiusej/WiiUseApiManager.java
similarity index 100%
rename from src/main/java/wiiusej/WiiUseApiManager.java
rename to java/src/main/java/wiiusej/WiiUseApiManager.java
diff --git a/src/main/java/wiiusej/Wiimote.java b/java/src/main/java/wiiusej/Wiimote.java
similarity index 100%
rename from src/main/java/wiiusej/Wiimote.java
rename to java/src/main/java/wiiusej/Wiimote.java
diff --git a/src/main/java/wiiusej/values/Acceleration.java b/java/src/main/java/wiiusej/values/Acceleration.java
similarity index 100%
rename from src/main/java/wiiusej/values/Acceleration.java
rename to java/src/main/java/wiiusej/values/Acceleration.java
diff --git a/src/main/java/wiiusej/values/Calibration.java b/java/src/main/java/wiiusej/values/Calibration.java
similarity index 100%
rename from src/main/java/wiiusej/values/Calibration.java
rename to java/src/main/java/wiiusej/values/Calibration.java
diff --git a/src/main/java/wiiusej/values/GForce.java b/java/src/main/java/wiiusej/values/GForce.java
similarity index 100%
rename from src/main/java/wiiusej/values/GForce.java
rename to java/src/main/java/wiiusej/values/GForce.java
diff --git a/src/main/java/wiiusej/values/IRSource.java b/java/src/main/java/wiiusej/values/IRSource.java
similarity index 100%
rename from src/main/java/wiiusej/values/IRSource.java
rename to java/src/main/java/wiiusej/values/IRSource.java
diff --git a/src/main/java/wiiusej/values/Orientation.java b/java/src/main/java/wiiusej/values/Orientation.java
similarity index 100%
rename from src/main/java/wiiusej/values/Orientation.java
rename to java/src/main/java/wiiusej/values/Orientation.java
diff --git a/src/main/java/wiiusej/values/RawAcceleration.java b/java/src/main/java/wiiusej/values/RawAcceleration.java
similarity index 100%
rename from src/main/java/wiiusej/values/RawAcceleration.java
rename to java/src/main/java/wiiusej/values/RawAcceleration.java
diff --git a/src/main/java/wiiusej/wiiusejevents/GenericEvent.java b/java/src/main/java/wiiusej/wiiusejevents/GenericEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/GenericEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/GenericEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardButtonsEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardButtonsEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardButtonsEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardButtonsEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/BalanceBoardEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/ButtonsEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/ButtonsEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/ButtonsEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/ButtonsEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerButtonsEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/ClassicControllerEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/ExpansionEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/ExpansionEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/ExpansionEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/ExpansionEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroButtonsEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/GuitarHeroEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/IREvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/IREvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/IREvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/IREvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/JoystickEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/JoystickEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/JoystickEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/JoystickEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/MotionSensingEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/MotionSensingEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/MotionSensingEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/MotionSensingEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukButtonsEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/NunchukEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java b/java/src/main/java/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/physicalevents/WiimoteButtonsEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/utils/EventsGatherer.java b/java/src/main/java/wiiusej/wiiusejevents/utils/EventsGatherer.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/utils/EventsGatherer.java
rename to java/src/main/java/wiiusej/wiiusejevents/utils/EventsGatherer.java
diff --git a/src/main/java/wiiusej/wiiusejevents/utils/WiiUseApiListener.java b/java/src/main/java/wiiusej/wiiusejevents/utils/WiiUseApiListener.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/utils/WiiUseApiListener.java
rename to java/src/main/java/wiiusej/wiiusejevents/utils/WiiUseApiListener.java
diff --git a/src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java b/java/src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java
rename to java/src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardInsertedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardInsertedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardInsertedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardInsertedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardRemovedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardRemovedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardRemovedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/BalanceBoardRemovedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerInsertedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerInsertedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerInsertedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerInsertedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerRemovedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerRemovedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerRemovedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/ClassicControllerRemovedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/DisconnectionEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/DisconnectionEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/DisconnectionEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/DisconnectionEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroInsertedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroInsertedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroInsertedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroInsertedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroRemovedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroRemovedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroRemovedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/GuitarHeroRemovedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukInsertedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukInsertedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukInsertedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukInsertedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukRemovedEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukRemovedEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukRemovedEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/NunchukRemovedEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/StatusEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/StatusEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/StatusEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/StatusEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiiUseApiEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiiUseApiEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiiUseApiEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiiUseApiEvent.java
diff --git a/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiimoteEvent.java b/java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiimoteEvent.java
similarity index 100%
rename from src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiimoteEvent.java
rename to java/src/main/java/wiiusej/wiiusejevents/wiiuseapievents/WiimoteEvent.java
diff --git a/wiiuse.dll b/java/wiiuse.dll
similarity index 100%
rename from wiiuse.dll
rename to java/wiiuse.dll
diff --git a/wiiusej.dll b/java/wiiusej.dll
similarity index 100%
rename from wiiusej.dll
rename to java/wiiusej.dll