Renaming & refactoring

79 files changed, 344 insertions, 395 deletions

diff --git a/src/main/java/com/leonardobishop/quests/QuestCompleter.java b/src/main/java/com/leonardobishop/quests/QuestCompleter.java
index 09c9b01d..f31e5daa 100644
--- a/src/main/java/com/leonardobishop/quests/QuestCompleter.java
+++ b/src/main/java/com/leonardobishop/quests/QuestCompleter.java
@@ -4,8 +4,8 @@ import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/leonardobishop/quests/Quests.java b/src/main/java/com/leonardobishop/quests/Quests.java
index 119ebfc0..5cafa5ad 100644
--- a/src/main/java/com/leonardobishop/quests/Quests.java
+++ b/src/main/java/com/leonardobishop/quests/Quests.java
@@ -1,62 +1,62 @@
 package com.leonardobishop.quests;
 
-import com.leonardobishop.quests.commands.CommandQuests;
-import com.leonardobishop.quests.events.EventPlayerJoin;
-import com.leonardobishop.quests.events.EventPlayerLeave;
-import com.leonardobishop.quests.events.MenuController;
-import com.leonardobishop.quests.hooks.coreprotect.CoreProtectHook;
-import com.leonardobishop.quests.hooks.coreprotect.CoreProtectNoHook;
-import com.leonardobishop.quests.hooks.coreprotect.ICoreProtectHook;
-import com.leonardobishop.quests.hooks.itemgetter.ItemGetter;
-import com.leonardobishop.quests.hooks.itemgetter.ItemGetterLatest;
-import com.leonardobishop.quests.hooks.itemgetter.ItemGetter_1_13;
-import com.leonardobishop.quests.hooks.itemgetter.ItemGetter_Late_1_8;
-import com.leonardobishop.quests.hooks.papi.IPlaceholderAPIHook;
-import com.leonardobishop.quests.hooks.papi.PlaceholderAPIHook;
-import com.leonardobishop.quests.hooks.title.Title;
-import com.leonardobishop.quests.hooks.title.Title_Bukkit;
-import com.leonardobishop.quests.hooks.title.Title_BukkitNoTimings;
-import com.leonardobishop.quests.hooks.title.Title_Other;
+import com.leonardobishop.quests.command.QuestsCommand;
+import com.leonardobishop.quests.listener.PlayerJoinListener;
+import com.leonardobishop.quests.listener.PlayerLeaveListener;
+import com.leonardobishop.quests.listener.MenuController;
+import com.leonardobishop.quests.hook.coreprotect.CoreProtectHook;
+import com.leonardobishop.quests.hook.coreprotect.CoreProtectNoHook;
+import com.leonardobishop.quests.hook.coreprotect.ICoreProtectHook;
+import com.leonardobishop.quests.hook.itemgetter.ItemGetter;
+import com.leonardobishop.quests.hook.itemgetter.ItemGetterLatest;
+import com.leonardobishop.quests.hook.itemgetter.ItemGetter_1_13;
+import com.leonardobishop.quests.hook.itemgetter.ItemGetter_Late_1_8;
+import com.leonardobishop.quests.hook.papi.IPlaceholderAPIHook;
+import com.leonardobishop.quests.hook.papi.PlaceholderAPIHook;
+import com.leonardobishop.quests.hook.title.Title;
+import com.leonardobishop.quests.hook.title.Title_Bukkit;
+import com.leonardobishop.quests.hook.title.Title_BukkitNoTimings;
+import com.leonardobishop.quests.hook.title.Title_Other;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.QPlayerManager;
-import com.leonardobishop.quests.quests.QuestManager;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskTypeManager;
-import com.leonardobishop.quests.quests.tasktypes.types.BreedingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.BrewingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.BuildingCertainTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.BuildingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.CommandTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.DealDamageTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.DistancefromTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.EnchantingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.ExpEarnTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.FishingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.InventoryTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.MilkingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.MiningCertainTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.MiningTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.MobkillingCertainTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.MobkillingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.PermissionTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.PlayerkillingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.PlaytimeTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.PositionTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.ShearingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.TamingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.WalkingTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.ASkyBlockLevelType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.BentoBoxLevelTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.CitizensDeliverTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.CitizensInteractTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.EssentialsBalanceTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.EssentialsMoneyEarnTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.IridiumSkyblockValueType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.MythicMobsKillingType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.PlaceholderAPIEvaluateTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.ShopGUIPlusBuyCertainTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.ShopGUIPlusSellCertainTaskType;
-import com.leonardobishop.quests.quests.tasktypes.types.dependent.uSkyBlockLevelType;
+import com.leonardobishop.quests.quest.QuestManager;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskTypeManager;
+import com.leonardobishop.quests.quest.tasktype.type.BreedingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.BrewingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.BuildingCertainTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.BuildingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.CommandTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.DealDamageTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.DistancefromTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.EnchantingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.ExpEarnTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.FishingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.InventoryTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.MilkingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.MiningCertainTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.MiningTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.MobkillingCertainTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.MobkillingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.PermissionTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.PlayerkillingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.PlaytimeTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.PositionTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.ShearingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.TamingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.WalkingTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.ASkyBlockLevelType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.BentoBoxLevelTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.CitizensDeliverTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.CitizensInteractTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.EssentialsBalanceTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.EssentialsMoneyEarnTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.IridiumSkyblockValueType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.MythicMobsKillingType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.PlaceholderAPIEvaluateTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.ShopGUIPlusBuyCertainTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.ShopGUIPlusSellCertainTaskType;
+import com.leonardobishop.quests.quest.tasktype.type.dependent.uSkyBlockLevelType;
 import com.leonardobishop.quests.updater.Updater;
 import com.leonardobishop.quests.util.Messages;
 import org.bstats.bukkit.MetricsLite;
@@ -174,10 +174,10 @@ public class Quests extends JavaPlugin {
         this.generateConfigurations();
         this.setupVersionSpecific();
 
-        super.getCommand("quests").setExecutor(new CommandQuests(this));
-        Bukkit.getPluginManager().registerEvents(new EventPlayerJoin(this), this);
+        super.getCommand("quests").setExecutor(new QuestsCommand(this));
+        Bukkit.getPluginManager().registerEvents(new PlayerJoinListener(this), this);
         Bukkit.getPluginManager().registerEvents(menuController, this);
-        Bukkit.getPluginManager().registerEvents(new EventPlayerLeave(this), this);
+        Bukkit.getPluginManager().registerEvents(new PlayerLeaveListener(this), this);
 
         MetricsLite metrics = new MetricsLite(this, 3443);
         if (metrics.isEnabled()) {
diff --git a/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java b/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java
index c279ec96..8a5e10d8 100644
--- a/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java
+++ b/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java
@@ -1,11 +1,11 @@
 package com.leonardobishop.quests;
 
-import com.leonardobishop.quests.hooks.itemgetter.ItemGetter;
+import com.leonardobishop.quests.hook.itemgetter.ItemGetter;
 import com.leonardobishop.quests.menu.QItemStack;
-import com.leonardobishop.quests.quests.Category;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
+import com.leonardobishop.quests.quest.Category;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
 import com.leonardobishop.quests.util.Options;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
diff --git a/src/main/java/com/leonardobishop/quests/api/QuestsAPI.java b/src/main/java/com/leonardobishop/quests/api/QuestsAPI.java
index 9aaf6c7b..db7ed470 100644
--- a/src/main/java/com/leonardobishop/quests/api/QuestsAPI.java
+++ b/src/main/java/com/leonardobishop/quests/api/QuestsAPI.java
@@ -2,8 +2,8 @@ package com.leonardobishop.quests.api;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.player.QPlayerManager;
-import com.leonardobishop.quests.quests.QuestManager;
-import com.leonardobishop.quests.quests.tasktypes.TaskTypeManager;
+import com.leonardobishop.quests.quest.QuestManager;
+import com.leonardobishop.quests.quest.tasktype.TaskTypeManager;
 import org.bukkit.Bukkit;
 
 /**
diff --git a/src/main/java/com/leonardobishop/quests/api/QuestsPlaceholders.java b/src/main/java/com/leonardobishop/quests/api/QuestsPlaceholders.java
index 2b769373..9a402ed5 100644
--- a/src/main/java/com/leonardobishop/quests/api/QuestsPlaceholders.java
+++ b/src/main/java/com/leonardobishop/quests/api/QuestsPlaceholders.java
@@ -5,8 +5,8 @@ import com.leonardobishop.quests.api.enums.QuestStartResult;
 import com.leonardobishop.quests.menu.QItemStack;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
-import com.leonardobishop.quests.quests.Category;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.quest.Category;
+import com.leonardobishop.quests.quest.Quest;
 import com.leonardobishop.quests.util.Options;
 import me.clip.placeholderapi.expansion.Cacheable;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
diff --git a/src/main/java/com/leonardobishop/quests/commands/CommandQuests.java b/src/main/java/com/leonardobishop/quests/command/QuestsCommand.java
index c6bc0d9c..e821d8ea 100644
--- a/src/main/java/com/leonardobishop/quests/commands/CommandQuests.java
+++ b/src/main/java/com/leonardobishop/quests/command/QuestsCommand.java
@@ -1,14 +1,14 @@
-package com.leonardobishop.quests.commands;
+package com.leonardobishop.quests.command;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.enums.QuestStartResult;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
-import com.leonardobishop.quests.quests.Category;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
+import com.leonardobishop.quests.quest.Category;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
 import com.leonardobishop.quests.util.Messages;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
@@ -42,11 +42,11 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 
-public class CommandQuests implements TabExecutor {
+public class QuestsCommand implements TabExecutor {
 
     private final Quests plugin;
 
-    public CommandQuests(Quests plugin) {
+    public QuestsCommand(Quests plugin) {
         this.plugin = plugin;
     }
 
diff --git a/src/main/java/com/leonardobishop/quests/hooks/coreprotect/CoreProtectHook.java b/src/main/java/com/leonardobishop/quests/hook/coreprotect/CoreProtectHook.java
index 4010c4f1..60f4e0a4 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/coreprotect/CoreProtectHook.java
+++ b/src/main/java/com/leonardobishop/quests/hook/coreprotect/CoreProtectHook.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.coreprotect;
+package com.leonardobishop.quests.hook.coreprotect;
 
 import net.coreprotect.CoreProtect;
 import net.coreprotect.CoreProtectAPI;
diff --git a/src/main/java/com/leonardobishop/quests/hooks/coreprotect/CoreProtectNoHook.java b/src/main/java/com/leonardobishop/quests/hook/coreprotect/CoreProtectNoHook.java
index 1587d726..32916934 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/coreprotect/CoreProtectNoHook.java
+++ b/src/main/java/com/leonardobishop/quests/hook/coreprotect/CoreProtectNoHook.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.coreprotect;
+package com.leonardobishop.quests.hook.coreprotect;
 
 import org.bukkit.block.Block;
 
diff --git a/src/main/java/com/leonardobishop/quests/hooks/coreprotect/ICoreProtectHook.java b/src/main/java/com/leonardobishop/quests/hook/coreprotect/ICoreProtectHook.java
index b69a1b46..5dc1fa36 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/coreprotect/ICoreProtectHook.java
+++ b/src/main/java/com/leonardobishop/quests/hook/coreprotect/ICoreProtectHook.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.coreprotect;
+package com.leonardobishop.quests.hook.coreprotect;
 
 import org.bukkit.block.Block;
 
diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter.java b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetter.java
index a0d7545e..f3a6fc7e 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter.java
+++ b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetter.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.itemgetter;
+package com.leonardobishop.quests.hook.itemgetter;
 
 import com.leonardobishop.quests.Quests;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetterLatest.java
index 2cb1ec88..e1215388 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java
+++ b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetterLatest.java
@@ -1,9 +1,8 @@
-package com.leonardobishop.quests.hooks.itemgetter;
+package com.leonardobishop.quests.hook.itemgetter;
 
 import com.leonardobishop.quests.Quests;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetter_1_13.java
index 446bd1f5..f25aab0c 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java
+++ b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetter_1_13.java
@@ -1,9 +1,8 @@
-package com.leonardobishop.quests.hooks.itemgetter;
+package com.leonardobishop.quests.hook.itemgetter;
 
 import com.leonardobishop.quests.Quests;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_Late_1_8.java b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetter_Late_1_8.java
index 07ff0456..84525cfb 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_Late_1_8.java
+++ b/src/main/java/com/leonardobishop/quests/hook/itemgetter/ItemGetter_Late_1_8.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.itemgetter;
+package com.leonardobishop.quests.hook.itemgetter;
 
 import com.leonardobishop.quests.Quests;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/com/leonardobishop/quests/hooks/papi/IPlaceholderAPIHook.java b/src/main/java/com/leonardobishop/quests/hook/papi/IPlaceholderAPIHook.java
index bc0c92a2..454ee02e 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/papi/IPlaceholderAPIHook.java
+++ b/src/main/java/com/leonardobishop/quests/hook/papi/IPlaceholderAPIHook.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.papi;
+package com.leonardobishop.quests.hook.papi;
 
 import com.leonardobishop.quests.Quests;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/leonardobishop/quests/hooks/papi/PlaceholderAPIHook.java b/src/main/java/com/leonardobishop/quests/hook/papi/PlaceholderAPIHook.java
index 66e93109..8fd86efc 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/papi/PlaceholderAPIHook.java
+++ b/src/main/java/com/leonardobishop/quests/hook/papi/PlaceholderAPIHook.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.papi;
+package com.leonardobishop.quests.hook.papi;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.api.QuestsPlaceholders;
diff --git a/src/main/java/com/leonardobishop/quests/hooks/title/Title.java b/src/main/java/com/leonardobishop/quests/hook/title/Title.java
index 030d7455..ea8f1f57 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/title/Title.java
+++ b/src/main/java/com/leonardobishop/quests/hook/title/Title.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.title;
+package com.leonardobishop.quests.hook.title;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/leonardobishop/quests/hooks/title/Title_Bukkit.java b/src/main/java/com/leonardobishop/quests/hook/title/Title_Bukkit.java
index 0f46771a..34b22f6b 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/title/Title_Bukkit.java
+++ b/src/main/java/com/leonardobishop/quests/hook/title/Title_Bukkit.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.title;
+package com.leonardobishop.quests.hook.title;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/leonardobishop/quests/hooks/title/Title_BukkitNoTimings.java b/src/main/java/com/leonardobishop/quests/hook/title/Title_BukkitNoTimings.java
index 92ffdd16..d0f44fe6 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/title/Title_BukkitNoTimings.java
+++ b/src/main/java/com/leonardobishop/quests/hook/title/Title_BukkitNoTimings.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.title;
+package com.leonardobishop.quests.hook.title;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/leonardobishop/quests/hooks/title/Title_Other.java b/src/main/java/com/leonardobishop/quests/hook/title/Title_Other.java
index ab7b7bf2..419bf657 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/title/Title_Other.java
+++ b/src/main/java/com/leonardobishop/quests/hook/title/Title_Other.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.hooks.title;
+package com.leonardobishop.quests.hook.title;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/leonardobishop/quests/events/MenuController.java b/src/main/java/com/leonardobishop/quests/listener/MenuController.java
index 12f35baa..117a797c 100644
--- a/src/main/java/com/leonardobishop/quests/events/MenuController.java
+++ b/src/main/java/com/leonardobishop/quests/listener/MenuController.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.events;
+package com.leonardobishop.quests.listener;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.menu.QMenu;
diff --git a/src/main/java/com/leonardobishop/quests/events/EventPlayerJoin.java b/src/main/java/com/leonardobishop/quests/listener/PlayerJoinListener.java
index 8e718975..b3035218 100644
--- a/src/main/java/com/leonardobishop/quests/events/EventPlayerJoin.java
+++ b/src/main/java/com/leonardobishop/quests/listener/PlayerJoinListener.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.events;
+package com.leonardobishop.quests.listener;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.util.Messages;
@@ -12,11 +12,11 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.util.UUID;
 
-public class EventPlayerJoin implements Listener {
+public class PlayerJoinListener implements Listener {
 
     private final Quests plugin;
 
-    public EventPlayerJoin(Quests plugin) {
+    public PlayerJoinListener(Quests plugin) {
         this.plugin = plugin;
     }
 
diff --git a/src/main/java/com/leonardobishop/quests/events/EventPlayerLeave.java b/src/main/java/com/leonardobishop/quests/listener/PlayerLeaveListener.java
index e3c714a4..5a5559ae 100644
--- a/src/main/java/com/leonardobishop/quests/events/EventPlayerLeave.java
+++ b/src/main/java/com/leonardobishop/quests/listener/PlayerLeaveListener.java
@@ -1,15 +1,15 @@
-package com.leonardobishop.quests.events;
+package com.leonardobishop.quests.listener;
 
 import com.leonardobishop.quests.Quests;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-public class EventPlayerLeave implements Listener {
+public class PlayerLeaveListener implements Listener {
 
     private final Quests plugin;
 
-    public EventPlayerLeave(Quests plugin) {
+    public PlayerLeaveListener(Quests plugin) {
         this.plugin = plugin;
     }
 
diff --git a/src/main/java/com/leonardobishop/quests/menu/CancelQMenu.java b/src/main/java/com/leonardobishop/quests/menu/CancelQMenu.java
index 24cca210..12186348 100644
--- a/src/main/java/com/leonardobishop/quests/menu/CancelQMenu.java
+++ b/src/main/java/com/leonardobishop/quests/menu/CancelQMenu.java
@@ -1,8 +1,8 @@
 package com.leonardobishop.quests.menu;
 
-import com.leonardobishop.quests.events.MenuController;
+import com.leonardobishop.quests.listener.MenuController;
 import com.leonardobishop.quests.player.QPlayer;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.quest.Quest;
 import com.leonardobishop.quests.util.Items;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/com/leonardobishop/quests/menu/CategoryQMenu.java b/src/main/java/com/leonardobishop/quests/menu/CategoryQMenu.java
index 4353dcb6..3afb4eb4 100644
--- a/src/main/java/com/leonardobishop/quests/menu/CategoryQMenu.java
+++ b/src/main/java/com/leonardobishop/quests/menu/CategoryQMenu.java
@@ -1,7 +1,7 @@
 package com.leonardobishop.quests.menu;
 
 import com.leonardobishop.quests.Quests;
-import com.leonardobishop.quests.events.MenuController;
+import com.leonardobishop.quests.listener.MenuController;
 import com.leonardobishop.quests.menu.element.CategoryMenuElement;
 import com.leonardobishop.quests.menu.element.CustomMenuElement;
 import com.leonardobishop.quests.menu.element.MenuElement;
diff --git a/src/main/java/com/leonardobishop/quests/menu/MenuUtil.java b/src/main/java/com/leonardobishop/quests/menu/MenuUtil.java
index a0b230e3..2f04a4f2 100644
--- a/src/main/java/com/leonardobishop/quests/menu/MenuUtil.java
+++ b/src/main/java/com/leonardobishop/quests/menu/MenuUtil.java
@@ -1,8 +1,8 @@
 package com.leonardobishop.quests.menu;
 
 import com.leonardobishop.quests.Quests;
-import com.leonardobishop.quests.events.MenuController;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.listener.MenuController;
+import com.leonardobishop.quests.quest.Quest;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/leonardobishop/quests/menu/QItemStack.java b/src/main/java/com/leonardobishop/quests/menu/QItemStack.java
index c7a3d530..81568605 100644
--- a/src/main/java/com/leonardobishop/quests/menu/QItemStack.java
+++ b/src/main/java/com/leonardobishop/quests/menu/QItemStack.java
@@ -3,8 +3,7 @@ package com.leonardobishop.quests.menu;
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.quest.Quest;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
 import org.bukkit.enchantments.Enchantment;
diff --git a/src/main/java/com/leonardobishop/quests/menu/QMenu.java b/src/main/java/com/leonardobishop/quests/menu/QMenu.java
index b20ddadd..6b793c77 100644
--- a/src/main/java/com/leonardobishop/quests/menu/QMenu.java
+++ b/src/main/java/com/leonardobishop/quests/menu/QMenu.java
@@ -1,12 +1,10 @@
 package com.leonardobishop.quests.menu;
 
-import com.leonardobishop.quests.events.MenuController;
+import com.leonardobishop.quests.listener.MenuController;
 import com.leonardobishop.quests.player.QPlayer;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 
-import java.util.HashMap;
-
 public interface QMenu {
 
     QPlayer getOwner();
diff --git a/src/main/java/com/leonardobishop/quests/menu/QuestQMenu.java b/src/main/java/com/leonardobishop/quests/menu/QuestQMenu.java
index 46891604..af655886 100644
--- a/src/main/java/com/leonardobishop/quests/menu/QuestQMenu.java
+++ b/src/main/java/com/leonardobishop/quests/menu/QuestQMenu.java
@@ -2,14 +2,14 @@ package com.leonardobishop.quests.menu;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.api.enums.QuestStartResult;
-import com.leonardobishop.quests.events.MenuController;
+import com.leonardobishop.quests.listener.MenuController;
 import com.leonardobishop.quests.menu.element.CustomMenuElement;
 import com.leonardobishop.quests.menu.element.MenuElement;
 import com.leonardobishop.quests.menu.element.QuestMenuElement;
 import com.leonardobishop.quests.menu.element.SpacerMenuElement;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.quest.Quest;
 import com.leonardobishop.quests.util.Items;
 import com.leonardobishop.quests.util.Options;
 import org.apache.commons.lang.math.NumberUtils;
diff --git a/src/main/java/com/leonardobishop/quests/menu/QuestSortWrapper.java b/src/main/java/com/leonardobishop/quests/menu/QuestSortWrapper.java
index a742e6e8..2d15ac87 100644
--- a/src/main/java/com/leonardobishop/quests/menu/QuestSortWrapper.java
+++ b/src/main/java/com/leonardobishop/quests/menu/QuestSortWrapper.java
@@ -1,8 +1,8 @@
 package com.leonardobishop.quests.menu;
 
 import com.leonardobishop.quests.Quests;
-import com.leonardobishop.quests.quests.Category;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.quest.Category;
+import com.leonardobishop.quests.quest.Quest;
 
 public class QuestSortWrapper implements Comparable<QuestSortWrapper> {
 
diff --git a/src/main/java/com/leonardobishop/quests/menu/StartedQMenu.java b/src/main/java/com/leonardobishop/quests/menu/StartedQMenu.java
index 0d1f03ea..317d2839 100644
--- a/src/main/java/com/leonardobishop/quests/menu/StartedQMenu.java
+++ b/src/main/java/com/leonardobishop/quests/menu/StartedQMenu.java
@@ -1,10 +1,10 @@
 package com.leonardobishop.quests.menu;
 
 import com.leonardobishop.quests.Quests;
-import com.leonardobishop.quests.events.MenuController;
+import com.leonardobishop.quests.listener.MenuController;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.quest.Quest;
 import com.leonardobishop.quests.util.Items;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/com/leonardobishop/quests/menu/element/CategoryMenuElement.java b/src/main/java/com/leonardobishop/quests/menu/element/CategoryMenuElement.java
index 2e1376eb..13d8a734 100644
--- a/src/main/java/com/leonardobishop/quests/menu/element/CategoryMenuElement.java
+++ b/src/main/java/com/leonardobishop/quests/menu/element/CategoryMenuElement.java
@@ -2,7 +2,7 @@ package com.leonardobishop.quests.menu.element;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.menu.QuestQMenu;
-import com.leonardobishop.quests.quests.Category;
+import com.leonardobishop.quests.quest.Category;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/leonardobishop/quests/menu/element/QuestMenuElement.java b/src/main/java/com/leonardobishop/quests/menu/element/QuestMenuElement.java
index e68154d6..96c358a4 100644
--- a/src/main/java/com/leonardobishop/quests/menu/element/QuestMenuElement.java
+++ b/src/main/java/com/leonardobishop/quests/menu/element/QuestMenuElement.java
@@ -3,7 +3,7 @@ package com.leonardobishop.quests.menu.element;
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.quests.Quest;
+import com.leonardobishop.quests.quest.Quest;
 import com.leonardobishop.quests.util.Items;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/com/leonardobishop/quests/player/QPlayer.java b/src/main/java/com/leonardobishop/quests/player/QPlayer.java
index 2120c55c..872b02d2 100644
--- a/src/main/java/com/leonardobishop/quests/player/QPlayer.java
+++ b/src/main/java/com/leonardobishop/quests/player/QPlayer.java
@@ -17,9 +17,9 @@ import com.leonardobishop.quests.player.questprogressfile.QPlayerPreferences;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Category;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
+import com.leonardobishop.quests.quest.Category;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
 import com.leonardobishop.quests.util.Messages;
 import com.leonardobishop.quests.util.Options;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
index 9cc7609e..da5fd223 100644
--- a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
+++ b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
@@ -1,23 +1,11 @@
 package com.leonardobishop.quests.player.questprogressfile;
 
 import com.leonardobishop.quests.Quests;
-import com.leonardobishop.quests.api.QuestsAPI;
-import com.leonardobishop.quests.api.enums.QuestStartResult;
-import com.leonardobishop.quests.api.events.PlayerCancelQuestEvent;
-import com.leonardobishop.quests.api.events.PlayerFinishQuestEvent;
-import com.leonardobishop.quests.api.events.PlayerStartQuestEvent;
-import com.leonardobishop.quests.api.events.PlayerStartTrackQuestEvent;
-import com.leonardobishop.quests.api.events.PlayerStopTrackQuestEvent;
-import com.leonardobishop.quests.api.events.PreStartQuestEvent;
 import com.leonardobishop.quests.player.QPlayer;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.util.Messages;
-import com.leonardobishop.quests.util.Options;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/leonardobishop/quests/quests/Category.java b/src/main/java/com/leonardobishop/quests/quest/Category.java
index 0fdedad4..d09143dc 100644
--- a/src/main/java/com/leonardobishop/quests/quests/Category.java
+++ b/src/main/java/com/leonardobishop/quests/quest/Category.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests;
+package com.leonardobishop.quests.quest;
 
 import org.bukkit.ChatColor;
 import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/com/leonardobishop/quests/quests/Quest.java b/src/main/java/com/leonardobishop/quests/quest/Quest.java
index b978f834..c286a45a 100644
--- a/src/main/java/com/leonardobishop/quests/quests/Quest.java
+++ b/src/main/java/com/leonardobishop/quests/quest/Quest.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests;
+package com.leonardobishop.quests.quest;
 
 import com.leonardobishop.quests.menu.QItemStack;
 import org.bukkit.ChatColor;
diff --git a/src/main/java/com/leonardobishop/quests/quests/QuestManager.java b/src/main/java/com/leonardobishop/quests/quest/QuestManager.java
index 022c2c89..2aaea571 100644
--- a/src/main/java/com/leonardobishop/quests/quests/QuestManager.java
+++ b/src/main/java/com/leonardobishop/quests/quest/QuestManager.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests;
+package com.leonardobishop.quests.quest;
 
 import com.leonardobishop.quests.Quests;
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/Task.java b/src/main/java/com/leonardobishop/quests/quest/Task.java
index cc93a8cf..edac070d 100644
--- a/src/main/java/com/leonardobishop/quests/quests/Task.java
+++ b/src/main/java/com/leonardobishop/quests/quest/Task.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests;
+package com.leonardobishop.quests.quest;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/ConfigValue.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/ConfigValue.java
index 06a8f2f1..764e771c 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/ConfigValue.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/ConfigValue.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests.tasktypes;
+package com.leonardobishop.quests.quest.tasktype;
 
 /**
  * This is for the quest creator and is purely cosmetic.
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/TaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/TaskType.java
index 0edec531..0a6147e7 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/TaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/TaskType.java
@@ -1,8 +1,8 @@
-package com.leonardobishop.quests.quests.tasktypes;
+package com.leonardobishop.quests.quest.tasktype;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
 import org.bukkit.event.Listener;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/TaskTypeManager.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/TaskTypeManager.java
index d5196af0..0b1fced9 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/TaskTypeManager.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/TaskTypeManager.java
@@ -1,8 +1,8 @@
-package com.leonardobishop.quests.quests.tasktypes;
+package com.leonardobishop.quests.quest.tasktype;
 
 import com.leonardobishop.quests.Quests;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
 import org.bukkit.Bukkit;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/TaskUtils.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/TaskUtils.java
index fe9e9506..b2dadb63 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/TaskUtils.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/TaskUtils.java
@@ -1,7 +1,7 @@
-package com.leonardobishop.quests.quests.tasktypes;
+package com.leonardobishop.quests.quest.tasktype;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
-import com.leonardobishop.quests.quests.Task;
+import com.leonardobishop.quests.quest.Task;
 import org.bukkit.entity.Player;
 
 import java.util.List;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BreedingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BreedingTaskType.java
index f087723a..1531df37 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BreedingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BreedingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BrewingCertainTaskType.java
index 2c36f55a..2c36f55a 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BrewingCertainTaskType.java
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BrewingTaskType.java
index 51956bb6..f05f8a5b 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BrewingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BuildingCertainTaskType.java
index 69e2c704..6d44ab9d 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BuildingCertainTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BuildingTaskType.java
index d46d2170..1ca89cea 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/BuildingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockPlaceEvent;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/CommandTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/CommandTaskType.java
index c45a1f34..6823e5af 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/CommandTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/CommandTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DealDamageTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/DealDamageTaskType.java
index b9ec23ab..f695b5fb 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DealDamageTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/DealDamageTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/DistancefromTaskType.java
index a57194e2..bd96760f 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/DistancefromTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/EnchantingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/EnchantingTaskType.java
index 76ff574a..04754176 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/EnchantingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/EnchantingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ExpEarnTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/ExpEarnTaskType.java
index 7eb58d8a..61147faf 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ExpEarnTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/ExpEarnTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerExpChangeEvent;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FarmingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/FarmingTaskType.java
index e79164b8..62223e6d 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FarmingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/FarmingTaskType.java
@@ -1,15 +1,14 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FishingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/FishingTaskType.java
index 419886a1..fa6d7780 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FishingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/FishingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/InventoryTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/InventoryTaskType.java
index c2bdcff6..4e12ab3c 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/InventoryTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/InventoryTaskType.java
@@ -1,17 +1,16 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MilkingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MilkingTaskType.java
index d3ade307..8f8232ed 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MilkingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MilkingTaskType.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
@@ -6,11 +6,11 @@ import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Material;
 import org.bukkit.entity.Cow;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MiningCertainTaskType.java
index 24e2cb99..da497808 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MiningCertainTaskType.java
@@ -1,17 +1,16 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MiningTaskType.java
index 7a9b5041..2007f301 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MiningTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MobkillingCertainTaskType.java
index f31fcdf7..7919cc75 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MobkillingCertainTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MobkillingTaskType.java
index a9d958b7..08cd18c4 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/MobkillingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Monster;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PermissionTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PermissionTaskType.java
index adf99eb1..3043aeb0 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PermissionTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PermissionTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlayerkillingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PlayerkillingTaskType.java
index 94124a88..c577ac01 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlayerkillingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PlayerkillingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlaytimeTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PlaytimeTaskType.java
index 03ae29c8..3b113d01 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlaytimeTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PlaytimeTaskType.java
@@ -1,17 +1,16 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PositionTaskType.java
index b96340a7..ffed1476 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/PositionTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ShearingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/ShearingTaskType.java
index 712ffcac..cbf3c175 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ShearingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/ShearingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Sheep;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/TamingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/TamingTaskType.java
index a1389e8d..9f3963e4 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/TamingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/TamingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/WalkingTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/WalkingTaskType.java
index b0ae7196..05f10a89 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/WalkingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/WalkingTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types;
+package com.leonardobishop.quests.quest.tasktype.type;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ASkyBlockLevelType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/ASkyBlockLevelType.java
index 1cdddb53..8e621288 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ASkyBlockLevelType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/ASkyBlockLevelType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import com.wasteofplastic.askyblock.events.IslandPostLevelEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/BentoBoxLevelTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/BentoBoxLevelTaskType.java
index a8d678e9..5e5c53ef 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/BentoBoxLevelTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/BentoBoxLevelTaskType.java
@@ -1,17 +1,16 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskTypeManager;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskTypeManager;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.event.EventHandler;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.events.BentoBoxEvent;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/CitizensDeliverTaskType.java
index 06575e67..fa64741e 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/CitizensDeliverTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import net.citizensnpcs.api.event.NPCRightClickEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensInteractTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/CitizensInteractTaskType.java
index 6ecaa863..3e6592b5 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensInteractTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/CitizensInteractTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import net.citizensnpcs.api.event.NPCRightClickEvent;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/EssentialsBalanceTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/EssentialsBalanceTaskType.java
index 8503f1ed..581cbafb 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/EssentialsBalanceTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/EssentialsBalanceTaskType.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.earth2me.essentials.Essentials;
 import com.leonardobishop.quests.QuestsConfigLoader;
@@ -7,11 +7,11 @@ import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import net.ess3.api.events.UserBalanceUpdateEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/EssentialsMoneyEarnTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java
index c4d91525..a6a56623 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/EssentialsMoneyEarnTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import net.ess3.api.events.UserBalanceUpdateEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/IridiumSkyblockValueType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/IridiumSkyblockValueType.java
index 7eef802d..e217b8af 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/IridiumSkyblockValueType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/IridiumSkyblockValueType.java
@@ -1,4 +1,4 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.iridium.iridiumskyblock.Island;
 import com.iridium.iridiumskyblock.api.IslandWorthCalculatedEvent;
@@ -6,13 +6,12 @@ import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/MythicMobsKillingType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/MythicMobsKillingType.java
index 11421126..74b870d9 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/MythicMobsKillingType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/MythicMobsKillingType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import io.lumine.xikage.mythicmobs.api.bukkit.events.MythicMobDeathEvent;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/PlaceholderAPIEvaluateTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/PlaceholderAPIEvaluateTaskType.java
index 58b45636..a3508bcc 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/PlaceholderAPIEvaluateTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/PlaceholderAPIEvaluateTaskType.java
@@ -1,17 +1,16 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.Quests;
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/ShopGUIPlusBuyCertainTaskType.java
index a8df4ab0..0b65fb76 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/ShopGUIPlusBuyCertainTaskType.java
@@ -1,15 +1,14 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import net.brcdev.shopgui.event.ShopPreTransactionEvent;
 import net.brcdev.shopgui.shop.ShopManager;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/ShopGUIPlusSellCertainTaskType.java
index ee1276ec..1f16163c 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/ShopGUIPlusSellCertainTaskType.java
@@ -1,15 +1,14 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import net.brcdev.shopgui.event.ShopPreTransactionEvent;
 import net.brcdev.shopgui.shop.ShopManager;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/uSkyBlockLevelType.java b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/uSkyBlockLevelType.java
index 0aa58d84..7e0787cb 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/uSkyBlockLevelType.java
+++ b/src/main/java/com/leonardobishop/quests/quest/tasktype/type/dependent/uSkyBlockLevelType.java
@@ -1,16 +1,15 @@
-package com.leonardobishop.quests.quests.tasktypes.types.dependent;
+package com.leonardobishop.quests.quest.tasktype.type.dependent;
 
 import com.leonardobishop.quests.QuestsConfigLoader;
 import com.leonardobishop.quests.api.QuestsAPI;
 import com.leonardobishop.quests.player.QPlayer;
 import com.leonardobishop.quests.player.questprogressfile.QuestProgress;
-import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.player.questprogressfile.TaskProgress;
-import com.leonardobishop.quests.quests.Quest;
-import com.leonardobishop.quests.quests.Task;
-import com.leonardobishop.quests.quests.tasktypes.ConfigValue;
-import com.leonardobishop.quests.quests.tasktypes.TaskType;
-import com.leonardobishop.quests.quests.tasktypes.TaskUtils;
+import com.leonardobishop.quests.quest.Quest;
+import com.leonardobishop.quests.quest.Task;
+import com.leonardobishop.quests.quest.tasktype.ConfigValue;
+import com.leonardobishop.quests.quest.tasktype.TaskType;
+import com.leonardobishop.quests.quest.tasktype.TaskUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import us.talabrek.ultimateskyblock.api.event.uSkyBlockScoreChangedEvent;