diff --git a/MobScores/.classpath b/MobScores/.classpath
new file mode 100644
index 0000000..5e4b891
--- /dev/null
+++ b/MobScores/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="src" path="/ScoreKeeper"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/MobScores/.project b/MobScores/.project
new file mode 100644
index 0000000..8b9c3f9
--- /dev/null
+++ b/MobScores/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MobScores</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/MobScores/.settings/org.eclipse.core.resources.prefs b/MobScores/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..a6552a8
--- /dev/null
+++ b/MobScores/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+#Sun Feb 19 04:09:36 PST 2012
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/MobScores/.settings/org.eclipse.jdt.core.prefs b/MobScores/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..59dcc4a
--- /dev/null
+++ b/MobScores/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Sun Feb 19 04:09:37 PST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/MobScores/.settings/org.eclipse.m2e.core.prefs b/MobScores/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..b7fd7ea
--- /dev/null
+++ b/MobScores/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Sun Feb 19 04:09:36 PST 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/MobScoresPlugin.class b/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/MobScoresPlugin.class
deleted file mode 100644
index db2b5cf..0000000
Binary files a/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/MobScoresPlugin.class and /dev/null differ
diff --git a/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/listeners/MobDeathListener.class b/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/listeners/MobDeathListener.class
deleted file mode 100644
index 73bc03d..0000000
Binary files a/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/listeners/MobDeathListener.class and /dev/null differ
diff --git a/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/listeners/PlayerConnectListener.class b/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/listeners/PlayerConnectListener.class
deleted file mode 100644
index 0490e60..0000000
Binary files a/MobScores/bin/com/majinnaibu/bukkit/plugins/mobscores/listeners/PlayerConnectListener.class and /dev/null differ
diff --git a/MobScores/pom.xml b/MobScores/pom.xml
new file mode 100644
index 0000000..68263e6
--- /dev/null
+++ b/MobScores/pom.xml
@@ -0,0 +1,46 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.majinnaibu.bukkitplugins</groupId>
+	<artifactId>MobScores</artifactId>
+	<packaging>jar</packaging>
+	<version>0.2-SNAPSHOT</version>
+	<name>bukkitplugin</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<id>bukkit-repo</id>
+			<url>http://repo.bukkit.org/artifactory/repo</url>
+		</repository>
+	</repositories>
+</project>
diff --git a/MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/MobScoresPlugin.java b/MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/MobScoresPlugin.java
similarity index 92%
rename from MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/MobScoresPlugin.java
rename to MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/MobScoresPlugin.java
index 4d2fd45..4ee7bcb 100644
--- a/MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/MobScoresPlugin.java
+++ b/MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/MobScoresPlugin.java
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with MobScores.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.majinnaibu.bukkit.plugins.mobscores;
+package com.majinnaibu.bukkitplugins.mobscores;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -33,9 +33,9 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.config.Configuration;
 
-import com.majinnaibu.bukkit.plugins.mobscores.listeners.MobDeathListener;
-import com.majinnaibu.bukkit.plugins.mobscores.listeners.PlayerConnectListener;
-import com.majinnaibu.bukkit.plugins.scorekeeper.ScoreKeeperPlugin;
+import com.majinnaibu.bukkitplugins.mobscores.listeners.MobDeathListener;
+import com.majinnaibu.bukkitplugins.mobscores.listeners.PlayerConnectListener;
+import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin;
 
 public class MobScoresPlugin extends JavaPlugin {
 	private final MobDeathListener _mobDeathListener = new MobDeathListener(this);
diff --git a/MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/listeners/MobDeathListener.java b/MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/listeners/MobDeathListener.java
similarity index 90%
rename from MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/listeners/MobDeathListener.java
rename to MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/listeners/MobDeathListener.java
index b892b5f..2b70d62 100644
--- a/MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/listeners/MobDeathListener.java
+++ b/MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/listeners/MobDeathListener.java
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with MobScores.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.majinnaibu.bukkit.plugins.mobscores.listeners;
+package com.majinnaibu.bukkitplugins.mobscores.listeners;
 
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -25,7 +25,7 @@ import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityListener;
 
-import com.majinnaibu.bukkit.plugins.mobscores.MobScoresPlugin;
+import com.majinnaibu.bukkitplugins.mobscores.MobScoresPlugin;
 
 public class MobDeathListener extends EntityListener {
 	private MobScoresPlugin _plugin = null; 
diff --git a/MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/listeners/PlayerConnectListener.java b/MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/listeners/PlayerConnectListener.java
similarity index 86%
rename from MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/listeners/PlayerConnectListener.java
rename to MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/listeners/PlayerConnectListener.java
index 486f7ed..8247ec8 100644
--- a/MobScores/src/com/majinnaibu/bukkit/plugins/mobscores/listeners/PlayerConnectListener.java
+++ b/MobScores/src/main/java/com/majinnaibu/bukkitplugins/mobscores/listeners/PlayerConnectListener.java
@@ -15,12 +15,12 @@ You should have received a copy of the GNU Affero General Public License
 along with MobScores.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.majinnaibu.bukkit.plugins.mobscores.listeners;
+package com.majinnaibu.bukkitplugins.mobscores.listeners;
 
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerListener;
 
-import com.majinnaibu.bukkit.plugins.mobscores.MobScoresPlugin;
+import com.majinnaibu.bukkitplugins.mobscores.MobScoresPlugin;
 
 public class PlayerConnectListener extends PlayerListener {
 private MobScoresPlugin _plugin = null; 
diff --git a/MobScores/bin/plugin.yml b/MobScores/src/main/resources/plugin.yml
similarity index 100%
rename from MobScores/bin/plugin.yml
rename to MobScores/src/main/resources/plugin.yml
diff --git a/MobScores/src/plugin.yml b/MobScores/src/plugin.yml
deleted file mode 100644
index f1cf6e4..0000000
--- a/MobScores/src/plugin.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: MobScores
-main: com.majinnaibu.bukkit.plugins.mobscores.MobScoresPlugin
-depend: [ScoreKeeper]
-version: 0.1