diff --git a/paper-api/.gitignore b/paper-api/.gitignore
index 9ba47d064d..b5d9a1dc91 100644
--- a/paper-api/.gitignore
+++ b/paper-api/.gitignore
@@ -1,11 +1,20 @@
+# Eclipse stuff
+/.classpath
+/.project
+/.settings
 
-/build
+# netbeans
 /nbproject
-/build.xml
-/manifest.mf
-/dist
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
+
+# test stuff (do remove me!)
 /sample/test
 /sample/build.xml
 /sample/build
 /sample/dist
-/sample/nbproject
\ No newline at end of file
+/sample/nbproject
diff --git a/paper-api/pom.xml b/paper-api/pom.xml
new file mode 100755
index 0000000000..43b118687c
--- /dev/null
+++ b/paper-api/pom.xml
@@ -0,0 +1,17 @@
+<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>org.bukkit</groupId>
+  <artifactId>bukkit</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>Bukkit</name>
+  <url>http://www.bukkit.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.7</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/paper-api/src/org/bukkit/Block.java b/paper-api/src/main/java/org/bukkit/Block.java
similarity index 100%
rename from paper-api/src/org/bukkit/Block.java
rename to paper-api/src/main/java/org/bukkit/Block.java
diff --git a/paper-api/src/org/bukkit/BlockFace.java b/paper-api/src/main/java/org/bukkit/BlockFace.java
similarity index 100%
rename from paper-api/src/org/bukkit/BlockFace.java
rename to paper-api/src/main/java/org/bukkit/BlockFace.java
diff --git a/paper-api/src/org/bukkit/Chunk.java b/paper-api/src/main/java/org/bukkit/Chunk.java
similarity index 100%
rename from paper-api/src/org/bukkit/Chunk.java
rename to paper-api/src/main/java/org/bukkit/Chunk.java
diff --git a/paper-api/src/org/bukkit/Entity.java b/paper-api/src/main/java/org/bukkit/Entity.java
similarity index 100%
rename from paper-api/src/org/bukkit/Entity.java
rename to paper-api/src/main/java/org/bukkit/Entity.java
diff --git a/paper-api/src/org/bukkit/HumanEntity.java b/paper-api/src/main/java/org/bukkit/HumanEntity.java
similarity index 100%
rename from paper-api/src/org/bukkit/HumanEntity.java
rename to paper-api/src/main/java/org/bukkit/HumanEntity.java
diff --git a/paper-api/src/org/bukkit/ItemStack.java b/paper-api/src/main/java/org/bukkit/ItemStack.java
similarity index 100%
rename from paper-api/src/org/bukkit/ItemStack.java
rename to paper-api/src/main/java/org/bukkit/ItemStack.java
diff --git a/paper-api/src/org/bukkit/LivingEntity.java b/paper-api/src/main/java/org/bukkit/LivingEntity.java
similarity index 100%
rename from paper-api/src/org/bukkit/LivingEntity.java
rename to paper-api/src/main/java/org/bukkit/LivingEntity.java
diff --git a/paper-api/src/org/bukkit/Location.java b/paper-api/src/main/java/org/bukkit/Location.java
similarity index 100%
rename from paper-api/src/org/bukkit/Location.java
rename to paper-api/src/main/java/org/bukkit/Location.java
diff --git a/paper-api/src/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java
similarity index 100%
rename from paper-api/src/org/bukkit/Material.java
rename to paper-api/src/main/java/org/bukkit/Material.java
diff --git a/paper-api/src/org/bukkit/Player.java b/paper-api/src/main/java/org/bukkit/Player.java
similarity index 100%
rename from paper-api/src/org/bukkit/Player.java
rename to paper-api/src/main/java/org/bukkit/Player.java
diff --git a/paper-api/src/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java
similarity index 100%
rename from paper-api/src/org/bukkit/Server.java
rename to paper-api/src/main/java/org/bukkit/Server.java
diff --git a/paper-api/src/org/bukkit/World.java b/paper-api/src/main/java/org/bukkit/World.java
similarity index 100%
rename from paper-api/src/org/bukkit/World.java
rename to paper-api/src/main/java/org/bukkit/World.java
diff --git a/paper-api/src/org/bukkit/event/Cancellable.java b/paper-api/src/main/java/org/bukkit/event/Cancellable.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/Cancellable.java
rename to paper-api/src/main/java/org/bukkit/event/Cancellable.java
diff --git a/paper-api/src/org/bukkit/event/Event.java b/paper-api/src/main/java/org/bukkit/event/Event.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/Event.java
rename to paper-api/src/main/java/org/bukkit/event/Event.java
diff --git a/paper-api/src/org/bukkit/event/EventException.java b/paper-api/src/main/java/org/bukkit/event/EventException.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/EventException.java
rename to paper-api/src/main/java/org/bukkit/event/EventException.java
diff --git a/paper-api/src/org/bukkit/event/Listener.java b/paper-api/src/main/java/org/bukkit/event/Listener.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/Listener.java
rename to paper-api/src/main/java/org/bukkit/event/Listener.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockBrokenEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockBrokenEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockCanBuildEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockCanBuildEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockEvent.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockFromToEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockFromToEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockIgniteEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockIgniteEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockListener.java b/paper-api/src/main/java/org/bukkit/event/block/BlockListener.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockListener.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockListener.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockPhysicsEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockPhysicsEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockPlacedEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockPlacedEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java
diff --git a/paper-api/src/org/bukkit/event/block/BlockRightClickedEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/block/BlockRightClickedEvent.java
rename to paper-api/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java
diff --git a/paper-api/src/org/bukkit/event/player/PlayerChatEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/player/PlayerChatEvent.java
rename to paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
diff --git a/paper-api/src/org/bukkit/event/player/PlayerEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/player/PlayerEvent.java
rename to paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java
diff --git a/paper-api/src/org/bukkit/event/player/PlayerListener.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerListener.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/player/PlayerListener.java
rename to paper-api/src/main/java/org/bukkit/event/player/PlayerListener.java
diff --git a/paper-api/src/org/bukkit/event/player/PlayerLoginEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/player/PlayerLoginEvent.java
rename to paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
diff --git a/paper-api/src/org/bukkit/event/player/PlayerMoveEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
similarity index 100%
rename from paper-api/src/org/bukkit/event/player/PlayerMoveEvent.java
rename to paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
diff --git a/paper-api/src/org/bukkit/plugin/InvalidDescriptionException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/InvalidDescriptionException.java
rename to paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
diff --git a/paper-api/src/org/bukkit/plugin/InvalidPluginException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/InvalidPluginException.java
rename to paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java
diff --git a/paper-api/src/org/bukkit/plugin/Plugin.java b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/Plugin.java
rename to paper-api/src/main/java/org/bukkit/plugin/Plugin.java
diff --git a/paper-api/src/org/bukkit/plugin/PluginDescriptionFile.java b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/PluginDescriptionFile.java
rename to paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
diff --git a/paper-api/src/org/bukkit/plugin/PluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/PluginLoader.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/PluginLoader.java
rename to paper-api/src/main/java/org/bukkit/plugin/PluginLoader.java
diff --git a/paper-api/src/org/bukkit/plugin/PluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/PluginManager.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/PluginManager.java
rename to paper-api/src/main/java/org/bukkit/plugin/PluginManager.java
diff --git a/paper-api/src/org/bukkit/plugin/RegisteredListener.java b/paper-api/src/main/java/org/bukkit/plugin/RegisteredListener.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/RegisteredListener.java
rename to paper-api/src/main/java/org/bukkit/plugin/RegisteredListener.java
diff --git a/paper-api/src/org/bukkit/plugin/SimplePluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/SimplePluginManager.java
rename to paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
diff --git a/paper-api/src/org/bukkit/plugin/java/JavaPlugin.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/java/JavaPlugin.java
rename to paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
diff --git a/paper-api/src/org/bukkit/plugin/java/JavaPluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
similarity index 100%
rename from paper-api/src/org/bukkit/plugin/java/JavaPluginLoader.java
rename to paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java