diff --git a/.gitattributes b/.gitattributes
index eb47cbfe65f..4f2378c0030 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13260,6 +13260,7 @@ src/main/java/forge/quest/QuestMode.java -text
 src/main/java/forge/quest/QuestUtil.java svneol=native#text/plain
 src/main/java/forge/quest/QuestUtilCards.java -text
 src/main/java/forge/quest/QuestUtilUnlockSets.java -text
+src/main/java/forge/quest/QuestWorld.java -text
 src/main/java/forge/quest/SellRules.java -text
 src/main/java/forge/quest/StartingPoolType.java -text
 src/main/java/forge/quest/bazaar/IQuestBazaarItem.java svneol=native#text/plain
@@ -13281,7 +13282,6 @@ src/main/java/forge/quest/data/QuestAssets.java -text
 src/main/java/forge/quest/data/QuestData.java svneol=native#text/plain
 src/main/java/forge/quest/data/QuestItemCondition.java -text
 src/main/java/forge/quest/data/QuestPreferences.java svneol=native#text/plain
-src/main/java/forge/quest/data/QuestWorld.java -text
 src/main/java/forge/quest/data/package-info.java svneol=native#text/plain
 src/main/java/forge/quest/io/PreconReader.java -text
 src/main/java/forge/quest/io/QuestDataIO.java svneol=native#text/plain
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 427ec7ffe5d..1246cfc1920 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -64,7 +64,6 @@ import forge.game.player.ComputerUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.item.CardDb;
-import forge.sound.SoundEffectType;
 import forge.util.Expressions;
 import forge.util.MyRandom;
 
diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index a825b5cc1ac..82ec9915420 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -71,7 +71,6 @@ import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.match.ViewWinLose;
-import forge.sound.SoundEffectType;
 
 
 /**
diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index af1d6c53dc2..5b17a747729 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -35,7 +35,6 @@ import forge.game.zone.ZoneType;
 import forge.gui.match.views.VAntes;
 import forge.item.CardPrinted;
 import forge.properties.ForgePreferences.FPref;
-import forge.sound.SoundEffectType;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
 
diff --git a/src/main/java/forge/game/event/AddCounterEvent.java b/src/main/java/forge/game/event/AddCounterEvent.java
index aa8553b55f1..12b936f6443 100644
--- a/src/main/java/forge/game/event/AddCounterEvent.java
+++ b/src/main/java/forge/game/event/AddCounterEvent.java
@@ -1,8 +1,5 @@
 package forge.game.event;
 
-import forge.Card;
-import forge.game.player.Player;
-
 /** 
  * 
  *
diff --git a/src/main/java/forge/game/event/RemoveCounterEvent.java b/src/main/java/forge/game/event/RemoveCounterEvent.java
index cd37599cab3..febe7778557 100644
--- a/src/main/java/forge/game/event/RemoveCounterEvent.java
+++ b/src/main/java/forge/game/event/RemoveCounterEvent.java
@@ -1,8 +1,5 @@
 package forge.game.event;
 
-import forge.Card;
-import forge.game.player.Player;
-
 /** 
  * 
  *
diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java
index a62c18a48bb..a3cdb6aea43 100644
--- a/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/src/main/java/forge/game/phase/PhaseHandler.java
@@ -34,7 +34,6 @@ import forge.game.event.ManaBurnEvent;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.properties.ForgePreferences.FPref;
-import forge.sound.SoundEffectType;
 import forge.util.MyObservable;
 
 
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index fd2819342de..28437f0af34 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -67,7 +67,6 @@ import forge.game.zone.PlayerZoneBattlefield;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.properties.ForgePreferences.FPref;
-import forge.sound.SoundEffectType;
 import forge.util.MyRandom;
 
 /**
diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java
index 97b2f75ffee..dbb45cc7f77 100644
--- a/src/main/java/forge/model/FModel.java
+++ b/src/main/java/forge/model/FModel.java
@@ -46,8 +46,8 @@ import forge.properties.ForgePreferences.FPref;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.QuestController;
+import forge.quest.QuestWorld;
 import forge.quest.data.QuestPreferences;
-import forge.quest.data.QuestWorld;
 import forge.util.FileUtil;
 import forge.util.HttpUtil;
 import forge.util.IStorageView;
diff --git a/src/main/java/forge/quest/QuestController.java b/src/main/java/forge/quest/QuestController.java
index f170d69500e..766fe6dbdd3 100644
--- a/src/main/java/forge/quest/QuestController.java
+++ b/src/main/java/forge/quest/QuestController.java
@@ -258,6 +258,16 @@ public class QuestController {
         return this.model == null ? null : this.model.getAssets();
     }
 
+    /**
+     * Gets the QuestWorld, if any.
+     * 
+     * @return QuestWorld or null, if using regular duels and challenges.
+     */
+    public QuestWorld getWorld() {
+        return this.model == null ? null : Singletons.getModel().getWorlds().get(this.model.getWorldId());
+    }
+    
+    
     /**
      * TODO: Write javadoc for this method.
      *
@@ -309,6 +319,8 @@ public class QuestController {
         return this.duelManager;
     }
 
+   
+    
     /**
      * 
      * TODO: Write javadoc for this method.
diff --git a/src/main/java/forge/quest/data/QuestWorld.java b/src/main/java/forge/quest/QuestWorld.java
similarity index 95%
rename from src/main/java/forge/quest/data/QuestWorld.java
rename to src/main/java/forge/quest/QuestWorld.java
index dca1d1bc171..cd215e57f5d 100644
--- a/src/main/java/forge/quest/data/QuestWorld.java
+++ b/src/main/java/forge/quest/QuestWorld.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.quest.data;
+package forge.quest;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,6 +23,7 @@ import java.util.List;
 
 import com.google.common.base.Function;
 
+import forge.quest.data.GameFormatQuest;
 import forge.util.StorageReaderFile;
 
 /** 
diff --git a/src/main/java/forge/quest/data/QuestData.java b/src/main/java/forge/quest/data/QuestData.java
index 9a2dd20545f..2c5198aeabd 100644
--- a/src/main/java/forge/quest/data/QuestData.java
+++ b/src/main/java/forge/quest/data/QuestData.java
@@ -17,7 +17,6 @@
  */
 package forge.quest.data;
 
-import forge.Singletons;
 import forge.game.GameFormat;
 import forge.quest.QuestMode;
 import forge.quest.io.QuestDataIO;
@@ -105,18 +104,6 @@ public final class QuestData {
         return this.format;
     }
 
-    /**
-     * Gets the QuestWorld, if any.
-     * 
-     * @return QuestWorld or null, if using regular duels and challenges.
-     */
-    public QuestWorld getWorld() {
-        if (this.worldId == null) {
-            return null;
-        }
-        return Singletons.getModel().getWorlds().get(worldId);
-    }
-
     // SERIALIZATION - related things
     // This must be called by XML-serializer via reflection
     /**
@@ -163,21 +150,17 @@ public final class QuestData {
         return this.name;
     }
 
-    /**
-     * TODO: Write javadoc for this method.
-     * @return
-     */
     public QuestAssets getAssets() {
         return assets;
     }
 
 
-    /**
-     * TODO: Write javadoc for this method.
-     * @return
-     */
     public QuestAchievements getAchievements() {
         return achievements;
     }
 
+    public String getWorldId() {
+        return worldId;
+    }
+
 }