diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..ed1b49b
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,83 @@
+<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>me.lenis0012.mr</groupId>
+  <artifactId>Marriage Reloaded</artifactId>
+  <version>1.09-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Marriage Reloaded</name>
+  <url>http://dev.bukkit.org/server-mods/marriage-reloaded/</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <repositories>
+    <!-- Repo for access to Vault -->
+    <repository>
+      <id>vault-repo</id>
+      <url>http://ci.herocraftonline.com/plugin/repository/everything/</url>
+    </repository>
+    <!-- Repo for access to CraftBukkit -->
+    <repository>
+      <id>bukkit-repo</id>
+      <url>http://repo.bukkit.org/content/groups/public</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.5.1-R0.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>net.milkbowl.vault</groupId>
+      <artifactId>Vault</artifactId>
+      <version>1.2.23-SNAPSHOT</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- Build -->
+  <build>
+    <!-- Resources -->
+    <resources>
+	  <resource>
+	    <directory>src/main/java/</directory>
+		<includes>
+          <include>**</include>
+		</includes>
+        <!-- Don't add source files to target jar -->
+	    <excludes>
+		  <exclude>me/lenis0012/**/*.java</exclude>
+		</excludes>
+	  </resource>
+	</resources>
+	<defaultGoal>clean install</defaultGoal>
+	<!-- Plugins -->
+	<plugins>
+	  <!-- Compiler plugin -->
+	  <plugin>
+	    <groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<version>2.4</version>
+		<configuration>
+		  <source>1.6</source>
+		  <target>1.6</target>
+		  <showWarnings>true</showWarnings>
+		  <showDeprecation>true</showDeprecation>
+		</configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/src/me/lenis0012/mr/MPlayer.java b/src/main/java/me/lenis0012/mr/MPlayer.java
similarity index 100%
rename from src/me/lenis0012/mr/MPlayer.java
rename to src/main/java/me/lenis0012/mr/MPlayer.java
diff --git a/src/me/lenis0012/mr/Marriage.java b/src/main/java/me/lenis0012/mr/Marriage.java
similarity index 100%
rename from src/me/lenis0012/mr/Marriage.java
rename to src/main/java/me/lenis0012/mr/Marriage.java
diff --git a/src/me/lenis0012/mr/Metrics.java b/src/main/java/me/lenis0012/mr/Metrics.java
similarity index 100%
rename from src/me/lenis0012/mr/Metrics.java
rename to src/main/java/me/lenis0012/mr/Metrics.java
diff --git a/src/me/lenis0012/mr/PlayerConfig.java b/src/main/java/me/lenis0012/mr/PlayerConfig.java
similarity index 100%
rename from src/me/lenis0012/mr/PlayerConfig.java
rename to src/main/java/me/lenis0012/mr/PlayerConfig.java
diff --git a/src/me/lenis0012/mr/SimpleMPlayer.java b/src/main/java/me/lenis0012/mr/SimpleMPlayer.java
similarity index 100%
rename from src/me/lenis0012/mr/SimpleMPlayer.java
rename to src/main/java/me/lenis0012/mr/SimpleMPlayer.java
diff --git a/src/me/lenis0012/mr/commands/AcceptCommand.java b/src/main/java/me/lenis0012/mr/commands/AcceptCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/AcceptCommand.java
rename to src/main/java/me/lenis0012/mr/commands/AcceptCommand.java
index 9059402..8365c96 100644
--- a/src/me/lenis0012/mr/commands/AcceptCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/AcceptCommand.java
@@ -8,6 +8,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 public class AcceptCommand extends CommandBase {
 
 	@Override
diff --git a/src/me/lenis0012/mr/commands/ChatCommand.java b/src/main/java/me/lenis0012/mr/commands/ChatCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/ChatCommand.java
rename to src/main/java/me/lenis0012/mr/commands/ChatCommand.java
index 3023a5b..39a86b3 100644
--- a/src/me/lenis0012/mr/commands/ChatCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/ChatCommand.java
@@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 import me.lenis0012.mr.MPlayer;
 import me.lenis0012.mr.lang.Messages;
 import me.lenis0012.mr.util.EcoUtil;
diff --git a/src/me/lenis0012/mr/commands/CommandBase.java b/src/main/java/me/lenis0012/mr/commands/CommandBase.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/CommandBase.java
rename to src/main/java/me/lenis0012/mr/commands/CommandBase.java
index 4b41261..9c21b2c 100644
--- a/src/me/lenis0012/mr/commands/CommandBase.java
+++ b/src/main/java/me/lenis0012/mr/commands/CommandBase.java
@@ -7,6 +7,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 public abstract class CommandBase {
 	private boolean isPlayer;
 	Marriage plugin = Marriage.instance;
diff --git a/src/me/lenis0012/mr/commands/DivorceCommand.java b/src/main/java/me/lenis0012/mr/commands/DivorceCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/DivorceCommand.java
rename to src/main/java/me/lenis0012/mr/commands/DivorceCommand.java
index f418bef..e13dac3 100644
--- a/src/me/lenis0012/mr/commands/DivorceCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/DivorceCommand.java
@@ -8,6 +8,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 public class DivorceCommand extends CommandBase {
 	@Override
 	public void perform(CommandSender sender, String[] args) {
diff --git a/src/me/lenis0012/mr/commands/GiftCommand.java b/src/main/java/me/lenis0012/mr/commands/GiftCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/GiftCommand.java
rename to src/main/java/me/lenis0012/mr/commands/GiftCommand.java
index 3fdbc08..b9383e1 100644
--- a/src/me/lenis0012/mr/commands/GiftCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/GiftCommand.java
@@ -11,6 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class GiftCommand extends CommandBase {
 
 	@Override
diff --git a/src/me/lenis0012/mr/commands/HomeCommand.java b/src/main/java/me/lenis0012/mr/commands/HomeCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/HomeCommand.java
rename to src/main/java/me/lenis0012/mr/commands/HomeCommand.java
index f122112..27b31d4 100644
--- a/src/me/lenis0012/mr/commands/HomeCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/HomeCommand.java
@@ -8,6 +8,7 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 public class HomeCommand extends CommandBase {
 
 	@Override
diff --git a/src/me/lenis0012/mr/commands/InfoCommand.java b/src/main/java/me/lenis0012/mr/commands/InfoCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/InfoCommand.java
rename to src/main/java/me/lenis0012/mr/commands/InfoCommand.java
index cbed08b..2fbb8f7 100644
--- a/src/me/lenis0012/mr/commands/InfoCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/InfoCommand.java
@@ -1,11 +1,13 @@
 package me.lenis0012.mr.commands;
 
+
 import me.lenis0012.mr.MPlayer;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 public class InfoCommand extends CommandBase {
 
 	@Override
diff --git a/src/me/lenis0012/mr/commands/listCommand.java b/src/main/java/me/lenis0012/mr/commands/ListCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/listCommand.java
rename to src/main/java/me/lenis0012/mr/commands/ListCommand.java
index db277a3..96f48bc 100644
--- a/src/me/lenis0012/mr/commands/listCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/ListCommand.java
@@ -8,6 +8,7 @@ import me.lenis0012.mr.lang.Messages;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
+
 public class ListCommand extends CommandBase {
 
 	@Override
diff --git a/src/me/lenis0012/mr/commands/MarryCMD.java b/src/main/java/me/lenis0012/mr/commands/MarryCMD.java
similarity index 100%
rename from src/me/lenis0012/mr/commands/MarryCMD.java
rename to src/main/java/me/lenis0012/mr/commands/MarryCMD.java
diff --git a/src/me/lenis0012/mr/commands/MarryCommand.java b/src/main/java/me/lenis0012/mr/commands/MarryCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/MarryCommand.java
rename to src/main/java/me/lenis0012/mr/commands/MarryCommand.java
index d9a3375..49038b5 100644
--- a/src/me/lenis0012/mr/commands/MarryCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/MarryCommand.java
@@ -4,6 +4,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 import me.lenis0012.mr.MPlayer;
 import me.lenis0012.mr.lang.Messages;
 import me.lenis0012.mr.util.EcoUtil;
diff --git a/src/me/lenis0012/mr/commands/ReloadCommand.java b/src/main/java/me/lenis0012/mr/commands/ReloadCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/ReloadCommand.java
rename to src/main/java/me/lenis0012/mr/commands/ReloadCommand.java
index fbf289c..0b3efbf 100644
--- a/src/me/lenis0012/mr/commands/ReloadCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/ReloadCommand.java
@@ -5,6 +5,7 @@ import me.lenis0012.mr.lang.LangConfig;
 
 import org.bukkit.command.CommandSender;
 
+
 public class ReloadCommand extends CommandBase {
 
 	@Override
diff --git a/src/me/lenis0012/mr/commands/SethomeCommand.java b/src/main/java/me/lenis0012/mr/commands/SethomeCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/SethomeCommand.java
rename to src/main/java/me/lenis0012/mr/commands/SethomeCommand.java
index ade4bb3..ed59d76 100644
--- a/src/me/lenis0012/mr/commands/SethomeCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/SethomeCommand.java
@@ -9,6 +9,7 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 public class SethomeCommand extends CommandBase {
 
 	@Override
diff --git a/src/me/lenis0012/mr/commands/TpCommand.java b/src/main/java/me/lenis0012/mr/commands/TpCommand.java
similarity index 99%
rename from src/me/lenis0012/mr/commands/TpCommand.java
rename to src/main/java/me/lenis0012/mr/commands/TpCommand.java
index 76c0260..38a744a 100644
--- a/src/me/lenis0012/mr/commands/TpCommand.java
+++ b/src/main/java/me/lenis0012/mr/commands/TpCommand.java
@@ -8,6 +8,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+
 public class TpCommand extends CommandBase {
 	
 	@Override
diff --git a/src/me/lenis0012/mr/lang/LangConfig.java b/src/main/java/me/lenis0012/mr/lang/LangConfig.java
similarity index 99%
rename from src/me/lenis0012/mr/lang/LangConfig.java
rename to src/main/java/me/lenis0012/mr/lang/LangConfig.java
index e1db732..8236cdf 100644
--- a/src/me/lenis0012/mr/lang/LangConfig.java
+++ b/src/main/java/me/lenis0012/mr/lang/LangConfig.java
@@ -5,11 +5,13 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.logging.Level;
 
+
 import me.lenis0012.mr.Marriage;
 
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
+
 public class LangConfig extends YamlConfiguration {
 	private static LangConfig instance;
 	
diff --git a/src/me/lenis0012/mr/lang/Messages.java b/src/main/java/me/lenis0012/mr/lang/Messages.java
similarity index 100%
rename from src/me/lenis0012/mr/lang/Messages.java
rename to src/main/java/me/lenis0012/mr/lang/Messages.java
diff --git a/src/me/lenis0012/mr/listeners/PlayerListener.java b/src/main/java/me/lenis0012/mr/listeners/PlayerListener.java
similarity index 99%
rename from src/me/lenis0012/mr/listeners/PlayerListener.java
rename to src/main/java/me/lenis0012/mr/listeners/PlayerListener.java
index 31e5e63..c49a623 100644
--- a/src/me/lenis0012/mr/listeners/PlayerListener.java
+++ b/src/main/java/me/lenis0012/mr/listeners/PlayerListener.java
@@ -17,6 +17,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 
+
 public class PlayerListener implements Listener {
 	private Marriage plugin;
 	public PlayerListener(Marriage i) { plugin = i; }
diff --git a/src/me/lenis0012/mr/util/EcoUtil.java b/src/main/java/me/lenis0012/mr/util/EcoUtil.java
similarity index 99%
rename from src/me/lenis0012/mr/util/EcoUtil.java
rename to src/main/java/me/lenis0012/mr/util/EcoUtil.java
index fbe1f1f..ee6bf32 100644
--- a/src/me/lenis0012/mr/util/EcoUtil.java
+++ b/src/main/java/me/lenis0012/mr/util/EcoUtil.java
@@ -1,8 +1,10 @@
 package me.lenis0012.mr.util;
 
+import me.lenis0012.mr.Marriage;
+
 import org.bukkit.entity.Player;
 
-import me.lenis0012.mr.Marriage;
+
 
 public class EcoUtil {
 	private static String msg = "&7Removed &f${Price} &7from your balance";
diff --git a/src/me/lenis0012/mr/util/PacketUtil.java b/src/main/java/me/lenis0012/mr/util/PacketUtil.java
similarity index 97%
rename from src/me/lenis0012/mr/util/PacketUtil.java
rename to src/main/java/me/lenis0012/mr/util/PacketUtil.java
index c30e6c6..ba01b88 100644
--- a/src/me/lenis0012/mr/util/PacketUtil.java
+++ b/src/main/java/me/lenis0012/mr/util/PacketUtil.java
@@ -23,7 +23,7 @@ public class PacketUtil {
 	public static void createHearts(Player player, Location loc) {
 		final DataWatcher tmp = new DataWatcher();
 		final EntityPlayer ep = ((CraftPlayer) player).getHandle();
-		final int entityId = Short.MAX_VALUE - random.nextInt(100);
+		final int entityId = Short.MAX_VALUE - 200 - random.nextInt(100);
 		tmp.a(0, Byte.valueOf((byte) 32)); //32
 		tmp.a(12, Integer.valueOf((int) 0));
 		
diff --git a/src/me/lenis0012/mr/util/PlayerUtil.java b/src/main/java/me/lenis0012/mr/util/PlayerUtil.java
similarity index 100%
rename from src/me/lenis0012/mr/util/PlayerUtil.java
rename to src/main/java/me/lenis0012/mr/util/PlayerUtil.java
diff --git a/src/plugin.yml b/src/main/java/plugin.yml
similarity index 100%
rename from src/plugin.yml
rename to src/main/java/plugin.yml