diff --git a/build.xml b/build.xml
deleted file mode 100644
index cb8a1c8..0000000
--- a/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<project name="BukkitXMPP" default="dist" basedir=".">
-	<property name="pluginname" value="BukkitXMPP"/>
-	<property name="plugins" location="../minecraft/plugins/"/>
-
-	<property name="src" location="src"/>
-	<property name="bin" location="bin"/>
-	<property name="dist" location="dist"/>
-	
-    <path id="bukkitxmpp.classpath">
-        <pathelement location="bin"/>
-        <pathelement location="lib/craftbukkit-0.0.1-SNAPSHOT.jar"/>
-        <pathelement location="lib/smack.jar"/>
-        <pathelement location="lib/smackx.jar"/>
-    </path>
-	
-	<target name="init">
-		<mkdir dir="${bin}"/>
-	</target>
-	
-	<target name="compile" depends="init">
-		<javac srcdir="${src}" destdir="${bin}" includeantruntime="false">
-			<classpath refid="bukkitxmpp.classpath"/>
-		</javac>
-	</target>
-	
-	<target name="dist" depends="compile">
-                <!--<zipgroupfileset dir="lib" includes="smack*.jar" /> -->
-		<mkdir dir="${dist}"/>
-		<jar jarfile="${dist}/${pluginname}.jar">
-			<fileset dir="${bin}"/>
-			<fileset file="resources/plugin.yml"/>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}"/>
-	 		  	<!--<attribute name="Class-Path" value="../lib/smack.jar ../lib/smackx.jar"/>-->
-			</manifest>
-		</jar>
-	</target>
-	
-	<target name="deploy" depends="dist">
-		<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
-	</target>
-	
-	<target name="clean">
-		<delete dir="${bin}"/>
-		<delete dir="${dist}"/>
-	</target>
-		
-    <target name="Main">
-        <java classname="org.bukkit.craftbukkit.Main" failonerror="true" fork="yes">
-            <classpath refid="bukkitxmpp.classpath"/>
-        </java>
-    </target>
-</project>
diff --git a/lib/craftbukkit-0.0.1-SNAPSHOT.jar b/lib/craftbukkit-0.0.1-SNAPSHOT.jar
deleted file mode 100644
index 5a50af4..0000000
Binary files a/lib/craftbukkit-0.0.1-SNAPSHOT.jar and /dev/null differ
diff --git a/lib/smack.jar b/lib/smack.jar
deleted file mode 100644
index 336b687..0000000
Binary files a/lib/smack.jar and /dev/null differ
diff --git a/lib/smackx.jar b/lib/smackx.jar
deleted file mode 100644
index dd9a8fd..0000000
Binary files a/lib/smackx.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..996b1ff
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>bukkitxmpp</groupId>
+	<artifactId>bukkitxmpp</artifactId>
+	<version>0.1</version>
+	<name>BukkitXMPP</name>
+	<url>http://github.com/nikdoof/bukkitxmpp/</url>
+	<issueManagement>
+		<system>Github</system>
+		<url>http://github.com/nikdoof/bukkitxmpp/issues</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Jenkins</system>
+		<url>http://ci.tensixtyone.com/</url>
+	</ciManagement>
+	<scm>
+		<url>git://github.com/nikdoof/bukkitxmpp.git</url>
+	</scm>
+      <repositories>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>central</id>
+          <name>libs-release</name>
+          <url>http://repo.bukkit.org/artifactory/libs-release</url>
+        </repository>
+        <repository>
+          <snapshots />
+          <id>snapshots</id>
+          <name>libs-snapshot</name>
+          <url>http://repo.bukkit.org/artifactory/libs-snapshot</url>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>central</id>
+          <name>plugins-release</name>
+          <url>http://repo.bukkit.org/artifactory/plugins-release</url>
+        </pluginRepository>
+        <pluginRepository>
+          <snapshots />
+          <id>snapshots</id>
+          <name>plugins-snapshot</name>
+          <url>http://repo.bukkit.org/artifactory/plugins-snapshot</url>
+        </pluginRepository>
+      </pluginRepositories>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>jivesoftware</groupId>
+			<artifactId>smack</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>jivesoftware</groupId>
+			<artifactId>smackx</artifactId>
+			<version>3.1.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies />
+
+	</dependencyManagement>
+	<modules>
+	</modules>
+	<build>
+	    <defaultGoal>clean install</defaultGoal>
+	<plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Implementation-Title>BukkitXMPP</Implementation-Title>
+              <Implementation-Version>${describe}</Implementation-Version>
+              <Implementation-Vendor>Matalok</Implementation-Vendor>
+            </manifestEntries>
+          </archive>
+        </configuration>
+       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+	<resources>
+	</resources>
+	</build>
+</project>
\ No newline at end of file
diff --git a/src/com/pleaseignore/BukkitXMPP/BukkitParticipantStatusListener.java b/src/main/java/com/pleaseignore/BukkitXMPP/BukkitParticipantStatusListener.java
similarity index 100%
rename from src/com/pleaseignore/BukkitXMPP/BukkitParticipantStatusListener.java
rename to src/main/java/com/pleaseignore/BukkitXMPP/BukkitParticipantStatusListener.java
diff --git a/src/com/pleaseignore/BukkitXMPP/BukkitXMPP.java b/src/main/java/com/pleaseignore/BukkitXMPP/BukkitXMPP.java
similarity index 100%
rename from src/com/pleaseignore/BukkitXMPP/BukkitXMPP.java
rename to src/main/java/com/pleaseignore/BukkitXMPP/BukkitXMPP.java
diff --git a/src/com/pleaseignore/BukkitXMPP/BukkitXMPPPlayerListener.java b/src/main/java/com/pleaseignore/BukkitXMPP/BukkitXMPPPlayerListener.java
similarity index 100%
rename from src/com/pleaseignore/BukkitXMPP/BukkitXMPPPlayerListener.java
rename to src/main/java/com/pleaseignore/BukkitXMPP/BukkitXMPPPlayerListener.java
diff --git a/resources/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from resources/plugin.yml
rename to src/main/resources/plugin.yml