diff --git a/Metropolis/.classpath b/Metropolis/.classpath
index 5c0ed6b..802cf8e 100644
--- a/Metropolis/.classpath
+++ b/Metropolis/.classpath
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/bukkit-1.1-R3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/WorldGuard.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="lib" path="C:/Users/Tom/.m2/repository/org/bukkit/bukkit/1.1-R4-SNAPSHOT/bukkit-1.1-R4-SNAPSHOT.jar">
+		<attributes>
+			<attribute name="maven.groupId" value="org.bukkit"/>
+			<attribute name="maven.artifactId" value="bukkit"/>
+			<attribute name="maven.version" value="1.1-R4-SNAPSHOT"/>
+			<attribute name="maven.scope" value="compile"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/Metropolis/.project b/Metropolis/.project
index 2819a03..9a2c887 100644
--- a/Metropolis/.project
+++ b/Metropolis/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/Metropolis/.settings/org.eclipse.jdt.core.prefs b/Metropolis/.settings/org.eclipse.jdt.core.prefs
index a213a68..1e55a80 100644
--- a/Metropolis/.settings/org.eclipse.jdt.core.prefs
+++ b/Metropolis/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sun Feb 05 03:44:35 PST 2012
+#Sat Feb 18 20:11:20 PST 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -9,4 +9,5 @@ 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.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.6
diff --git a/Metropolis/.settings/org.eclipse.ltk.core.refactoring.prefs b/Metropolis/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..fbb7c10
--- /dev/null
+++ b/Metropolis/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Sat Feb 18 20:11:20 PST 2012
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/Metropolis/.settings/org.eclipse.m2e.core.prefs b/Metropolis/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..e1211d3
--- /dev/null
+++ b/Metropolis/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Sat Feb 18 18:33:58 PST 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/Metropolis/pom.xml b/Metropolis/pom.xml
new file mode 100644
index 0000000..a1f46f2
--- /dev/null
+++ b/Metropolis/pom.xml
@@ -0,0 +1,7 @@
+<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>com.majinnaibu.bukkitplugins</groupId>
+  <artifactId>Metropolis</artifactId>
+  <version>0.4.5-SNAPSHOT</version>
+  <name>Metropolis</name>
+</project>
\ No newline at end of file
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java
similarity index 94%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java
index b309b7e..73f3158 100644
--- a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java
+++ b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java
@@ -2,14 +2,10 @@ package com.majinnaibu.bukkit.plugins.metropolis;
 
 import java.util.logging.Logger;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
 
 import com.sk89q.worldedit.BlockVector;
 
-@Entity
 public class Cuboid implements Comparable<Cuboid> {
-	@Id
 	private int id;
 	
 	public int minX;
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java
similarity index 100%
rename from Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java
rename to Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java
diff --git a/Metropolis/src/config.yml b/Metropolis/src/main/resources/Metropolis/config.yml
similarity index 100%
rename from Metropolis/src/config.yml
rename to Metropolis/src/main/resources/Metropolis/config.yml
diff --git a/Metropolis/src/plugin.yml b/Metropolis/src/main/resources/plugin.yml
similarity index 100%
rename from Metropolis/src/plugin.yml
rename to Metropolis/src/main/resources/plugin.yml