diff --git a/pom.xml b/pom.xml
index 2e21989f..9ecd63e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,11 @@
             <artifactId>holographicdisplaysapi</artifactId>
             <version>2.1.7</version>
         </dependency>
+        <dependency>
+            <groupId>pl.betoncraft.betonquest</groupId>
+            <artifactId>BetonQuest</artifactId>
+            <version>1.8.5</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -120,13 +125,17 @@
             <id>vault-repo</id>
             <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
         </repository>
-        <repository>
-            <id>dre2n-repo</id>
-            <url>http://feuerstern.bplaced.net/repo/</url>
-        </repository>
         <repository>
             <id>citizens-repo</id>
             <url>http://repo.citizensnpcs.co/</url>
         </repository>
+        <repository>
+            <id>betonquest-repo</id>
+            <url>http://betonquest.betoncraft.pl/mvn</url>
+        </repository>
+        <repository>
+            <id>dre2n-repo</id>
+            <url>http://feuerstern.bplaced.net/repo/</url>
+        </repository>
     </repositories>
 </project>
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java
index 90402fb9..a8bcc6c6 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java
@@ -52,14 +52,12 @@ public class ListCommand extends BRCommand {
 
     @Override
     public void onExecute(String[] args, CommandSender sender) {
-        File dungeonFolder = new File(plugin.getDataFolder() + "/dungeons");
-        File mapFolder = new File(plugin.getDataFolder() + "/maps");
         ArrayList<String> dungeonList = new ArrayList<>();
         for (Dungeon dungeon : plugin.getDungeons().getDungeons()) {
             dungeonList.add(dungeon.getName());
         }
         ArrayList<String> mapList = new ArrayList<>();
-        for (File file : mapFolder.listFiles()) {
+        for (File file : DungeonsXL.MAPS.listFiles()) {
             mapList.add(file.getName());
         }
         ArrayList<String> loadedList = new ArrayList<>();
@@ -141,7 +139,7 @@ public class ListCommand extends BRCommand {
             case 1:
                 MessageUtil.sendMessage(sender, "&4Dungeon&7 | &eMap count");
                 for (String dungeon : toSend) {
-                    DungeonConfig dungeonConfig = new DungeonConfig(new File(dungeonFolder, dungeon + ".yml"));
+                    DungeonConfig dungeonConfig = new DungeonConfig(new File(DungeonsXL.DUNGEONS, dungeon + ".yml"));
                     int count = dungeonConfig.getFloors().size() + 2;
                     MessageUtil.sendMessage(sender, "&b" + dungeon + "&7 | &e" + count);
                 }
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java
index 53f0143d..7650433d 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java
@@ -24,7 +24,6 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import java.io.File;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.PluginManager;
@@ -48,8 +47,8 @@ public class MainCommand extends BRCommand {
     public void onExecute(String[] args, CommandSender sender) {
         PluginManager plugins = Bukkit.getServer().getPluginManager();
 
-        int maps = new File(plugin.getDataFolder() + "/maps").listFiles().length;
-        int dungeons = new File(plugin.getDataFolder() + "/dungeons").listFiles().length;
+        int maps = DungeonsXL.MAPS.listFiles().length;
+        int dungeons = DungeonsXL.DUNGEONS.listFiles().length;
         int loaded = plugin.getDWorlds().getEditWorlds().size() + plugin.getDWorlds().getGameWorlds().size();
         int players = plugin.getDPlayers().getDGamePlayers().size();
         Internals internals = CompatibilityHandler.getInstance().getInternals();
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java
index b40d08d8..74bbf18a 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java
@@ -49,8 +49,8 @@ public class ReloadCommand extends BRCommand {
     public void onExecute(String[] args, CommandSender sender) {
         PluginManager plugins = Bukkit.getServer().getPluginManager();
 
-        int maps = new File(plugin.getDataFolder() + "/maps").listFiles().length;
-        int dungeons = new File(plugin.getDataFolder() + "/dungeons").listFiles().length;
+        int maps = DungeonsXL.MAPS.listFiles().length;
+        int dungeons = DungeonsXL.DUNGEONS.listFiles().length;
         int loaded = plugin.getDWorlds().getEditWorlds().size() + plugin.getDWorlds().getGameWorlds().size();
         int players = plugin.getDPlayers().getDGamePlayers().size();
         Internals internals = CompatibilityHandler.getInstance().getInternals();
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java b/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java
index f121d86f..4fbcc2fd 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java
@@ -36,7 +36,7 @@ public class Dungeon {
     public Dungeon(String name) {
         this.name = name;
 
-        File file = new File(DungeonsXL.getInstance().getDataFolder() + "/dungeons", name + ".yml");
+        File file = new File(DungeonsXL.DUNGEONS, name + ".yml");
         if (file.exists()) {
             this.config = new DungeonConfig(file);
         }
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java b/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java
index 64b4ad5a..2f5f8c13 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java
@@ -29,8 +29,10 @@ public class Dungeons {
     private List<Dungeon> dungeons = new ArrayList<>();
 
     public Dungeons() {
-        File folder = new File(DungeonsXL.getInstance().getDataFolder() + "/dungeons");
+        this(DungeonsXL.DUNGEONS);
+    }
 
+    public Dungeons(File folder) {
         if (!folder.exists()) {
             folder.mkdir();
         }
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java b/src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java
index 686bf150..556fe5e8 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java
@@ -16,7 +16,6 @@
  */
 package io.github.dre2n.dungeonsxl.game;
 
-import io.github.dre2n.caliburn.item.UniversalItem;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.requirement.Requirement;
 import io.github.dre2n.dungeonsxl.reward.Reward;
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java b/src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java
index 55013ed0..c8f6fe55 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java
@@ -19,7 +19,6 @@ package io.github.dre2n.dungeonsxl.listener;
 import io.github.dre2n.commons.util.guiutil.ButtonClickEvent;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.announcer.Announcer;
-import io.github.dre2n.dungeonsxl.config.DMessages;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java
index 7799a3f0..82af6166 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java
@@ -23,7 +23,6 @@ import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.config.DungeonConfig;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupFinishDungeonEvent;
-import io.github.dre2n.dungeonsxl.event.dgroup.DGroupFinishFloorEvent;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupRewardEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerFinishEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent;