diff --git a/Plugins/.idea/compiler.xml b/Plugins/.idea/compiler.xml
index df8666836..ec08cea77 100644
--- a/Plugins/.idea/compiler.xml
+++ b/Plugins/.idea/compiler.xml
@@ -23,7 +23,7 @@
       </profile>
       <profile default="false" name="Annotation profile for bungee" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target\generated-test-sources\test-annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="true" />
       </profile>
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
index d51bb3f24..486011bac 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
@@ -104,7 +104,7 @@ import mineplex.game.clans.gameplay.safelog.SafeLog;
 import mineplex.game.clans.gameplay.safelog.npc.NPCManager;
 import mineplex.game.clans.items.GearManager;
 import mineplex.game.clans.spawn.Spawn;
-import mineplex.game.clans.tutorials.TutorialManager;
+import mineplex.game.clans.legacytutorial.TutorialManager;
 import mineplex.minecraft.game.classcombat.Class.ClassManager;
 import mineplex.minecraft.game.classcombat.Class.ClientClass;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass;
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
index 3fda15789..234970bd3 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
@@ -27,8 +27,7 @@ import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.clans.ClientClan;
 import mineplex.game.clans.clans.event.ClanJoinEvent;
 import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
-import mineplex.game.clans.tutorials.Tutorial;
-import mineplex.game.clans.tutorials.TutorialManager;
+
 import net.minecraft.server.v1_8_R3.EnumDirection;
 
 public class ClansCommand extends CommandBase<ClansManager>
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
index a37102d7b..86d794582 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
@@ -10,9 +10,9 @@ import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.task.TaskManager;
 import mineplex.game.clans.clans.ClansManager;
-import mineplex.game.clans.tutorials.Tutorial;
-import mineplex.game.clans.tutorials.TutorialManager;
-import mineplex.game.clans.tutorials.gettingstarted.TutorialGettingStarted;
+import mineplex.game.clans.legacytutorial.Tutorial;
+import mineplex.game.clans.legacytutorial.TutorialManager;
+import mineplex.game.clans.legacytutorial.gettingstarted.TutorialGettingStarted;
 
 public class RestartTutCommand extends CommandBase<TutorialManager>
 {	
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java
index 47457a05b..930702087 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java
@@ -8,7 +8,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.account.event.OnlineRankUpdateEvent;
-import mineplex.core.common.util.C;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.scoreboard.PlayerScoreboard;
 import mineplex.core.scoreboard.ScoreboardData;
@@ -20,11 +19,10 @@ import mineplex.game.clans.clans.ClanInfo;
 import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementClan;
 import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementPlayer;
-import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementPlayerCount;
 import mineplex.game.clans.clans.war.WarManager;
 import mineplex.game.clans.clans.worldevent.WorldEventManager;
-import mineplex.game.clans.tutorials.Tutorial;
-import mineplex.game.clans.tutorials.TutorialManager;
+import mineplex.game.clans.legacytutorial.Tutorial;
+import mineplex.game.clans.legacytutorial.TutorialManager;
 
 public class ClansScoreboardManager extends ScoreboardManager
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/Tutorial.java
similarity index 98%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/Tutorial.java
index cc785d827..bfbf3f62e 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/Tutorial.java
@@ -1,10 +1,9 @@
-package mineplex.game.clans.tutorials;
+package mineplex.game.clans.legacytutorial;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.bukkit.Color;
 import org.bukkit.FireworkEffect.Type;
@@ -31,13 +30,10 @@ import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilItem;
-import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.donation.DonationManager;
-import mineplex.core.packethandler.IPacketHandler;
 import mineplex.core.packethandler.PacketHandler;
-import mineplex.core.packethandler.PacketInfo;
 import mineplex.core.scoreboard.ScoreboardManager;
 import mineplex.core.scoreboard.elements.ScoreboardElement;
 import mineplex.core.task.TaskManager;
@@ -48,7 +44,6 @@ import mineplex.game.clans.clans.event.ClanJoinEvent;
 import mineplex.game.clans.clans.event.ClanTipEvent;
 import mineplex.game.clans.clans.playtime.Playtime;
 import mineplex.game.clans.economy.GoldManager;
-import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
 
 /**
  * 
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialClient.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialClient.java
similarity index 92%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialClient.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialClient.java
index ac44d52a1..a73f4fdd6 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialClient.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialClient.java
@@ -1,9 +1,7 @@
-package mineplex.game.clans.tutorials;
+package mineplex.game.clans.legacytutorial;
 
 import org.bukkit.entity.Player;
 
-import mineplex.core.task.TaskManager;
-
 public class TutorialClient
 {
 	public Player Player;
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialManager.java
similarity index 96%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialManager.java
index 02bcc6899..36bfabcd3 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialManager.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials;
+package mineplex.game.clans.legacytutorial;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -21,9 +21,8 @@ import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.clans.commands.RestartTutCommand;
 import mineplex.game.clans.clans.playtime.Playtime;
 import mineplex.game.clans.economy.GoldManager;
-import mineplex.game.clans.tutorials.commands.DoSkipTutorialCommand;
-import mineplex.game.clans.tutorials.commands.SkipTutorialCommand;
-import mineplex.game.clans.tutorials.gettingstarted.TutorialGettingStarted;
+import mineplex.game.clans.legacytutorial.commands.DoSkipTutorialCommand;
+import mineplex.game.clans.legacytutorial.commands.SkipTutorialCommand;
 import net.md_5.bungee.api.ChatColor;
 import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
 
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialTask.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialTask.java
similarity index 98%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialTask.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialTask.java
index 6b4d2a332..929f5ea7d 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialTask.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialTask.java
@@ -1,11 +1,10 @@
-package mineplex.game.clans.tutorials;
+package mineplex.game.clans.legacytutorial;
 
 import java.util.Iterator;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 import mineplex.core.common.util.C;
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/DoSkipTutorialCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/DoSkipTutorialCommand.java
similarity index 85%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/DoSkipTutorialCommand.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/DoSkipTutorialCommand.java
index 2d9025081..599a875c5 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/DoSkipTutorialCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/DoSkipTutorialCommand.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials.commands;
+package mineplex.game.clans.legacytutorial.commands;
 
 import org.bukkit.entity.Player;
 
@@ -6,7 +6,7 @@ import mineplex.core.command.CommandBase;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.game.clans.tutorials.TutorialManager;
+import mineplex.game.clans.legacytutorial.TutorialManager;
 
 public class DoSkipTutorialCommand extends CommandBase<TutorialManager>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/SkipTutorialCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/SkipTutorialCommand.java
similarity index 80%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/SkipTutorialCommand.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/SkipTutorialCommand.java
index 87caf4ce3..8fb7ca99f 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/SkipTutorialCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/SkipTutorialCommand.java
@@ -1,12 +1,11 @@
-package mineplex.game.clans.tutorials.commands;
+package mineplex.game.clans.legacytutorial.commands;
 
 import org.bukkit.entity.Player;
 
 import mineplex.core.command.CommandBase;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.game.clans.tutorials.TutorialManager;
+import mineplex.game.clans.legacytutorial.TutorialManager;
 
 public class SkipTutorialCommand extends CommandBase<TutorialManager>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskClaim.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskClaim.java
similarity index 87%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskClaim.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskClaim.java
index 23edfed24..c0b966649 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskClaim.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskClaim.java
@@ -1,12 +1,11 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
 import mineplex.game.clans.clans.ClansManager;
-import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
 import mineplex.game.clans.clans.event.PlayerPreClaimTerritoryEvent;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskClaim extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCreateClan.java
similarity index 91%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCreateClan.java
index 26cb07f65..97cfa9ba2 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCreateClan.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -6,7 +6,7 @@ import org.bukkit.event.EventPriority;
 
 import mineplex.core.common.util.UtilServer;
 import mineplex.game.clans.clans.event.ClanCreatedEvent;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskCreateClan extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCustomizeClass.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCustomizeClass.java
similarity index 93%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCustomizeClass.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCustomizeClass.java
index 91f065320..c591dae4f 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCustomizeClass.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCustomizeClass.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import java.util.Iterator;
 
@@ -12,7 +12,7 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.spawn.Spawn;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 import mineplex.minecraft.game.classcombat.Class.ClientClass;
 
 public class TaskCustomizeClass extends TutorialTask<TutorialGettingStarted>
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskDisbandClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskDisbandClan.java
similarity index 86%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskDisbandClan.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskDisbandClan.java
index a294434cb..8fbc07f2c 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskDisbandClan.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskDisbandClan.java
@@ -1,11 +1,10 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
-import mineplex.core.common.util.UtilServer;
 import mineplex.game.clans.clans.event.ClanDisbandedEvent;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskDisbandClan extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskEquipClass.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskEquipClass.java
similarity index 96%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskEquipClass.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskEquipClass.java
index 458e04bb4..a2896c445 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskEquipClass.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskEquipClass.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -13,7 +13,7 @@ import mineplex.core.task.TaskManager;
 import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
 import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
 import mineplex.game.clans.spawn.Spawn;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 import mineplex.minecraft.game.classcombat.Class.event.ClassEquipEvent;
 
 public class TaskEquipClass extends TutorialTask<TutorialGettingStarted>
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskExploreShops.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskExploreShops.java
similarity index 95%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskExploreShops.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskExploreShops.java
index d34c2129e..eb4b8cb6b 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskExploreShops.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskExploreShops.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import java.util.Iterator;
 
@@ -12,7 +12,7 @@ import mineplex.core.updater.event.UpdateEvent;
 import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.clans.event.EnergyPageBuildEvent;
 import mineplex.game.clans.spawn.Spawn;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskExploreShops extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskLeaveSpawn.java
similarity index 90%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskLeaveSpawn.java
index 5f0f7926c..5a812ce65 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskLeaveSpawn.java
@@ -1,16 +1,14 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import java.util.Iterator;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskLeaveSpawn extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskMakingMoney.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskMakingMoney.java
similarity index 92%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskMakingMoney.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskMakingMoney.java
index 6ff1d9b4e..7b33cd35a 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskMakingMoney.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskMakingMoney.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -7,10 +7,9 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 import org.bukkit.inventory.ItemStack;
 
-import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent;
 import mineplex.game.clans.spawn.Spawn;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskMakingMoney extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskSetHome.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskSetHome.java
similarity index 90%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskSetHome.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskSetHome.java
index ca14eaf8c..42a185e30 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskSetHome.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskSetHome.java
@@ -1,11 +1,11 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
 import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskSetHome extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskUseAbility.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskUseAbility.java
similarity index 90%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskUseAbility.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskUseAbility.java
index c94324660..6c180ae03 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskUseAbility.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskUseAbility.java
@@ -1,8 +1,6 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -10,25 +8,20 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
 
 import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.NautArrayList;
 import mineplex.core.common.util.NautHashMap;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.task.TaskManager;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
 import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
 import mineplex.game.clans.spawn.Spawn;
-import mineplex.game.clans.tutorials.TutorialTask;
-import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskUseAbility extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskViewClanDetails.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskViewClanDetails.java
similarity index 89%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskViewClanDetails.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskViewClanDetails.java
index 9ece47104..d0af8ac05 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskViewClanDetails.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskViewClanDetails.java
@@ -1,10 +1,10 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
 import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskViewClanDetails extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskWelcome.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskWelcome.java
similarity index 84%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskWelcome.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskWelcome.java
index 9b058b619..1100966bc 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskWelcome.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskWelcome.java
@@ -1,6 +1,6 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
-import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.game.clans.legacytutorial.TutorialTask;
 
 public class TaskWelcome extends TutorialTask<TutorialGettingStarted>
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TutorialGettingStarted.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TutorialGettingStarted.java
similarity index 95%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TutorialGettingStarted.java
rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TutorialGettingStarted.java
index c91e87436..620809837 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TutorialGettingStarted.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TutorialGettingStarted.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.tutorials.gettingstarted;
+package mineplex.game.clans.legacytutorial.gettingstarted;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -15,8 +15,8 @@ import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.clans.playtime.Playtime;
 import mineplex.game.clans.economy.GoldManager;
 import mineplex.game.clans.spawn.Spawn;
-import mineplex.game.clans.tutorials.Tutorial;
-import mineplex.game.clans.tutorials.TutorialManager;
+import mineplex.game.clans.legacytutorial.Tutorial;
+import mineplex.game.clans.legacytutorial.TutorialManager;
 
 public class TutorialGettingStarted extends Tutorial
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Objective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Objective.java
new file mode 100644
index 000000000..af848e3f4
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Objective.java
@@ -0,0 +1,7 @@
+package mineplex.game.clans.tutorial;
+
+public class Objective
+{
+	private String _name;
+	private String _desc;
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/ObjectiveGroup.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/ObjectiveGroup.java
new file mode 100644
index 000000000..ece3f655b
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/ObjectiveGroup.java
@@ -0,0 +1,9 @@
+package mineplex.game.clans.tutorial;
+
+import java.util.List;
+
+public class ObjectiveGroup
+{
+	private String _name;
+	private List<Objective> _objectives;
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java
new file mode 100644
index 000000000..3c0ad10e3
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java
@@ -0,0 +1,16 @@
+package mineplex.game.clans.tutorial;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
+public class Tutorial
+{
+	private HashMap<Player, TutorialSession> _playerSessionMap;
+
+	private String _name;
+	private String _taskIdentifier;
+
+	private List<ObjectiveGroup> _objectiveGroups;
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialManager.java
new file mode 100644
index 000000000..d59e4e819
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialManager.java
@@ -0,0 +1,15 @@
+package mineplex.game.clans.tutorial;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+
+public class TutorialManager extends MiniPlugin
+{
+	public TutorialManager(JavaPlugin plugin)
+	{
+		super("Clans Tutorial", plugin);
+	}
+
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java
new file mode 100644
index 000000000..0a7e984d2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java
@@ -0,0 +1,7 @@
+package mineplex.game.clans.tutorial;
+
+public class TutorialSession
+{
+	private int _objectiveGroupIndex;
+	private int _objectiveIndex;
+}