diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 85dd329d..42318787 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -13,7 +13,7 @@ namespace Entity
       EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
                    const std::string& givenName = "none" );
 
-      using OnTalkEventHandler = std::function< void( Entity::Player&, uint64_t ) >;
+      using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >;
 
       uint32_t getMapLinkId() const;
       void setMapLinkId( uint32_t mapLinkId );
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 46241c87..6e989623 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -720,34 +720,18 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
 
       instance->setVar( static_cast< uint8_t >( index ), static_cast< uint8_t >( value ) );
    }
-   else if( subCommand == "objupdate" )
-   {
-      uint32_t objId;
-
-      sscanf( params.c_str(), "%d", &objId );
-
-      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
-      if( !instance )
-         return;
-
-      auto obj = instance->getEObj(objId);
-      if( !obj )
-         return;
-
-      //instance->updateEObj(obj);
-   }
    else if( subCommand == "objstate" )
    {
-      uint32_t objId;
+      char objName[128];
       uint8_t state;
 
-      sscanf( params.c_str(), "%d %hhu", &objId, &state );
+      sscanf( params.c_str(), "%s %hhu", objName, &state );
 
       auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
       if( !instance )
          return;
 
-      auto obj = instance->getEObj(objId);
+      auto obj = instance->getEObjByName( objName );
       if( !obj )
          return;
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h b/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
deleted file mode 100644
index 02d91881..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
+++ /dev/null
@@ -1,590 +0,0 @@
-[00:54:47][info] Setting up EXD data
-[00:54:56][info] #ifndef _COMMON_GEN_H_
-#define _COMMON_GEN_H_
-/* This file has been automatically generated.
-   Changes will be lost upon regeneration.
-   To change the content edit tools/exd_common_gen */
-namespace Core {
-namespace Common {
-
-   ///////////////////////////////////////////////////////////
-   //ActionCategory.exd
-   enum class ActionCategory : uint8_t
-   {
-      Autoattack = 1,
-      Spell = 2,
-      Weaponskill = 3,
-      Ability = 4,
-      Item = 5,
-      DoLAbility = 6,
-      DoHAbility = 7,
-      Event = 8,
-      LimitBreak = 9,
-      System = 10,
-      Artillery = 11,
-      Mount = 12,
-      Glamour = 13,
-      ItemManipulation = 14,
-      AdrenalineRush = 15,
-      bool operator==( const ActionCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ActionCategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //BeastReputationRank.exd
-   enum class BeastReputationRank : uint8_t
-   {
-      None = 0,
-      Neutral = 1,
-      Recognized = 2,
-      Friendly = 3,
-      Trusted = 4,
-      Respected = 5,
-      Honored = 6,
-      Sworn = 7,
-      Allied = 8,
-      bool operator==( const BeastReputationRank& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const BeastReputationRank& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //BeastTribe.exd
-   enum class BeastTribe : uint8_t
-   {
-      bool operator==( const BeastTribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const BeastTribe& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ClassJob.exd
-   enum class ClassJob : uint8_t
-   {
-      Adventurer = 0,
-      Gladiator = 1,
-      Pugilist = 2,
-      Marauder = 3,
-      Lancer = 4,
-      Archer = 5,
-      Conjurer = 6,
-      Thaumaturge = 7,
-      Carpenter = 8,
-      Blacksmith = 9,
-      Armorer = 10,
-      Goldsmith = 11,
-      Leatherworker = 12,
-      Weaver = 13,
-      Alchemist = 14,
-      Culinarian = 15,
-      Miner = 16,
-      Botanist = 17,
-      Fisher = 18,
-      Paladin = 19,
-      Monk = 20,
-      Warrior = 21,
-      Dragoon = 22,
-      Bard = 23,
-      Whitemage = 24,
-      Blackmage = 25,
-      Arcanist = 26,
-      Summoner = 27,
-      Scholar = 28,
-      Rogue = 29,
-      Ninja = 30,
-      Machinist = 31,
-      Darkknight = 32,
-      Astrologian = 33,
-      Samurai = 34,
-      Redmage = 35,
-      bool operator==( const ClassJob& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ClassJob& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ContentType.exd
-   enum class ContentType : uint8_t
-   {
-      DutyRoulette = 1,
-      Dungeons = 2,
-      Guildhests = 3,
-      Trials = 4,
-      Raids = 5,
-      PvP = 6,
-      QuestBattles = 7,
-      FATEs = 8,
-      TreasureHunt = 9,
-      Levequests = 10,
-      GrandCompany = 11,
-      Companions = 12,
-      BeastTribeQuests = 13,
-      OverallCompletion = 14,
-      PlayerCommendation = 15,
-      DisciplesoftheLand = 16,
-      DisciplesoftheHand = 17,
-      RetainerVentures = 18,
-      GoldSaucer = 19,
-      DeepDungeons = 21,
-      WondrousTails = 24,
-      CustomDeliveries = 25,
-      bool operator==( const ContentType& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ContentType& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //EmoteCategory.exd
-   enum class EmoteCategory : uint8_t
-   {
-      General = 1,
-      Persistent = 2,
-      Expressions = 3,
-      bool operator==( const EmoteCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const EmoteCategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ExVersion.exd
-   enum class ExVersion : uint8_t
-   {
-      ARealmReborn = 0,
-      Heavensward = 1,
-      Stormblood = 2,
-      bool operator==( const ExVersion& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ExVersion& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //GrandCompany.exd
-   enum class GrandCompany : uint8_t
-   {
-      None = 0,
-      Maelstrom = 1,
-      OrderoftheTwinAdder = 2,
-      ImmortalFlames = 3,
-      bool operator==( const GrandCompany& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const GrandCompany& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //GuardianDeity.exd
-   enum class GuardianDeity : uint8_t
-   {
-      HalonetheFury = 1,
-      MenphinatheLover = 2,
-      ThaliaktheScholar = 3,
-      NymeiatheSpinner = 4,
-      LlymlaentheNavigator = 5,
-      OschontheWanderer = 6,
-      ByregottheBuilder = 7,
-      RhalgrtheDestroyer = 8,
-      AzeymatheWarden = 9,
-      NaldthaltheTraders = 10,
-      NophicatheMatron = 11,
-      AlthyktheKeeper = 12,
-      bool operator==( const GuardianDeity& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const GuardianDeity& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ItemUICategory.exd
-   enum class ItemUICategory : uint8_t
-   {
-      PugilistsArm = 1,
-      GladiatorsArm = 2,
-      MaraudersArm = 3,
-      ArchersArm = 4,
-      LancersArm = 5,
-      OnehandedThaumaturgesArm = 6,
-      TwohandedThaumaturgesArm = 7,
-      OnehandedConjurersArm = 8,
-      TwohandedConjurersArm = 9,
-      ArcanistsGrimoire = 10,
-      Shield = 11,
-      CarpentersPrimaryTool = 12,
-      CarpentersSecondaryTool = 13,
-      BlacksmithsPrimaryTool = 14,
-      BlacksmithsSecondaryTool = 15,
-      ArmorersPrimaryTool = 16,
-      ArmorersSecondaryTool = 17,
-      GoldsmithsPrimaryTool = 18,
-      GoldsmithsSecondaryTool = 19,
-      LeatherworkersPrimaryTool = 20,
-      LeatherworkersSecondaryTool = 21,
-      WeaversPrimaryTool = 22,
-      WeaversSecondaryTool = 23,
-      AlchemistsPrimaryTool = 24,
-      AlchemistsSecondaryTool = 25,
-      CulinariansPrimaryTool = 26,
-      CulinariansSecondaryTool = 27,
-      MinersPrimaryTool = 28,
-      MinersSecondaryTool = 29,
-      BotanistsPrimaryTool = 30,
-      BotanistsSecondaryTool = 31,
-      FishersPrimaryTool = 32,
-      FishingTackle = 33,
-      Head = 34,
-      Body = 35,
-      Legs = 36,
-      Hands = 37,
-      Feet = 38,
-      Waist = 39,
-      Necklace = 40,
-      Earrings = 41,
-      Bracelets = 42,
-      Ring = 43,
-      Medicine = 44,
-      Ingredient = 45,
-      Meal = 46,
-      Seafood = 47,
-      Stone = 48,
-      Metal = 49,
-      Lumber = 50,
-      Cloth = 51,
-      Leather = 52,
-      Bone = 53,
-      Reagent = 54,
-      Dye = 55,
-      Part = 56,
-      Furnishing = 57,
-      Materia = 58,
-      Crystal = 59,
-      Catalyst = 60,
-      Miscellany = 61,
-      SoulCrystal = 62,
-      Other = 63,
-      ConstructionPermit = 64,
-      Roof = 65,
-      ExteriorWall = 66,
-      Window = 67,
-      Door = 68,
-      RoofDecoration = 69,
-      ExteriorWallDecoration = 70,
-      Placard = 71,
-      Fence = 72,
-      InteriorWall = 73,
-      Flooring = 74,
-      CeilingLight = 75,
-      OutdoorFurnishing = 76,
-      Table = 77,
-      Tabletop = 78,
-      Wallmounted = 79,
-      Rug = 80,
-      Minion = 81,
-      Gardening = 82,
-      Demimateria = 83,
-      RoguesArm = 84,
-      SeasonalMiscellany = 85,
-      TripleTriadCard = 86,
-      DarkKnightsArm = 87,
-      MachinistsArm = 88,
-      AstrologiansArm = 89,
-      AirshipHull = 90,
-      AirshipRigging = 91,
-      AirshipAftcastle = 92,
-      AirshipForecastle = 93,
-      OrchestrionRoll = 94,
-      Painting = 95,
-      SamuraisArm = 96,
-      RedMagesArm = 97,
-      ScholarsArm = 98,
-      FishersSecondaryTool = 99,
-      Currency = 100,
-      bool operator==( const ItemUICategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ItemUICategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ItemSearchCategory.exd
-   enum class ItemSearchCategory : uint8_t
-   {
-      PrimaryArms = 1,
-      PrimaryTools = 2,
-      PrimaryTools1 = 3,
-      Armor = 4,
-      Accessories = 5,
-      Medicines = 6,
-      Materials = 7,
-      Other = 8,
-      PugilistsArms = 9,
-      GladiatorsArms = 10,
-      MaraudersArms = 11,
-      ArchersArms = 12,
-      LancersArms = 13,
-      ThaumaturgesArms = 14,
-      ConjurersArms = 15,
-      ArcanistsArms = 16,
-      Shields = 17,
-      ThrowingWeapons = 18,
-      CarpentersTools = 19,
-      BlacksmithsTools = 20,
-      ArmorersTools = 21,
-      GoldsmithsTools = 22,
-      LeatherworkersTools = 23,
-      WeaversTools = 24,
-      AlchemistsTools = 25,
-      CulinariansTools = 26,
-      MinersTools = 27,
-      BotanistsTools = 28,
-      FishersTools = 29,
-      FishingTackle = 30,
-      Head = 31,
-      Undershirts = 32,
-      Body = 33,
-      Undergarments = 34,
-      Legs = 35,
-      Hands = 36,
-      Feet = 37,
-      Waist = 38,
-      Necklaces = 39,
-      Earrings = 40,
-      Bracelets = 41,
-      Rings = 42,
-      Medicine = 43,
-      Ingredients = 44,
-      Meals = 45,
-      Seafood = 46,
-      Stone = 47,
-      Metal = 48,
-      Lumber = 49,
-      Cloth = 50,
-      Leather = 51,
-      Bone = 52,
-      Reagents = 53,
-      Dyes = 54,
-      WeaponParts = 55,
-      Furnishings = 56,
-      Materia = 57,
-      Crystals = 58,
-      Catalysts = 59,
-      Miscellany = 60,
-      SoulCrystals = 61,
-      Arrows = 62,
-      QuestItems = 63,
-      Other1 = 64,
-      ExteriorFixtures = 65,
-      InteriorFixtures = 66,
-      OutdoorFurnishings = 67,
-      ChairsandBeds = 68,
-      Tables = 69,
-      Tabletop = 70,
-      Wallmounted = 71,
-      Rugs = 72,
-      RoguesArms = 73,
-      SeasonalMiscellany = 74,
-      Minions = 75,
-      DarkKnightsArms = 76,
-      MachinistsArms = 77,
-      AstrologiansArms = 78,
-      AirshipComponents = 79,
-      OrchestrionComponents = 80,
-      GardeningItems = 81,
-      Paintings = 82,
-      SamuraisArms = 83,
-      RedMagesArms = 84,
-      ScholarsArms = 85,
-      bool operator==( const ItemSearchCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ItemSearchCategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //OnlineStatus.exd
-   enum class OnlineStatus : uint8_t
-   {
-      Producer = 1,
-      GameMaster = 2,
-      GameMaster1 = 3,
-      GameMaster2 = 4,
-      Disconnected = 5,
-      WaitingforFriendListApproval = 6,
-      WaitingforLinkshellApproval = 7,
-      WaitingforFreeCompanyApproval = 8,
-      NotFound = 9,
-      Offline = 10,
-      Mentor = 11,
-      Busy = 12,
-      PvP = 13,
-      PlayingTripleTriad = 14,
-      ViewingCutscene = 15,
-      UsingaChocoboPorter = 16,
-      AwayfromKeyboard = 17,
-      CameraMode = 18,
-      LookingforRepairs = 19,
-      LookingtoRepair = 20,
-      LookingtoMeldMateria = 21,
-      Roleplaying = 22,
-      LookingforParty = 23,
-      SwordforHire = 24,
-      WaitingforDutyFinder = 25,
-      RecruitingPartyMembers = 26,
-      Mentor1 = 27,
-      PvEMentor = 28,
-      TradeMentor = 29,
-      PvPMentor = 30,
-      Returner = 31,
-      NewAdventurer = 32,
-      AllianceLeader = 33,
-      AlliancePartyLeader = 34,
-      AlliancePartyMember = 35,
-      PartyLeader = 36,
-      PartyMember = 37,
-      PartyLeaderCrossworld = 38,
-      PartyMemberCrossworld = 39,
-      AnotherWorld = 40,
-      SharingDuty = 41,
-      SimilarDuty = 42,
-      InDuty = 43,
-      TrialAdventurer = 44,
-      FreeCompany = 45,
-      GrandCompany = 46,
-      Online = 47,
-      bool operator==( const OnlineStatus& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const OnlineStatus& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Race.exd
-   enum class Race : uint8_t
-   {
-      Hyur = 1,
-      Elezen = 2,
-      Lalafell = 3,
-      Miqote = 4,
-      Roegadyn = 5,
-      AuRa = 6,
-      bool operator==( const Race& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Race& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Tribe.exd
-   enum class Tribe : uint8_t
-   {
-      Midlander = 1,
-      Highlander = 2,
-      Wildwood = 3,
-      Duskwight = 4,
-      Plainsfolk = 5,
-      Dunesfolk = 6,
-      SeekeroftheSun = 7,
-      KeeperoftheMoon = 8,
-      SeaWolf = 9,
-      Hellsguard = 10,
-      Raen = 11,
-      Xaela = 12,
-      bool operator==( const Tribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Tribe& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Town.exd
-   enum class Town : uint8_t
-   {
-      Nowheresville = 0,
-      LimsaLominsa = 1,
-      Gridania = 2,
-      Uldah = 3,
-      Ishgard = 4,
-      Kugane = 7,
-      bool operator==( const Town& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Town& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Weather.exd
-   enum class Weather : uint8_t
-   {
-      ClearSkies = 1,
-      FairSkies = 2,
-      Clouds = 3,
-      Fog = 4,
-      Wind = 5,
-      Gales = 6,
-      Rain = 7,
-      Showers = 8,
-      Thunder = 9,
-      Thunderstorms = 10,
-      DustStorms = 11,
-      Sandstorms = 12,
-      HotSpells = 13,
-      HeatWaves = 14,
-      Snow = 15,
-      Blizzards = 16,
-      Gloom = 17,
-      Auroras = 18,
-      Darkness = 19,
-      Tension = 20,
-      Clouds1 = 21,
-      StormClouds = 22,
-      RoughSeas = 23,
-      RoughSeas1 = 24,
-      Louring = 25,
-      HeatWaves1 = 26,
-      Gloom1 = 27,
-      Gales1 = 28,
-      Eruptions = 29,
-      FairSkies1 = 30,
-      FairSkies2 = 31,
-      FairSkies3 = 32,
-      FairSkies4 = 33,
-      FairSkies5 = 34,
-      Irradiance = 35,
-      CoreRadiation = 36,
-      CoreRadiation1 = 37,
-      CoreRadiation2 = 38,
-      CoreRadiation3 = 39,
-      ShelfClouds = 40,
-      ShelfClouds1 = 41,
-      ShelfClouds2 = 42,
-      ShelfClouds3 = 43,
-      Oppression = 44,
-      Oppression1 = 45,
-      Oppression2 = 46,
-      Oppression3 = 47,
-      Oppression4 = 48,
-      UmbralWind = 49,
-      UmbralStatic = 50,
-      Smoke = 51,
-      FairSkies6 = 52,
-      RoyalLevin = 53,
-      Hyperelectricity = 54,
-      RoyalLevin1 = 55,
-      Oppression5 = 56,
-      Thunder1 = 57,
-      Thunder2 = 58,
-      CutScene = 59,
-      Multiplicity = 60,
-      Multiplicity1 = 61,
-      Rain1 = 62,
-      FairSkies7 = 63,
-      Rain2 = 64,
-      FairSkies8 = 65,
-      Dragonstorm = 66,
-      Dragonstorm1 = 67,
-      Subterrain = 68,
-      Concordance = 69,
-      Concordance1 = 70,
-      BeyondTime = 71,
-      BeyondTime1 = 72,
-      BeyondTime2 = 73,
-      DemonicInfinity = 74,
-      DemonicInfinity1 = 75,
-      DemonicInfinity2 = 76,
-      DimensionalDisruption = 77,
-      DimensionalDisruption1 = 78,
-      DimensionalDisruption2 = 79,
-      Revelstorm = 80,
-      Revelstorm1 = 81,
-      EternalBliss = 82,
-      EternalBliss1 = 83,
-      Wyrmstorm = 84,
-      Wyrmstorm1 = 85,
-      Revelstorm2 = 86,
-      Quicklevin = 87,
-      Thunder3 = 88,
-      DimensionalDisruption3 = 89,
-      FairSkies9 = 90,
-      bool operator==( const Weather& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Weather& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-}
-}
-#endif
-
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
similarity index 81%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index 20186ef2..0256b651 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -3,6 +3,19 @@
 
 class Sastasha : public InstanceContentScript
 {
+private:
+   static void memoOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
+   {
+
+   }
+
+   static void switchOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
+   {
+      object->setState( 7 );
+
+      instance->getEObjByName( "Hiddendoor" )->setState( 7 );
+   }
+
 public:
    Sastasha() : InstanceContentScript( 4 )
    { }
@@ -25,17 +38,23 @@ public:
       instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f );
       instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f );
       instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f );
-      instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
-      instance->registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
+
+      auto switchObj = instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
+      switchObj->setOnTalkHandler( switchOnTalk );
+
+      instance->registerEObj( "Hiddendoor", 2000217, 3653517, 5, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
       instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f );
       instance->registerEObj( "Unknown10", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f );
       instance->registerEObj( "Unknown11", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f );
       instance->registerEObj( "Unknown12", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f );
       instance->registerEObj( "Unknown13", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f );
       instance->registerEObj( "Unknown14", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f );
-      instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
-      instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
-      instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+
+      auto memo = instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+      memo->setOnTalkHandler( memoOnTalk );
+      //instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+      //instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+
       instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f );
       instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f );
       instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f );
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 48457c84..0c7f1d38 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -273,7 +273,7 @@ void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t event
       return;
 
    if( auto onTalk = it->second->getOnTalkHandler() )
-      onTalk( player, actorId );
+      onTalk( player, it->second, getAsInstanceContent(), actorId );
    else
       player.sendDebug( "No onTalk handler found for interactable eobj with EObjID: " +
                         std::to_string( it->second->getObjectId() ) + ", eventId: " + std::to_string( eventId ) );