diff --git a/ScoreKeeper/.classpath b/ScoreKeeper/.classpath
new file mode 100644
index 0000000..8fe0193
--- /dev/null
+++ b/ScoreKeeper/.classpath
@@ -0,0 +1,8 @@
+<?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="output" path="target/classes"/>
+</classpath>
diff --git a/ScoreKeeper/.project b/ScoreKeeper/.project
new file mode 100644
index 0000000..2a90c04
--- /dev/null
+++ b/ScoreKeeper/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ScoreKeeper</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/ScoreKeeper/.settings/org.eclipse.core.resources.prefs b/ScoreKeeper/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f686e69
--- /dev/null
+++ b/ScoreKeeper/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+#Sun Feb 19 04:11:12 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/ScoreKeeper/.settings/org.eclipse.jdt.core.prefs b/ScoreKeeper/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b83fc05
--- /dev/null
+++ b/ScoreKeeper/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Sun Feb 19 04:11:12 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/ScoreKeeper/.settings/org.eclipse.m2e.core.prefs b/ScoreKeeper/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..069baa2
--- /dev/null
+++ b/ScoreKeeper/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Sun Feb 19 04:11:11 PST 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/ScoreKeeper/pom.xml b/ScoreKeeper/pom.xml
new file mode 100644
index 0000000..0d0cfe9
--- /dev/null
+++ b/ScoreKeeper/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>ScoreKeeper</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/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/ScoreKeeperPlugin.java b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/ScoreKeeperPlugin.java
similarity index 77%
rename from ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/ScoreKeeperPlugin.java
rename to ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/ScoreKeeperPlugin.java
index 4d5349e..953283a 100644
--- a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/ScoreKeeperPlugin.java
+++ b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/ScoreKeeperPlugin.java
@@ -1,4 +1,4 @@
-package com.majinnaibu.bukkit.plugins.scorekeeper;
+package com.majinnaibu.bukkitplugins.scorekeeper;
 
 import java.util.HashMap;
 import java.util.logging.Logger;
@@ -7,11 +7,11 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.majinnaibu.bukkit.plugins.scorekeeper.commands.ScoreAddCommand;
-import com.majinnaibu.bukkit.plugins.scorekeeper.commands.ScoreArchiveCommand;
-import com.majinnaibu.bukkit.plugins.scorekeeper.commands.ScoreGetCommand;
-import com.majinnaibu.bukkit.plugins.scorekeeper.commands.ScoreResetCommand;
-import com.majinnaibu.bukkit.plugins.scorekeeper.commands.ScoreSubtractCommand;
+import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreAddCommand;
+import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreArchiveCommand;
+import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreGetCommand;
+import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreResetCommand;
+import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreSubtractCommand;
 
 public class ScoreKeeperPlugin extends JavaPlugin {
 	private final HashMap<Player, Integer> _playerScores = new HashMap<Player, Integer>();
diff --git a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreAddCommand.java b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreAddCommand.java
similarity index 90%
rename from ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreAddCommand.java
rename to ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreAddCommand.java
index cc2a906..a275def 100644
--- a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreAddCommand.java
+++ b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreAddCommand.java
@@ -1,4 +1,4 @@
-package com.majinnaibu.bukkit.plugins.scorekeeper.commands;
+package com.majinnaibu.bukkitplugins.scorekeeper.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkit.plugins.scorekeeper.ScoreKeeperPlugin;
+import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin;
 
 public class ScoreAddCommand implements CommandExecutor {
 	private final ScoreKeeperPlugin _plugin;
diff --git a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreArchiveCommand.java b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreArchiveCommand.java
similarity index 84%
rename from ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreArchiveCommand.java
rename to ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreArchiveCommand.java
index 5638923..1d10ccb 100644
--- a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreArchiveCommand.java
+++ b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreArchiveCommand.java
@@ -1,4 +1,4 @@
-package com.majinnaibu.bukkit.plugins.scorekeeper.commands;
+package com.majinnaibu.bukkitplugins.scorekeeper.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkit.plugins.scorekeeper.ScoreKeeperPlugin;
+import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin;
 
 public class ScoreArchiveCommand implements CommandExecutor {
 	private final ScoreKeeperPlugin _plugin;
diff --git a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreGetCommand.java b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreGetCommand.java
similarity index 91%
rename from ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreGetCommand.java
rename to ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreGetCommand.java
index 30252d8..8760191 100644
--- a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreGetCommand.java
+++ b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreGetCommand.java
@@ -1,4 +1,4 @@
-package com.majinnaibu.bukkit.plugins.scorekeeper.commands;
+package com.majinnaibu.bukkitplugins.scorekeeper.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkit.plugins.scorekeeper.ScoreKeeperPlugin;
+import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin;
 
 public class ScoreGetCommand implements CommandExecutor {
 	private final ScoreKeeperPlugin _plugin;
diff --git a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreResetCommand.java b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreResetCommand.java
similarity index 90%
rename from ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreResetCommand.java
rename to ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreResetCommand.java
index 7686d7e..169ac40 100644
--- a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreResetCommand.java
+++ b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreResetCommand.java
@@ -1,4 +1,4 @@
-package com.majinnaibu.bukkit.plugins.scorekeeper.commands;
+package com.majinnaibu.bukkitplugins.scorekeeper.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkit.plugins.scorekeeper.ScoreKeeperPlugin;
+import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin;
 
 public class ScoreResetCommand implements CommandExecutor {
 	private final ScoreKeeperPlugin _plugin;
diff --git a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreSubtractCommand.java b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreSubtractCommand.java
similarity index 90%
rename from ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreSubtractCommand.java
rename to ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreSubtractCommand.java
index fe0d508..bd97c0d 100644
--- a/ScoreKeeper/src/com/majinnaibu/bukkit/plugins/scorekeeper/commands/ScoreSubtractCommand.java
+++ b/ScoreKeeper/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreSubtractCommand.java
@@ -1,4 +1,4 @@
-package com.majinnaibu.bukkit.plugins.scorekeeper.commands;
+package com.majinnaibu.bukkitplugins.scorekeeper.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkit.plugins.scorekeeper.ScoreKeeperPlugin;
+import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin;
 
 public class ScoreSubtractCommand implements CommandExecutor {
 	private final ScoreKeeperPlugin _plugin;
diff --git a/ScoreKeeper/src/plugin.yml b/ScoreKeeper/src/main/resources/plugin.yml
similarity index 100%
rename from ScoreKeeper/src/plugin.yml
rename to ScoreKeeper/src/main/resources/plugin.yml