diff --git a/.gitignore b/.gitignore
index f0fde81a2..9c0573a55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,13 @@
+# Eclipse stuff
+/.classpath
+/.project
+/.settings
 
-/jarjar
-/build
-/build.xml
-/manifest.mf
+# netbeans
 /nbproject
-/dist
\ No newline at end of file
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
diff --git a/pom.xml b/pom.xml
new file mode 100755
index 000000000..cbfb2c744
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,48 @@
+<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>craftbukkit</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>CraftBukkit</name>
+  <url>http://www.bukkit.org</url>
+  <repositories>
+    <repository>
+      <id>tmp-repo</id>
+      <url>http://dl.dwim.org/~ebroes/maven</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>minecraft-server</artifactId>
+      <version>1.1_02</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <!-- to add the manifest with the Main-Class -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>org.bukkit.craftbukkit.Main</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
similarity index 100%
rename from src/net/minecraft/server/BlockFlowing.java
rename to src/main/java/net/minecraft/server/BlockFlowing.java
diff --git a/src/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
similarity index 100%
rename from src/net/minecraft/server/MinecraftServer.java
rename to src/main/java/net/minecraft/server/MinecraftServer.java
diff --git a/src/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
similarity index 100%
rename from src/net/minecraft/server/NetServerHandler.java
rename to src/main/java/net/minecraft/server/NetServerHandler.java
diff --git a/src/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
similarity index 100%
rename from src/net/minecraft/server/ServerConfigurationManager.java
rename to src/main/java/net/minecraft/server/ServerConfigurationManager.java
diff --git a/src/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
similarity index 100%
rename from src/net/minecraft/server/WorldServer.java
rename to src/main/java/net/minecraft/server/WorldServer.java
diff --git a/src/org/bukkit/craftbukkit/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/CraftBlock.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftBlock.java
rename to src/main/java/org/bukkit/craftbukkit/CraftBlock.java
diff --git a/src/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftChunk.java
rename to src/main/java/org/bukkit/craftbukkit/CraftChunk.java
diff --git a/src/org/bukkit/craftbukkit/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftEntity.java
rename to src/main/java/org/bukkit/craftbukkit/CraftEntity.java
diff --git a/src/org/bukkit/craftbukkit/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftHumanEntity.java
rename to src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java
diff --git a/src/org/bukkit/craftbukkit/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftLivingEntity.java
rename to src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
diff --git a/src/org/bukkit/craftbukkit/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftPlayer.java
rename to src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
diff --git a/src/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftServer.java
rename to src/main/java/org/bukkit/craftbukkit/CraftServer.java
diff --git a/src/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/CraftWorld.java
rename to src/main/java/org/bukkit/craftbukkit/CraftWorld.java
diff --git a/src/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
similarity index 100%
rename from src/org/bukkit/craftbukkit/Main.java
rename to src/main/java/org/bukkit/craftbukkit/Main.java