diff --git a/Residence.jar b/Residence.jar
new file mode 100644
index 0000000..9dc31e8
Binary files /dev/null and b/Residence.jar differ
diff --git a/pom.xml b/pom.xml
index 5049ee9..6d2dc54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>com.herocraftonline.heroes</groupId>
             <artifactId>heroes</artifactId>
-            <version>1.5.2-dev-b1705</version>
+            <version>LATEST</version>
         </dependency>
         <dependency>
             <groupId>com.griefcraft.lwc</groupId>
@@ -108,9 +108,9 @@
             <version>1.7.9</version>
         </dependency>
         <dependency>
-            <groupId>com.bekvon.bukkit.residence</groupId>
+            <groupId>net.t00thpick1</groupId>
             <artifactId>residence</artifactId>
-            <version>2.6.6.3</version>
+            <version>3.0.0q-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar b/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar
deleted file mode 100644
index ce94950..0000000
Binary files a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar and /dev/null differ
diff --git a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.md5 b/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.md5
deleted file mode 100644
index d7556f9..0000000
--- a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-c288abe5ad73d0d781b03462fedab859
\ No newline at end of file
diff --git a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.sha1 b/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.sha1
deleted file mode 100644
index f6e8b32..0000000
--- a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b5cb3489880cba5e70cc0d630191c936994b6d7e
\ No newline at end of file
diff --git a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.md5 b/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.md5
deleted file mode 100644
index 4ad2d7f..0000000
--- a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-80eebf7358e0b24a1603c3d91c0084e0
\ No newline at end of file
diff --git a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.sha1 b/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.sha1
deleted file mode 100644
index 55cda38..0000000
--- a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d2ad2cfea6ac2ba9b897f8b2e3bc13d5fd3100d0
\ No newline at end of file
diff --git a/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.md5 b/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.md5
deleted file mode 100644
index f9f02ad..0000000
--- a/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-0d631fa3e5f6be116e2894b875cb84a3
\ No newline at end of file
diff --git a/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.sha1 b/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.sha1
deleted file mode 100644
index 0ac70f4..0000000
--- a/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-831ca82cccbfc921495544182212b3eed99e18ba
\ No newline at end of file
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml
new file mode 100644
index 0000000..f0bb0a5
--- /dev/null
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>net.t00thpick1</groupId>
+  <artifactId>residence</artifactId>
+  <version>3.0.0q-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20140629150451</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>3.0.0q-SNAPSHOT</value>
+        <updated>20140629150451</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>3.0.0q-SNAPSHOT</value>
+        <updated>20140629150451</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.md5 b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.md5
new file mode 100644
index 0000000..ba2235d
--- /dev/null
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.md5
@@ -0,0 +1 @@
+d6395958ea8e8bfa44d476608b1fb990
\ No newline at end of file
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.sha1 b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.sha1
new file mode 100644
index 0000000..6b7b38c
--- /dev/null
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.sha1
@@ -0,0 +1 @@
+f364e694abbd6efe96635a22b101157b0f5f2e6d
\ No newline at end of file
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar
new file mode 100644
index 0000000..9dc31e8
Binary files /dev/null and b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar differ
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.md5 b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.md5
new file mode 100644
index 0000000..d7a997e
--- /dev/null
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.md5
@@ -0,0 +1 @@
+c17eb71c42adf83e9d7ecd19a56f46e3
\ No newline at end of file
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.sha1 b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.sha1
new file mode 100644
index 0000000..1e10d93
--- /dev/null
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+cda76504b52d728ef3ebe4b90d3c212d71de7fb4
\ No newline at end of file
diff --git a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom
similarity index 83%
rename from repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom
rename to repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom
index e30f54a..d8518a4 100644
--- a/repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom
@@ -2,8 +2,8 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.bekvon.bukkit.residence</groupId>
+  <groupId>net.t00thpick1</groupId>
   <artifactId>residence</artifactId>
-  <version>2.6.6.3</version>
+  <version>3.0.0q-SNAPSHOT</version>
   <description>POM was created from install:install-file</description>
 </project>
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.md5 b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..77f8340
--- /dev/null
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+88f1e831b70e82d15f327471103442e6
\ No newline at end of file
diff --git a/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.sha1 b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..fbb9bda
--- /dev/null
+++ b/repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+3d116d9d5e97e783ed1953f3fc320d212e3f0afc
\ No newline at end of file
diff --git a/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml b/repo/net/t00thpick1/residence/maven-metadata-local.xml
similarity index 50%
rename from repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml
rename to repo/net/t00thpick1/residence/maven-metadata-local.xml
index 6f9549c..940b4c9 100644
--- a/repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml
+++ b/repo/net/t00thpick1/residence/maven-metadata-local.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <groupId>com.bekvon.bukkit.residence</groupId>
+  <groupId>net.t00thpick1</groupId>
   <artifactId>residence</artifactId>
   <versioning>
-    <release>2.6.6.3</release>
     <versions>
-      <version>2.6.6.3</version>
+      <version>3.0.0q-SNAPSHOT</version>
     </versions>
-    <lastUpdated>20130308191747</lastUpdated>
+    <lastUpdated>20140629150451</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repo/net/t00thpick1/residence/maven-metadata-local.xml.md5 b/repo/net/t00thpick1/residence/maven-metadata-local.xml.md5
new file mode 100644
index 0000000..18d68dd
--- /dev/null
+++ b/repo/net/t00thpick1/residence/maven-metadata-local.xml.md5
@@ -0,0 +1 @@
+362ac5203d5aa3841a90caa7e0cf35df
\ No newline at end of file
diff --git a/repo/net/t00thpick1/residence/maven-metadata-local.xml.sha1 b/repo/net/t00thpick1/residence/maven-metadata-local.xml.sha1
new file mode 100644
index 0000000..4a65663
--- /dev/null
+++ b/repo/net/t00thpick1/residence/maven-metadata-local.xml.sha1
@@ -0,0 +1 @@
+1d6a3c2680f9e18250428165450aa32562e0ed98
\ No newline at end of file
diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java b/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java
index 56166b9..183ac15 100644
--- a/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java
+++ b/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java
@@ -1,8 +1,10 @@
 package com.Acrobot.ChestShop.Plugins;
 
 import com.Acrobot.ChestShop.Events.Protection.ProtectionCheckEvent;
-import com.bekvon.bukkit.residence.Residence;
-import com.bekvon.bukkit.residence.protection.ClaimedResidence;
+import net.t00thpick1.residence.Residence;
+import net.t00thpick1.residence.api.ResidenceAPI;
+import net.t00thpick1.residence.api.areas.ResidenceArea;
+import net.t00thpick1.residence.api.flags.FlagManager;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
@@ -11,6 +13,7 @@ import org.bukkit.event.Listener;
 
 /**
  * @author TOOTHPlCK1
+ * @author Andrzej Pomirski
  */
 public class ResidenceChestProtection implements Listener {
 
@@ -22,10 +25,10 @@ public class ResidenceChestProtection implements Listener {
 
         Block block = event.getBlock();
         Player player = event.getPlayer();
-        ClaimedResidence res = Residence.getResidenceManager().getByLoc(block.getLocation());
+        ResidenceArea area = ResidenceAPI.getResidenceManager().getByLocation(block.getLocation());
 
-        if (res != null) {
-            if (!res.getPermissions().playerHas(player.getName(), "container", false) && !Residence.isResAdminOn(player)) {
+        if (area != null) {
+            if (!area.allowAction(player.getName(), FlagManager.CONTAINER) && !Residence.getInstance().isAdminMode(player)) {
                 //Doesn't have permissions to that chest.
                 event.setResult(Event.Result.DENY);
             }