diff --git a/.gitignore b/.gitignore
index f46e6a5..b2a0e87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
 /bin
-/build
 /target
 .classpath
-.project
-Blacksmith.jar
-build.xml
\ No newline at end of file
+.project
\ No newline at end of file
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index f931203..8e4055a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-#Thu Feb 09 16:52:58 CST 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..15d7087
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,60 @@
+<!-- Blacksmith build file -->
+
+<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>net.apunch</groupId>
+	<artifactId>blacksmith</artifactId>
+	<version>1.0-SNAPSHOT</version>
+	<name>Blacksmith</name>
+	<description>Blacksmith Character for the CitizensAPI</description>
+
+	<!-- Properties -->
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<bukkit.version>1.2.3-R0.3-SNAPSHOT</bukkit.version>
+		<citizensapi.version>2.0-SNAPSHOT</citizensapi.version>
+		<vault.version>1.2.13-SNAPSHOT</vault.version>
+		<build.number>Unknown</build.number>
+	</properties>
+
+	<!-- Repositories -->
+	<repositories>
+		<repository>
+			<id>bukkit-repo</id>
+			<url>http://repo.bukkit.org/content/groups/public/</url>
+		</repository>
+		<repository>
+			<id>citizens-repo</id>
+			<url>http://repo.citizensnpcs.net/</url>
+		</repository>
+		<repository>
+			<id>vault-repo</id>
+			<url>http://ci.milkbowl.net/plugin/repository/everything</url>
+		</repository>
+	</repositories>
+
+	<!-- Dependencies -->
+	<dependencies>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>${bukkit.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.citizensnpcs</groupId>
+			<artifactId>citizensapi</artifactId>
+			<version>${citizensapi.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.milkbowl.vault</groupId>
+			<artifactId>Vault</artifactId>
+			<version>${vault.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
\ No newline at end of file
diff --git a/src/net/apunch/blacksmith/Blacksmith.java b/src/main/java/net/apunch/blacksmith/Blacksmith.java
similarity index 95%
rename from src/net/apunch/blacksmith/Blacksmith.java
rename to src/main/java/net/apunch/blacksmith/Blacksmith.java
index 04672f8..b12300d 100644
--- a/src/net/apunch/blacksmith/Blacksmith.java
+++ b/src/main/java/net/apunch/blacksmith/Blacksmith.java
@@ -125,8 +125,10 @@ public class Blacksmith extends Character {
                 return;
             }
             session = new ReforgeSession(player, npc);
-            npc.chat(player, costMsg.replace("<price>", plugin.formatCost(player)).replace("<item>",
-                    hand.getType().name().toLowerCase().replace('_', ' ')));
+            npc.chat(
+                    player,
+                    costMsg.replace("<price>", plugin.formatCost(player)).replace("<item>",
+                            hand.getType().name().toLowerCase().replace('_', ' ')));
         }
     }
 
@@ -160,8 +162,11 @@ public class Blacksmith extends Character {
     private void reforge(NPC npc, Player player) {
         npc.chat(player, startReforgeMsg);
         plugin.withdraw(player);
-        session.setTask(plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin,
-                new ReforgeTask(npc, player), (new Random().nextInt(maxReforgeDelay) + minReforgeDelay) * 20));
+        session.setTask(plugin
+                .getServer()
+                .getScheduler()
+                .scheduleAsyncDelayedTask(plugin, new ReforgeTask(npc, player),
+                        (new Random().nextInt(maxReforgeDelay) + minReforgeDelay) * 20));
         if (npc.getBukkitEntity() instanceof Player)
             ((Player) npc.getBukkitEntity()).setItemInHand(player.getItemInHand());
         player.setItemInHand(null);
diff --git a/src/net/apunch/blacksmith/BlacksmithPlugin.java b/src/main/java/net/apunch/blacksmith/BlacksmithPlugin.java
similarity index 100%
rename from src/net/apunch/blacksmith/BlacksmithPlugin.java
rename to src/main/java/net/apunch/blacksmith/BlacksmithPlugin.java
diff --git a/src/net/apunch/blacksmith/ReforgeSession.java b/src/main/java/net/apunch/blacksmith/ReforgeSession.java
similarity index 100%
rename from src/net/apunch/blacksmith/ReforgeSession.java
rename to src/main/java/net/apunch/blacksmith/ReforgeSession.java
diff --git a/src/net/apunch/blacksmith/util/Settings.java b/src/main/java/net/apunch/blacksmith/util/Settings.java
similarity index 100%
rename from src/net/apunch/blacksmith/util/Settings.java
rename to src/main/java/net/apunch/blacksmith/util/Settings.java
diff --git a/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from plugin.yml
rename to src/main/resources/plugin.yml