diff --git a/CMakeLists.txt b/CMakeLists.txt
index 055e39b3..8fb79881 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,14 +16,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # set(Boost_DEBUG 1)
 
-if(NOT SAPPHIRE_BOOST_VER)
-    set(SAPPHIRE_BOOST_VER 1.60.0)
+if( NOT SAPPHIRE_BOOST_VER )
+    set( SAPPHIRE_BOOST_VER 1.63.0 )
 endif()
-set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
+set( SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0 )
 
 ##########################################################################
 # Common and library path
-set(LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries")
+set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
 
 ##########################################################################
 # Dependencies and compiler settings
@@ -34,22 +34,22 @@ include( "cmake/cotire.cmake" )
 ##############################
 #             Git            #
 ##############################
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-git_describe(VERSION --all --dirty=-d)
-configure_file("src/common/Version.cpp.in"
-               "src/common/Version.cpp" @ONLY)
+include( GetGitRevisionDescription )
+get_git_head_revision( GIT_REFSPEC GIT_SHA1 )
+git_describe( VERSION --all --dirty=-d )
+configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp.in"
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp" @ONLY )
 
 ##########################################################################
-add_subdirectory("src/libraries/sapphire/datReader")
-add_subdirectory("src/libraries/sapphire/mysqlConnector")
-add_subdirectory("src/common")
+add_subdirectory( "src/libraries/sapphire/datReader" )
+add_subdirectory( "src/libraries/sapphire/mysqlConnector" )
+add_subdirectory( "src/common" )
 
-add_subdirectory("src/servers")
+add_subdirectory( "src/servers" )
 
-add_subdirectory("src/tools/exd_common_gen")
-add_subdirectory("src/tools/exd_struct_gen")
-add_subdirectory("src/tools/exd_struct_test")
-add_subdirectory("src/tools/quest_parser")
+add_subdirectory( "src/tools/exd_common_gen" )
+add_subdirectory( "src/tools/exd_struct_gen" )
+add_subdirectory( "src/tools/exd_struct_test" )
+add_subdirectory( "src/tools/quest_parser" )
 #add_subdirectory("src/tools/pcb_reader")
 #add_subdirectory("src/tools/event_object_parser")
diff --git a/src/common/Common.h b/src/common/Common.h
index d1a8810d..f99a7c77 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -12,704 +12,736 @@
 // They are also defined within the Core::Common namespace to avoid collisions.
 // +---------------------------------------------------------------------------
 namespace Core {
-namespace Common {
+   namespace Common {
 
-   // 99 is the last spawn id that seems to spawn any actor
-   const uint8_t MAX_DISPLAYED_ACTORS = 99;
-   const uint8_t MAX_DISPLAYED_EOBJS = 40;
+      // 99 is the last spawn id that seems to spawn any actor
+      const uint8_t MAX_DISPLAYED_ACTORS = 99;
+      const uint8_t MAX_DISPLAYED_EOBJS = 40;
 
-   const int32_t INVALID_GAME_OBJECT_ID = 0xE0000000;
+      const int32_t INVALID_GAME_OBJECT_ID = 0xE0000000;
 
-   struct FFXIVARR_POSITION3
-   {
-      float x;
-      float y;
-      float z;
-   };
-
-   enum EquipSlot : uint8_t
-   {
-      MainHand = 0,
-      OffHand = 1,
-      Head = 2,
-      Body = 3,
-      Hands = 4,
-      Waist = 5,
-      Legs = 6,
-      Feet = 7,
-      Neck = 8,
-      Ear = 9,
-      Wrist = 10,
-      Ring1 = 11,
-      Ring2 = 12,
-      SoulCrystal = 13,
-   };
-
-   enum InventoryType : uint16_t
-   {
-      Bag0 = 0,
-      Bag1 = 1,
-      Bag2 = 2,
-      Bag3 = 3,
-
-      GearSet0 = 1000,
-      GearSet1 = 1001,
-
-      Currency = 2000,
-      Crystal = 2001,
-      //UNKNOWN_0 = 2003,
-      KeyItem = 2004,
-      DamagedGear = 2007,
-      //UNKNOWN_1 = 2008,
-
-      ArmoryOff = 3200,
-      ArmoryHead = 3201,
-      ArmoryBody = 3202,
-      ArmoryHand = 3203,
-      ArmoryWaist = 3204,
-      ArmoryLegs = 3205,
-      ArmoryFeet = 3206,
-      ArmotyNeck = 3207,
-      ArmoryEar = 3208,
-      ArmoryWrist = 3209,
-      ArmoryRing = 3300,
-
-      ArmorySoulCrystal = 3400,
-      ArmoryMain = 3500,
-
-      RetainerBag0 = 10000,
-      RetainerBag1 = 10001,
-      RetainerBag2 = 10002,
-      RetainerBag3 = 10003,
-      RetainerBag4 = 10004,
-      RetainerBag5 = 10005,
-      RetainerBag6 = 10006,
-      RetainerEquippedGear = 11000,
-      RetainerGil = 12000,
-      RetainerCrystal = 12001,
-      RetainerMarket = 12002,
-
-      FreeCompanyBag0 = 20000,
-      FreeCompanyBag1 = 20001,
-      FreeCompanyBag2 = 20002,
-      FreeCompanyGil = 22000,
-      FreeCompanyCrystal = 22001
-   };
-
-
-   enum struct ZoneingType : uint8_t
-   {
-      None = 1,
-      Teleport = 2,
-      Return = 3,
-      ReturnDead = 4,
-      FadeIn = 5,
-   };
-
-   enum struct ResurrectType : uint8_t
-   {
-      None = 0,
-      RaiseSpell = 5,
-      Return = 8
-   };
-
-   enum Gender : uint8_t
-   {
-      Male = 0,
-      Female = 1,
-   };
-
-
-
-   enum struct GCRank : uint8_t
-   {
-      None = 0,
-      PrivateThirdClass = 1,
-      PrivateSecondClass = 2,
-      PrivateFirstClass = 3,
-      Corporal = 4,
-      SergeantThirdClass = 5,
-      SergeantSecondClass = 6,
-      SergeantFirstClass = 7,
-      ChiefSergeant = 8,
-      SecondLieutenant = 9,
-      FirstLieutenant = 10,
-      Captain = 11,
-      SecondCommander = 12,
-      FirstCommander = 13,
-      HighCommander = 14,
-      RearMarshal = 15,
-      ViceMarshal = 16,
-      Marshal = 17,
-      GrandMarshal = 18,
-      Champion = 19,
-   };
-
-   /**
-   * Structural representation of the packet sent by the server
-   * Send the entire StatusEffect list
-   */
-   struct StatusEffect
-   {
-      uint16_t effect_id;
-      uint16_t unknown1;
-      float duration;
-      uint32_t sourceActorId;
-   };
-
-   enum CharaLook : uint8_t
-   {
-      Race = 0x00,
-      Gender = 0x01,
-      Tribe = 0x04,
-      Height = 0x03,
-      ModelType = 0x02, // Au Ra: changes horns/tails, everything else: seems to drastically change appearance (flip between two sets, odd/even numbers). sometimes retains hairstyle and other features
-      FaceType = 0x05,
-      HairStyle = 0x06,
-      HasHighlights = 0x07, // negative to enable, positive to disable
-      SkinColor = 0x08,
-      EyeColor = 0x09, // color of character's right eye
-      HairColor = 0x0A, // main color
-      HairColor2 = 0x0B, // highlights color
-      FaceFeatures = 0x0C, // seems to be a toggle, (-odd and +even for large face covering), opposite for small
-      FaceFeaturesColor = 0x0D,
-      Eyebrows = 0x0E,
-      EyeColor2 = 0x0F, // color of character's left eye
-      EyeShape = 0x10,
-      NoseShape = 0x11,
-      JawShape = 0x12,
-      LipStyle = 0x13, // lip colour depth and shape (negative values around -120 darker/more noticeable, positive no colour)
-      LipColor = 0x14,
-      RaceFeatureSize = 0x15,
-      RaceFeatureType = 0x16, // negative or out of range tail shapes for race result in no tail (e.g. Au Ra has max of 4 tail shapes), incorrect value can crash client
-      BustSize = 0x17, // char creator allows up to max of 100, i set to 127 cause who wouldnt but no visible difference
-      Facepaint = 0x18,
-      FacepaintColor = 0x19,
-
-   };
-
-   enum MoveType : uint16_t
-   {
-      Run = 0x00,
-      Walk = 0x02,
-      Strafe = 0x04,
-      Jump = 0x100,
-      Fall = 0x400,
-      Land = 0x200,
-   };
-
-   struct QuestActive
-   {
-      QuestActive()
+      struct FFXIVARR_POSITION3
       {
-         c.questId = 0;
-         c.sequence = 0;
-         c.flags = 0;
-         c.UI8A = 0;
-         c.UI8B = 0;
-         c.UI8C = 0;
-         c.UI8D = 0;
-         c.UI8E = 0;
-         c.UI8F = 0;
-         c.padding = 0;
-      }
+         float x;
+         float y;
+         float z;
+      };
 
-
-      union
+      enum EquipSlot : uint8_t
       {
-         struct
-         {
-            uint16_t questId;
-            uint8_t sequence;
-            uint8_t flags;
-            uint8_t padding;
-            uint8_t BitFlag48;
-            uint8_t BitFlag40;
-            uint8_t BitFlag32;
-            uint8_t BitFlag24;
-            uint8_t BitFlag16;
-            uint8_t BitFlag8;
-            uint8_t padding1;
-         } a;
+         MainHand = 0,
+         OffHand = 1,
+         Head = 2,
+         Body = 3,
+         Hands = 4,
+         Waist = 5,
+         Legs = 6,
+         Feet = 7,
+         Neck = 8,
+         Ear = 9,
+         Wrist = 10,
+         Ring1 = 11,
+         Ring2 = 12,
+         SoulCrystal = 13,
+      };
 
-         struct
-         {
-            uint16_t questId;
-            uint8_t sequence;
-            uint8_t flags;
-            uint8_t padding;
-            uint8_t UI8AL : 4;
-            uint8_t UI8AH : 4;
-            uint8_t UI8BL : 4;
-            uint8_t UI8BH : 4;
-            uint8_t UI8CL : 4;
-            uint8_t UI8CH : 4;
-            uint8_t UI8DL : 4;
-            uint8_t UI8DH : 4;
-            uint8_t UI8EL : 4;
-            uint8_t UI8EH : 4;
-            uint8_t UI8FL : 4;
-            uint8_t UI8FH : 4;
-            uint8_t padding1;
-         } b;
+      enum InventoryType : uint16_t
+      {
+         Bag0 = 0,
+         Bag1 = 1,
+         Bag2 = 2,
+         Bag3 = 3,
 
-         struct
-         {
-            uint16_t questId;
-            uint8_t sequence;
-            uint8_t flags;
-            uint8_t padding;
-            uint8_t UI8A;
-            uint8_t UI8B;
-            uint8_t UI8C;
-            uint8_t UI8D;
-            uint8_t UI8E;
-            uint8_t UI8F;
-            uint8_t padding1;
-         } c;
+         GearSet0 = 1000,
+         GearSet1 = 1001,
 
-         //struct
-         //{
-         //   uint16_t questId;
-         //   uint8_t sequence;
-         //   uint8_t flags;
-         //   uint8_t padding;
-         //   uint16_t UI16A;
-         //   uint16_t UI16B;
-         //   uint16_t UI16C;
-         //   uint8_t padding1;
-         //} d;
+         Currency = 2000,
+         Crystal = 2001,
+         //UNKNOWN_0 = 2003,
+         KeyItem = 2004,
+         DamagedGear = 2007,
+         //UNKNOWN_1 = 2008,
 
-         //struct
-         //{
-         //   uint8_t padding;
-         //   uint32_t UI32A;
-         //   uint16_t padding2;
-         //} e;
+         ArmoryOff = 3200,
+         ArmoryHead = 3201,
+         ArmoryBody = 3202,
+         ArmoryHand = 3203,
+         ArmoryWaist = 3204,
+         ArmoryLegs = 3205,
+         ArmoryFeet = 3206,
+         ArmotyNeck = 3207,
+         ArmoryEar = 3208,
+         ArmoryWrist = 3209,
+         ArmoryRing = 3300,
+
+         ArmorySoulCrystal = 3400,
+         ArmoryMain = 3500,
+
+         RetainerBag0 = 10000,
+         RetainerBag1 = 10001,
+         RetainerBag2 = 10002,
+         RetainerBag3 = 10003,
+         RetainerBag4 = 10004,
+         RetainerBag5 = 10005,
+         RetainerBag6 = 10006,
+         RetainerEquippedGear = 11000,
+         RetainerGil = 12000,
+         RetainerCrystal = 12001,
+         RetainerMarket = 12002,
+
+         FreeCompanyBag0 = 20000,
+         FreeCompanyBag1 = 20001,
+         FreeCompanyBag2 = 20002,
+         FreeCompanyGil = 22000,
+         FreeCompanyCrystal = 22001
       };
 
 
-   };
-
-   enum struct ActionAspect : uint8_t
-   {
-      None = 0,   // Doesn't imply unaspected
-      Fire = 1,
-      Ice = 2,
-      Wind = 3,
-      Stone = 4,
-      Lightning = 5,
-      Water = 6,
-      Unaspected = 7    // Doesn't imply magical unaspected damage - could be unaspected physical
-   };
-
-   enum class ActionType : int8_t
-   {
-      WeaponOverride = -1, // Needs more investigation (takes the damage type of the equipped weapon)?
-      Unknown_0 = 0,
-      Slashing = 1,
-      Piercing = 2,
-      Blunt = 3,
-      Unknown_4 = 4,
-      Magical = 5,
-      Darkness = 6,
-      Unknown_7 = 7,
-      LimitBreak = 8,
-   };
-
-   enum ActionEffectType : uint8_t
-   {
-      Nothing = 0,
-      Miss = 1,
-      FullResist = 2,
-      Damage = 3,
-      Heal = 4,
-      BlockedDamage = 5,
-      ParriedDamage = 6,
-      Invulnerable = 7,
-      NoEffectText = 8,
-      Unknown_0 = 9,
-      MpLoss = 10,
-      MpGain = 11,
-      TpLoss = 12,
-      TpGain = 13,
-      GpGain = 14,
-      Mount = 38
-   };
-
-   enum class ActionHitSeverityType : uint8_t
-   {
-      NormalDamage = 0,
-      CritHeal = 0,
-      CritDamage = 1,
-      NormalHeal = 1,
-      DirectHitDamage = 2,
-      CritDirectHitDamage = 3
-   };
-
-   enum class ActionCollisionType : uint8_t
-   {
-      None,
-      SingleTarget,
-      Circle,
-      Cone,
-      Box,
-      Unknown,
-      Unknown2,
-      PersistentArea, // for when you set aoe like asylum
-      Unknown3
-   };
-
-   enum HandleActionType : uint8_t
-   {
-      Event,
-      Spell,
-      Teleport
-   };
-
-   enum HandleSkillType : uint8_t
-   {
-      StdDamage,
-      StdHeal,
-      StdDot,
-   };
-
-   enum InvincibilityType : uint8_t
-   {
-      InvincibilityNone,
-      InvincibilityRefill,
-      InvincibilityStayAlive,
-   };
-
-   enum PlayerStateFlag : uint8_t
-   {
-      HideUILockChar = 0, // as the name suggests, hides the ui and logs the char...
-      InCombat = 1, // in Combat, locks gearchange/return/teleport
-      Casting = 2,
-      InNpcEvent = 7, // when talking to an npc, locks ui giving "occupied" message
-
-      InNpcEvent1 = 10, // Sent together with InNpcEvent, when waiting for input? just a guess...
-
-      BetweenAreas = 24,
-      BoundByDuty = 28,
-      WatchingCutscene = 50, // this is actually just a dummy, this id is different
-
-
-   };
-
-   enum struct FateStatus : uint8_t
-   {
-      Active = 2,
-      Inactive = 4,
-      Preparing = 7,
-      Completed = 8,
-   };
-
-   enum ActorControlType : uint16_t
-   {
-      ToggleWeapon = 0x01,
-      SetStatus = 0x02,
-      CastStart = 0x03,
-      ToggleAggro = 0x04,
-      ClassJobChange = 0x05,
-      DefeatMsg = 0x06,
-      GainExpMsg = 0x07,
-
-      LevelUpEffect = 0x0A,
-
-      ExpChainMsg = 0x0C,
-      HpSetStat = 0x0D,
-      DeathAnimation = 0x0E,
-      CastInterrupt = 0x0F,
-
-      ActionStart = 0x11,
-
-      StatusEffectGain = 0x14,
-      StatusEffectLose = 0x15,
-
-      HPFloatingText = 0x17,
-      UpdateRestedExp = 0x018,
-      Unk2 = 0x19,
+      enum struct ZoneingType : uint8_t
+      {
+         None = 1,
+         Teleport = 2,
+         Return = 3,
+         ReturnDead = 4,
+         FadeIn = 5,
+      };
+
+      enum struct ResurrectType : uint8_t
+      {
+         None = 0,
+         RaiseSpell = 5,
+         Return = 8
+      };
+
+      enum Gender : uint8_t
+      {
+         Male = 0,
+         Female = 1,
+      };
+
+
+
+      enum struct GCRank : uint8_t
+      {
+         None = 0,
+         PrivateThirdClass = 1,
+         PrivateSecondClass = 2,
+         PrivateFirstClass = 3,
+         Corporal = 4,
+         SergeantThirdClass = 5,
+         SergeantSecondClass = 6,
+         SergeantFirstClass = 7,
+         ChiefSergeant = 8,
+         SecondLieutenant = 9,
+         FirstLieutenant = 10,
+         Captain = 11,
+         SecondCommander = 12,
+         FirstCommander = 13,
+         HighCommander = 14,
+         RearMarshal = 15,
+         ViceMarshal = 16,
+         Marshal = 17,
+         GrandMarshal = 18,
+         Champion = 19,
+      };
+
+      /**
+      * Structural representation of the packet sent by the server
+      * Send the entire StatusEffect list
+      */
+      struct StatusEffect
+      {
+         uint16_t effect_id;
+         uint16_t unknown1;
+         float duration;
+         uint32_t sourceActorId;
+      };
+
+      enum CharaLook : uint8_t
+      {
+         Race = 0x00,
+         Gender = 0x01,
+         Tribe = 0x04,
+         Height = 0x03,
+         ModelType = 0x02, // Au Ra: changes horns/tails, everything else: seems to drastically change appearance (flip between two sets, odd/even numbers). sometimes retains hairstyle and other features
+         FaceType = 0x05,
+         HairStyle = 0x06,
+         HasHighlights = 0x07, // negative to enable, positive to disable
+         SkinColor = 0x08,
+         EyeColor = 0x09, // color of character's right eye
+         HairColor = 0x0A, // main color
+         HairColor2 = 0x0B, // highlights color
+         FaceFeatures = 0x0C, // seems to be a toggle, (-odd and +even for large face covering), opposite for small
+         FaceFeaturesColor = 0x0D,
+         Eyebrows = 0x0E,
+         EyeColor2 = 0x0F, // color of character's left eye
+         EyeShape = 0x10,
+         NoseShape = 0x11,
+         JawShape = 0x12,
+         LipStyle = 0x13, // lip colour depth and shape (negative values around -120 darker/more noticeable, positive no colour)
+         LipColor = 0x14,
+         RaceFeatureSize = 0x15,
+         RaceFeatureType = 0x16, // negative or out of range tail shapes for race result in no tail (e.g. Au Ra has max of 4 tail shapes), incorrect value can crash client
+         BustSize = 0x17, // char creator allows up to max of 100, i set to 127 cause who wouldnt but no visible difference
+         Facepaint = 0x18,
+         FacepaintColor = 0x19,
+
+      };
+
+      enum MoveType : uint16_t
+      {
+         Run = 0x00,
+         Walk = 0x02,
+         Strafe = 0x04,
+         Jump = 0x100,
+         Fall = 0x400,
+         Land = 0x200,
+      };
+
+      struct QuestActive
+      {
+         QuestActive()
+         {
+            c.questId = 0;
+            c.sequence = 0;
+            c.flags = 0;
+            c.UI8A = 0;
+            c.UI8B = 0;
+            c.UI8C = 0;
+            c.UI8D = 0;
+            c.UI8E = 0;
+            c.UI8F = 0;
+            c.padding = 0;
+         }
+
+
+         union
+         {
+            struct
+            {
+               uint16_t questId;
+               uint8_t sequence;
+               uint8_t flags;
+               uint8_t padding;
+               uint8_t BitFlag48;
+               uint8_t BitFlag40;
+               uint8_t BitFlag32;
+               uint8_t BitFlag24;
+               uint8_t BitFlag16;
+               uint8_t BitFlag8;
+               uint8_t padding1;
+            } a;
+
+            struct
+            {
+               uint16_t questId;
+               uint8_t sequence;
+               uint8_t flags;
+               uint8_t padding;
+               uint8_t UI8AL : 4;
+               uint8_t UI8AH : 4;
+               uint8_t UI8BL : 4;
+               uint8_t UI8BH : 4;
+               uint8_t UI8CL : 4;
+               uint8_t UI8CH : 4;
+               uint8_t UI8DL : 4;
+               uint8_t UI8DH : 4;
+               uint8_t UI8EL : 4;
+               uint8_t UI8EH : 4;
+               uint8_t UI8FL : 4;
+               uint8_t UI8FH : 4;
+               uint8_t padding1;
+            } b;
+
+            struct
+            {
+               uint16_t questId;
+               uint8_t sequence;
+               uint8_t flags;
+               uint8_t padding;
+               uint8_t UI8A;
+               uint8_t UI8B;
+               uint8_t UI8C;
+               uint8_t UI8D;
+               uint8_t UI8E;
+               uint8_t UI8F;
+               uint8_t padding1;
+            } c;
+
+            //struct
+            //{
+            //   uint16_t questId;
+            //   uint8_t sequence;
+            //   uint8_t flags;
+            //   uint8_t padding;
+            //   uint16_t UI16A;
+            //   uint16_t UI16B;
+            //   uint16_t UI16C;
+            //   uint8_t padding1;
+            //} d;
+
+            //struct
+            //{
+            //   uint8_t padding;
+            //   uint32_t UI32A;
+            //   uint16_t padding2;
+            //} e;
+         };
+
+
+      };
+
+      enum struct ActionAspect : uint8_t
+      {
+         None = 0,   // Doesn't imply unaspected
+         Fire = 1,
+         Ice = 2,
+         Wind = 3,
+         Stone = 4,
+         Lightning = 5,
+         Water = 6,
+         Unaspected = 7    // Doesn't imply magical unaspected damage - could be unaspected physical
+      };
+
+      enum class ActionType : int8_t
+      {
+         WeaponOverride = -1, // Needs more investigation (takes the damage type of the equipped weapon)?
+         Unknown_0 = 0,
+         Slashing = 1,
+         Piercing = 2,
+         Blunt = 3,
+         Unknown_4 = 4,
+         Magical = 5,
+         Darkness = 6,
+         Unknown_7 = 7,
+         LimitBreak = 8,
+      };
+
+      enum ActionEffectType : uint8_t
+      {
+         Nothing = 0,
+         Miss = 1,
+         FullResist = 2,
+         Damage = 3,
+         Heal = 4,
+         BlockedDamage = 5,
+         ParriedDamage = 6,
+         Invulnerable = 7,
+         NoEffectText = 8,
+         Unknown_0 = 9,
+         MpLoss = 10,
+         MpGain = 11,
+         TpLoss = 12,
+         TpGain = 13,
+         GpGain = 14,
+         Mount = 38
+      };
+
+      enum class ActionHitSeverityType : uint8_t
+      {
+         NormalDamage = 0,
+         CritHeal = 0,
+         CritDamage = 1,
+         NormalHeal = 1,
+         DirectHitDamage = 2,
+         CritDirectHitDamage = 3
+      };
+
+      enum class ActionCollisionType : uint8_t
+      {
+         None,
+         SingleTarget,
+         Circle,
+         Cone,
+         Box,
+         Unknown,
+         Unknown2,
+         PersistentArea, // for when you set aoe like asylum
+         Unknown3
+      };
+
+      enum HandleActionType : uint8_t
+      {
+         Event,
+         Spell,
+         Teleport
+      };
+
+      enum HandleSkillType : uint8_t
+      {
+         StdDamage,
+         StdHeal,
+         StdDot,
+      };
+
+      enum InvincibilityType : uint8_t
+      {
+         InvincibilityNone,
+         InvincibilityRefill,
+         InvincibilityStayAlive,
+      };
+
+      enum PlayerStateFlag : uint8_t
+      {
+         HideUILockChar = 0, // as the name suggests, hides the ui and logs the char...
+         InCombat = 1, // in Combat, locks gearchange/return/teleport
+         Casting = 2,
+         InNpcEvent = 7, // when talking to an npc, locks ui giving "occupied" message
+
+         InNpcEvent1 = 10, // Sent together with InNpcEvent, when waiting for input? just a guess...
+
+         BetweenAreas = 24,
+         BoundByDuty = 28,
+         WatchingCutscene = 50, // this is actually just a dummy, this id is different
+
+
+      };
+
+      enum struct FateStatus : uint8_t
+      {
+         Active = 2,
+         Inactive = 4,
+         Preparing = 7,
+         Completed = 8,
+      };
+
+      enum ActorControlType : uint16_t
+      {
+         ToggleWeapon = 0x01,
+         SetStatus = 0x02,
+         CastStart = 0x03,
+         ToggleAggro = 0x04,
+         ClassJobChange = 0x05,
+         DefeatMsg = 0x06,
+         GainExpMsg = 0x07,
+
+         LevelUpEffect = 0x0A,
+
+         ExpChainMsg = 0x0C,
+         HpSetStat = 0x0D,
+         DeathAnimation = 0x0E,
+         CastInterrupt = 0x0F,
+
+         ActionStart = 0x11,
+
+         StatusEffectGain = 0x14,
+         StatusEffectLose = 0x15,
+
+         HPFloatingText = 0x17,
+         UpdateRestedExp = 0x018,
+         Unk2 = 0x19,
 
-      Flee = 0x1B,
+         Flee = 0x1B,
 
-      Unk3 = 0x20,                  // Animation related?
+         Unk3 = 0x20,                  // Animation related?
 
-      CombatIndicationShow = 0x22,
+         CombatIndicationShow = 0x22,
 
-      SpawnEffect = 0x25,
-      ToggleInvisible = 0x26,
+         SpawnEffect = 0x25,
+         ToggleInvisible = 0x26,
 
-      ToggleActionUnlock = 0x29,
+         ToggleActionUnlock = 0x29,
 
-      UpdateUiExp = 0x2B,
-      DmgTakenMsg = 0x2D,
+         UpdateUiExp = 0x2B,
+         DmgTakenMsg = 0x2D,
 
-      SetTarget = 0x32,
-      ToggleNameHidden = 0x36,
+         SetTarget = 0x32,
+         ToggleNameHidden = 0x36,
 
-      LimitbreakStart = 0x47,
-      LimitbreakPartyStart = 0x48,
-      BubbleText = 0x49,
+         LimitbreakStart = 0x47,
+         LimitbreakPartyStart = 0x48,
+         BubbleText = 0x49,
 
-      DamageEffect = 0x50,
-      RaiseAnimation = 0x51,
-      TreasureScreenMsg = 0x57,
-      SetOwnerId = 0x59,
-      ItemRepairMsg = 0x5C,
+         DamageEffect = 0x50,
+         RaiseAnimation = 0x51,
+         TreasureScreenMsg = 0x57,
+         SetOwnerId = 0x59,
+         ItemRepairMsg = 0x5C,
 
-      DirectorInit = 0x64,
-      DirectorClear = 0x65,
+         DirectorInit = 0x64,
+         DirectorClear = 0x65,
 
-      LeveStartAnim = 0x66,
-      LeveStartError = 0x67,
-      DirectorEObjMod = 0x6A,
+         LeveStartAnim = 0x66,
+         LeveStartError = 0x67,
+         DirectorEObjMod = 0x6A,
 
-      DirectorUpdate = 0x6D,
+         DirectorUpdate = 0x6D,
 
-      ItemObtainMsg = 0x75,
-      DutyQuestScreenMsg = 0x7B,
+         ItemObtainMsg = 0x75,
+         DutyQuestScreenMsg = 0x7B,
 
-      ItemObtainIcon = 0x84,
-      FateItemFailMsg = 0x85,
-      ItemFailMsg = 0x86,
-      ActionLearnMsg1 = 0x87,
+         ItemObtainIcon = 0x84,
+         FateItemFailMsg = 0x85,
+         ItemFailMsg = 0x86,
+         ActionLearnMsg1 = 0x87,
 
-      FreeEventPos = 0x8A,
+         FreeEventPos = 0x8A,
 
-      UnlockAetherCurrentMsg = 0xA4,
+         UnlockAetherCurrentMsg = 0xA4,
 
-      RemoveName = 0xA8,
+         RemoveName = 0xA8,
 
-      ScreenFadeOut = 0xAA,
+         ScreenFadeOut = 0xAA,
 
-      ZoneIn = 0xC8,
-      ZoneInDefaultPos = 0xC9,
+         ZoneIn = 0xC8,
+         ZoneInDefaultPos = 0xC9,
 
-      TeleportStart = 0xCB,
+         TeleportStart = 0xCB,
 
-      TeleportDone = 0xCD,
-      TeleportDoneFadeOut = 0xCE,
-      DespawnZoneScreenMsg = 0xCF,
+         TeleportDone = 0xCD,
+         TeleportDoneFadeOut = 0xCE,
+         DespawnZoneScreenMsg = 0xCF,
 
-      InstanceSelectDlg = 0xD2,
-      ActorDespawnEffect = 0xD4,
+         InstanceSelectDlg = 0xD2,
+         ActorDespawnEffect = 0xD4,
 
-      CompanionUnlock = 0xFD,
-      ObtainBarding = 0xFE,
-      EquipBarding = 0xFF,
+         CompanionUnlock = 0xFD,
+         ObtainBarding = 0xFE,
+         EquipBarding = 0xFF,
 
-      CompanionMsg1 = 0x102,
-      CompanionMsg2 = 0x103,
-      ShowPetHotbar = 0x104,
+         CompanionMsg1 = 0x102,
+         CompanionMsg2 = 0x103,
+         ShowPetHotbar = 0x104,
 
-      ActionLearnMsg = 0x109,
-      ActorFadeOut = 0x10A,
-      ActorFadeIn = 0x10B,
-      WithdrawMsg = 0x10C,
-      OrderMinion = 0x10D,
-      ToggleMinion = 0x10E,
-      LearnMinion = 0x10F,
-      ActorFateOut1 = 0x110,
+         ActionLearnMsg = 0x109,
+         ActorFadeOut = 0x10A,
+         ActorFadeIn = 0x10B,
+         WithdrawMsg = 0x10C,
+         OrderMinion = 0x10D,
+         ToggleMinion = 0x10E,
+         LearnMinion = 0x10F,
+         ActorFateOut1 = 0x110,
 
-      Emote = 0x122,
+         Emote = 0x122,
 
-      SetPose = 0x127,
+         SetPose = 0x127,
 
-      CraftingUnk = 0x12C,
+         CraftingUnk = 0x12C,
 
-      GatheringSenseMsg = 0x130,
-      PartyMsg = 0x131,
-      GatheringSenseMsg1 = 0x132,
+         GatheringSenseMsg = 0x130,
+         PartyMsg = 0x131,
+         GatheringSenseMsg1 = 0x132,
 
-      GatheringSenseMsg2 = 0x138,
+         GatheringSenseMsg2 = 0x138,
 
-      FishingMsg = 0x140,
+         FishingMsg = 0x140,
 
-      FishingBaitMsg = 0x145,
+         FishingBaitMsg = 0x145,
 
-      FishingReachMsg = 0x147,
-      FishingFailMsg = 0x148,
+         FishingReachMsg = 0x147,
+         FishingFailMsg = 0x148,
 
-      MateriaConvertMsg = 0x15E,
-      MeldSuccessMsg = 0x15F,
-      MeldFailMsg = 0x160,
-      MeldModeToggle = 0x161,
+         MateriaConvertMsg = 0x15E,
+         MeldSuccessMsg = 0x15F,
+         MeldFailMsg = 0x160,
+         MeldModeToggle = 0x161,
 
-      AetherRestoreMsg = 0x163,
+         AetherRestoreMsg = 0x163,
 
-      DyeMsg = 0x168,
+         DyeMsg = 0x168,
 
-      ToggleCrestMsg = 0x16A,
-      ToggleBulkCrestMsg = 0x16B,
-      MateriaRemoveMsg = 0x16C,
-      GlamourCastMsg = 0x16D,
-      GlamourRemoveMsg = 0x16E,
-
-      RelicInfuseMsg = 0x179,
-
-      AetherReductionDlg = 0x17D,
-
-      Unk6 = 0x19C,
-
-      SetTitle = 0x1F4,
-
-      SetStatusIcon = 0x1F8,
-
-      SetHomepoint = 0x1FB,
-      SetFavorite = 0x1FC,
-      LearnTeleport = 0x1FD,
-
-      ArmoryErrorMsg = 0x201,
-
-      AchievementPopup = 0x203,
-
-      Unk7 = 0x205,                 // LogMessage?
-      AchievementMsg = 0x206,
-
-      SetItemLevel = 0x209,
-
-      ChallengeEntryCompleteMsg = 0x20B,
-      ChallengeEntryUnlockMsg = 0x20C,
-
-      GilTrailMsg = 0x211,
-
-      SetMaxGearSets = 0x230,
-
-      SetCharaGearParamUI = 0x260,
-
-      GearSetEquipMsg = 0x321,
-
-      DisableCurrentFestival = 0x386,
-
-      ToggleOrchestrionUnlock = 0x396,
-      Dismount = 0x3a0
-   };
-
-   enum struct ChatType : uint16_t
-   {
-      LogKindError,
-      ServerDebug,
-      ServerUrgent,
-      ServerNotice,
-      Unused4,
-      Unused5,
-      Unused6,
-      Unused7,
-      Unused8,
-      Unused9,
-      Say,
-      Shout,
-      Tell,
-      TellReceive,
-      Party,
-      Alliance,
-      LS1,
-      LS2,
-      LS3,
-      LS4,
-      LS5,
-      LS6,
-      LS7,
-      LS8,
-      FreeCompany,
-      Unused25,
-      Unused26,
-      NoviceNetwork,
-      CustomEmote,
-      StandardEmote,
-      Yell,
-      Unknown31,
-      PartyUnk2,
-      Unused33,
-      Unused34,
-      Unused35,
-      Unused36,
-      Unused37,
-      Unused38,
-      Unused39,
-      Unused40,
-      BattleDamage,
-      BattleFailed,
-      BattleActions,
-      BattleItems,
-      BattleHealing,
-      BattleBeneficial,
-      BattleDetrimental,
-      BattleUnk48,
-      BattleUnk49,
-      Unused50,
-      Unused51,
-      Unused52,
-      Unused53,
-      Unused54,
-      Unused55,
-      Echo,
-      SystemMessage,
-      SystemErrorMessage,
-      BattleSystem,
-      GatheringSystem,
-      NPCMessage,
-      LootMessage,
-      Unused63,
-      CharProgress,
-      Loot,
-      Crafting,
-      Gathering,
-      NPCAnnouncement,
-      FCAnnouncement,
-      FCLogin,
-      RetainerSale,
-      PartySearch,
-      PCSign,
-      DiceRoll,
-      NoviceNetworkNotice,
-      Unknown76,
-      Unused77,
-      Unused78,
-      Unused79,
-      GMTell,
-      GMSay,
-      GMShout,
-      GMYell,
-      GMParty,
-      GMFreeCompany,
-      GMLS1,
-      GMLS2,
-      GMLS3,
-      GMLS4,
-      GMLS5,
-      GMLS6,
-      GMLS7,
-      GMLS8,
-      GMNoviceNetwork,
-      Unused95,
-      Unused96,
-      Unused97,
-      Unused98,
-      Unused99,
-      Unused100
-   };
-
-   enum EquipDisplayFlags : uint8_t
-   {
-      HideNothing = 0x0,
-      HideHead = 0x1,
-      HideWeapon = 0x2,
-      LegacyMark = 0x4,
-
-      Visor = 0x40,
-   };
-
-   enum SkillType : uint8_t
-   {
-      Normal = 0x1,
-      MountSkill = 0xD,
-   };
-
-   typedef std::vector< PlayerStateFlag > PlayerStateFlagList;
-
-} /* Common */
+         ToggleCrestMsg = 0x16A,
+         ToggleBulkCrestMsg = 0x16B,
+         MateriaRemoveMsg = 0x16C,
+         GlamourCastMsg = 0x16D,
+         GlamourRemoveMsg = 0x16E,
+
+         RelicInfuseMsg = 0x179,
+
+         AetherReductionDlg = 0x17D,
+
+         Unk6 = 0x19C,
+
+         SetTitle = 0x1F4,
+
+         SetStatusIcon = 0x1F8,
+
+         SetHomepoint = 0x1FB,
+         SetFavorite = 0x1FC,
+         LearnTeleport = 0x1FD,
+
+         ArmoryErrorMsg = 0x201,
+
+         AchievementPopup = 0x203,
+
+         Unk7 = 0x205,                 // LogMessage?
+         AchievementMsg = 0x206,
+
+         SetItemLevel = 0x209,
+
+         ChallengeEntryCompleteMsg = 0x20B,
+         ChallengeEntryUnlockMsg = 0x20C,
+
+         GilTrailMsg = 0x211,
+
+         SetMaxGearSets = 0x230,
+
+         SetCharaGearParamUI = 0x260,
+
+         GearSetEquipMsg = 0x321,
+
+         DisableCurrentFestival = 0x386,
+
+         ToggleOrchestrionUnlock = 0x396,
+         Dismount = 0x3a0
+      };
+
+      enum struct ChatType : uint16_t
+      {
+         LogKindError,
+         ServerDebug,
+         ServerUrgent,
+         ServerNotice,
+         Unused4,
+         Unused5,
+         Unused6,
+         Unused7,
+         Unused8,
+         Unused9,
+         Say,
+         Shout,
+         Tell,
+         TellReceive,
+         Party,
+         Alliance,
+         LS1,
+         LS2,
+         LS3,
+         LS4,
+         LS5,
+         LS6,
+         LS7,
+         LS8,
+         FreeCompany,
+         Unused25,
+         Unused26,
+         NoviceNetwork,
+         CustomEmote,
+         StandardEmote,
+         Yell,
+         Unknown31,
+         PartyUnk2,
+         Unused33,
+         Unused34,
+         Unused35,
+         Unused36,
+         Unused37,
+         Unused38,
+         Unused39,
+         Unused40,
+         BattleDamage,
+         BattleFailed,
+         BattleActions,
+         BattleItems,
+         BattleHealing,
+         BattleBeneficial,
+         BattleDetrimental,
+         BattleUnk48,
+         BattleUnk49,
+         Unused50,
+         Unused51,
+         Unused52,
+         Unused53,
+         Unused54,
+         Unused55,
+         Echo,
+         SystemMessage,
+         SystemErrorMessage,
+         BattleSystem,
+         GatheringSystem,
+         NPCMessage,
+         LootMessage,
+         Unused63,
+         CharProgress,
+         Loot,
+         Crafting,
+         Gathering,
+         NPCAnnouncement,
+         FCAnnouncement,
+         FCLogin,
+         RetainerSale,
+         PartySearch,
+         PCSign,
+         DiceRoll,
+         NoviceNetworkNotice,
+         Unknown76,
+         Unused77,
+         Unused78,
+         Unused79,
+         GMTell,
+         GMSay,
+         GMShout,
+         GMYell,
+         GMParty,
+         GMFreeCompany,
+         GMLS1,
+         GMLS2,
+         GMLS3,
+         GMLS4,
+         GMLS5,
+         GMLS6,
+         GMLS7,
+         GMLS8,
+         GMNoviceNetwork,
+         Unused95,
+         Unused96,
+         Unused97,
+         Unused98,
+         Unused99,
+         Unused100
+      };
+
+      enum EquipDisplayFlags : uint8_t
+      {
+         HideNothing = 0x0,
+         HideHead = 0x1,
+         HideWeapon = 0x2,
+         LegacyMark = 0x4,
+
+         Visor = 0x40,
+      };
+
+      enum SkillType : uint8_t
+      {
+         Normal = 0x1,
+         MountSkill = 0xD,
+      };
+
+      enum SocialCategory : uint8_t
+      {
+         Party = 1,
+         Friends = 2,
+         FreeCompanyPetition = 4,
+         FreeCompany = 5,
+      };
+
+      enum SocialListType : uint8_t
+      {
+         PartyList = 0x02,
+         FriendList = 0x0b,
+         SearchList = 0x0e,
+      };
+
+
+      // todo: rename SocialRequestAction and SocialRequestResponse cause they seem ambiguous
+      enum class SocialRequestAction : uint8_t
+      {
+         Invite = 1,
+         Cancel = 2,
+         Accept = 3,
+         Decline = 4,
+      };
+
+      enum class SocialRequestResponse : uint8_t
+      {
+         Decline,
+         Accept,
+         Cancel,
+      };
+
+      typedef std::vector< PlayerStateFlag > PlayerStateFlagList;
+
+   } /* Common */
 } /* Core */
 
 #endif
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index a4353394..366fc954 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -1,13 +1,13 @@
 #include "DbConnection.h"
 #include "DbWorker.h"
 #include <MySqlConnector.h>
-
 #include "Logging/Logger.h"
+
 #include "PreparedStatement.h"
 #include <boost/make_shared.hpp>
+#include "Framework.h"
 
-
-extern Core::Logger g_log;
+extern Core::Framework g_fw;
 
 Core::Db::DbConnection::DbConnection( ConnectionInfo &connInfo ) :
    m_reconnecting( false ),
@@ -67,7 +67,7 @@ uint32_t Core::Db::DbConnection::open()
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return 1;
    }
 
@@ -119,7 +119,7 @@ bool Core::Db::DbConnection::execute( const std::string& sql )
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return false;
    }
 }
@@ -134,7 +134,7 @@ boost::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( const std::
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return nullptr;
    }
 }
@@ -148,13 +148,11 @@ boost::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( boost::shar
 
    if( !ping() )
    {
-      g_log.error( "MysqlConnection went down" );
       // naivly reconnect and hope for the best
       open();
       lockIfReady();
       if( !prepareStatements() )
-         g_log.error( "Mysql Statements failed to prepare..." );
-      g_log.info( "MysqlConnection reestablished" );
+         return nullptr;
    }
 
    uint32_t index = stmt->getIndex();
@@ -172,7 +170,7 @@ boost::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( boost::shar
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return nullptr;
    }
    
@@ -198,7 +196,7 @@ bool Core::Db::DbConnection::execute( boost::shared_ptr< Core::Db::PreparedState
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return false;
    }
 }
@@ -234,7 +232,7 @@ void Core::Db::DbConnection::prepareStatement( uint32_t index, const std::string
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       m_prepareError = true;
    }
 
diff --git a/src/common/Database/DbLoader.cpp b/src/common/Database/DbLoader.cpp
index 376d7b77..56cd4be2 100644
--- a/src/common/Database/DbLoader.cpp
+++ b/src/common/Database/DbLoader.cpp
@@ -3,8 +3,9 @@
 #include "CharaDbConnection.h"
 #include "DbWorkerPool.h"
 #include "Logging/Logger.h"
+#include "Framework.h"
 
-extern Core::Logger g_log;
+extern Core::Framework g_fw;
 
 Core::Db::DbLoader::DbLoader()
 {
@@ -16,12 +17,14 @@ Core::Db::DbLoader& Core::Db::DbLoader::addDb( Core::Db::DbWorkerPool< T >& pool
 
    m_open.push([this, info, &pool]() -> bool
               {
+                
+                 auto pLog = g_fw.get< Logger >();
                  const uint8_t asyncThreads = info.asyncThreads;
                  const uint8_t synchThreads = info.syncThreads;
 
                  if( asyncThreads < 1 || asyncThreads > 32 )
                  {
-                    g_log.error( "database: invalid number of worker threads specified. Please pick a value between 1 and 32." );
+                    pLog->error( "database: invalid number of worker threads specified. Please pick a value between 1 and 32." );
                     return false;
                  }
 
@@ -36,7 +39,7 @@ Core::Db::DbLoader& Core::Db::DbLoader::addDb( Core::Db::DbWorkerPool< T >& pool
 
                     if( error )
                     {
-                       g_log.error( "DatabasePool failed to open." );
+                       pLog->error( "DatabasePool failed to open." );
                        return false;
                     }
                  }
@@ -50,7 +53,8 @@ Core::Db::DbLoader& Core::Db::DbLoader::addDb( Core::Db::DbWorkerPool< T >& pool
                  {
                     if( !pool.prepareStatements() )
                     {
-                       g_log.error( "Could not prepare statements of the database, see log for details." );
+                       auto pLog = g_fw.get< Logger >();
+                       pLog->error( "Could not prepare statements of the database, see log for details." );
                        return false;
                     }
                     return true;
@@ -104,5 +108,5 @@ bool Core::Db::DbLoader::process( std::queue< Predicate >& queue )
 template
 Core::Db::DbLoader&
    Core::Db::DbLoader::addDb< Core::Db::CharaDbConnection >( Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >&,
-                                                                          const ConnectionInfo& );
+                                                             const ConnectionInfo& );
 
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index 24529f01..785b857d 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -6,9 +6,11 @@
 #include "Operation.h"
 #include "CharaDbConnection.h"
 #include <boost/make_shared.hpp>
+#include "Framework.h"
 
 #include "Logging/Logger.h"
-extern Core::Logger g_log;
+
+extern Core::Framework g_fw;
 
 class PingOperation : public Core::Db::Operation
 {
@@ -46,7 +48,8 @@ void Core::Db::DbWorkerPool< T >::setConnectionInfo( const ConnectionInfo& info,
 template< class T >
 uint32_t Core::Db::DbWorkerPool< T >::open()
 {
-   g_log.info( "[DbPool] Opening DatabasePool " + getDatabaseName() +
+   auto pLog = g_fw.get< Logger >();
+   pLog->info( "[DbPool] Opening DatabasePool " + getDatabaseName() +
                " Asynchronous connections: " + std::to_string( m_asyncThreads ) +
                " Synchronous connections: " + std::to_string( m_synchThreads ) );
 
@@ -59,7 +62,7 @@ uint32_t Core::Db::DbWorkerPool< T >::open()
 
    if( !error )
    {
-      g_log.info( "[DbPool] DatabasePool " + getDatabaseName() + " opened successfully. " +
+      pLog->info( "[DbPool] DatabasePool " + getDatabaseName() + " opened successfully. " +
                   std::to_string( ( m_connections[IDX_SYNCH].size() + m_connections[IDX_ASYNC].size() ) ) +
                   " total connections running." );
    }
@@ -70,10 +73,11 @@ uint32_t Core::Db::DbWorkerPool< T >::open()
 template< class T >
 void Core::Db::DbWorkerPool< T >::close()
 {
-   g_log.info("[DbPool] Closing down DatabasePool " + getDatabaseName() );
+   auto pLog = g_fw.get< Logger >();
+   pLog->info("[DbPool] Closing down DatabasePool " + getDatabaseName() );
    m_connections[IDX_ASYNC].clear();
    m_connections[IDX_SYNCH].clear();
-   g_log.info("[DbPool] All connections on DatabasePool " + getDatabaseName() + "closed." );
+   pLog->info("[DbPool] All connections on DatabasePool " + getDatabaseName() + "closed." );
 }
 
 template< class T >
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 515bfe0e..0325e222 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -2,6 +2,11 @@
 #define _COMMON_FORWARDS_H
 
 #include <boost/shared_ptr.hpp>
+#include <chrono>
+
+using namespace std::chrono_literals;
+using time_point = std::chrono::steady_clock::time_point;
+using duration = std::chrono::steady_clock::duration;
 
 namespace Core 
 {
diff --git a/src/common/Framework.cpp b/src/common/Framework.cpp
new file mode 100644
index 00000000..9951e8a2
--- /dev/null
+++ b/src/common/Framework.cpp
@@ -0,0 +1,5 @@
+#include "Framework.h"
+
+#include <Logging/Logger.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
diff --git a/src/common/Framework.h b/src/common/Framework.h
new file mode 100644
index 00000000..d6e57fbc
--- /dev/null
+++ b/src/common/Framework.h
@@ -0,0 +1,37 @@
+#ifndef _CORE_FRAMEWORK_H
+#define _CORE_FRAMEWORK_H
+
+#include <map>
+#include <typeindex>
+#include <typeinfo>
+#include <boost/shared_ptr.hpp>
+#include <cassert>
+
+namespace Core
+{
+
+   class Framework
+   {
+      using TypenameToObject = std::map< std::type_index, boost::shared_ptr< void > >;
+      TypenameToObject ObjectMap;
+
+   public:
+      template< typename T >
+      boost::shared_ptr< T > get()
+      {
+         auto iType = ObjectMap.find( typeid( T ) );
+         assert( !( iType == ObjectMap.end() ) );
+         return boost::static_pointer_cast< T >( iType->second );
+      }
+
+      template< typename T >
+      void set( boost::shared_ptr< T > value )
+      {
+         assert( value ); // why would anyone store nullptrs....
+         ObjectMap[typeid( T )] = value;
+      }
+   };
+
+}
+
+#endif // _CORE_FRAMEWORK_H
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index fe3785af..0c565c60 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -1,7 +1,7 @@
 #ifndef _CORE_NETWORK_PACKETS_IPCS_H
 #define _CORE_NETWORK_PACKETS_IPCS_H
 
-#include<stdint.h>
+#include <stdint.h>
 
 namespace Core {
 namespace Network {
@@ -72,9 +72,10 @@ namespace Packets {
 
       Playtime                   = 0x00DF, // updated 4.2
       CFRegistered               = 0x00B8, // updated 4.1
-      SocialRequestResponse      = 0x00BB, // updated 4.1
       CancelAllianceForming      = 0x00C6, // updated 4.2
       Chat                       = 0x00E1, // updated 4.2
+      SocialRequestResponse      = 0x00E5, // updated 4.1
+      SocialRequestReceive       = 0x00E6, // updated 4.2
       SocialList                 = 0x00E7, // updated 4.2
 
       UpdateSearchInfo           = 0x00EA, // updated 4.2
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index a5ffa9b5..c86bbccf 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -81,19 +81,64 @@ struct FFXIVIpcPlayTime : FFXIVIpcBasePacket<Playtime>
 */
 struct PlayerEntry {
    uint64_t contentId;
-   uint8_t bytes[12];
+   uint32_t timestamp;
+   uint8_t bytes[4];
+   uint8_t status;      // bitmask. friend: if it's a request, if added, recipient/sender
+   uint8_t unknown;     // maybe bitmask? a value of 4 sets it to linkshell request
+   uint8_t entryIcon;   // observed in friend group icon, sideffects for displaying text
+   uint8_t unavailable; // bool
    uint16_t zoneId;
-   uint16_t zoneId1;
-   char bytes1[8];
+   uint8_t grandCompany;
+   uint8_t clientLanguage;
+   uint8_t knownLanguages; // bitmask, J 0x01, E 0x02, D 0x04, F 0x08
+   uint8_t searchComment; // bool
+   char bytes1[6];
    uint64_t onlineStatusMask;
-   uint8_t classJob;
+   Common::ClassJob classJob;
    uint8_t padding;
-   uint8_t level;
-   uint8_t padding1;
+   uint16_t level;
    uint16_t padding2;
    uint8_t one;
    char name[0x20];
-   char fcTag[9];
+   char fcTag[5];
+};
+
+struct FFXIVIpcSocialRequestReceive : FFXIVIpcBasePacket<SocialRequestReceive>
+{
+   uint32_t actorId;                    // actor id of player which initiated request
+   uint16_t unknown;
+   uint16_t unknown2;
+   uint32_t timestamp;                  // must be greater than current time
+   uint8_t unknown3;
+   uint8_t unknown4;                   // Very likely cross-world related
+   Common::SocialCategory category;     // 1 - party invite, 2 - friends request, 3 - ??, 4 - fc signature request, 5 - fc invite,
+   uint8_t unknown5;
+   Common::SocialRequestAction action;  // 0 - ??, 1 - received, 2 - canceled, 4 - friend accept/fc sign/fc join, 5 - refuse fc petition/decline invite         
+   uint8_t unknown6;
+   char name[0x20];
+   uint16_t unknown7;
+   uint16_t unknown8;
+   uint16_t unknown9;
+};
+
+struct FFXIVIpcSocialRequestError : FFXIVIpcBasePacket<SocialRequestError>
+{
+   uint32_t messageId;              // if 0 then type's message is used (type must 2/4/5 or it wont print)
+   Common::SocialCategory category; // 2 - friend request, 4 - fc petition, 5 - fc invitation, anything else and wont print
+   uint8_t unknown;                 // possibly padding
+   char    name[0x20];
+   uint8_t unknown3[2];             // probably padding
+
+};
+
+struct FFXIVIpcSocialRequestResponse : FFXIVIpcBasePacket<SocialRequestResponse>
+{
+   uint64_t contentId;
+   uint32_t unknown;
+   Common::SocialCategory category; // Common::SocialCategory
+   Common::SocialRequestResponse response; // Common::SocialRequestResponse
+   char name[0x20];
+   uint16_t padding;
 };
 
 struct FFXIVIpcSocialList : FFXIVIpcBasePacket<SocialList>
diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h
index 732f652c..d6af5a40 100644
--- a/src/common/Util/SpawnIndexAllocator.h
+++ b/src/common/Util/SpawnIndexAllocator.h
@@ -72,7 +72,7 @@ namespace Util
          return spawnIndex != getAllocFailId();
       }
 
-      constexpr T getAllocFailId()
+      constexpr T getAllocFailId() const
       {
          return static_cast< T >( -1 );
       }
diff --git a/src/common/Version.cpp.in b/src/common/Version.cpp.in
index 4a7bacda..b2de470a 100644
--- a/src/common/Version.cpp.in
+++ b/src/common/Version.cpp.in
@@ -1,10 +1,10 @@
 #include "Version.h"
 
 namespace Core { 
-    namespace Version {
+namespace Version {
 
-    const std::string GIT_HASH = "@GIT_SHA1@";
-    const std::string VERSION = "@VERSION@";
+const std::string GIT_HASH = "@GIT_SHA1@";
+const std::string VERSION = "@VERSION@";
 
-   } /* Version */
+} /* Version */
 } /* Core */
diff --git a/src/libraries b/src/libraries
index 732e26b4..67b949df 160000
--- a/src/libraries
+++ b/src/libraries
@@ -1 +1 @@
-Subproject commit 732e26b4bfb15875d71ae4ec13b8bd6155013840
+Subproject commit 67b949dfe3ffbbba7963b0861670ab4bb1819991
diff --git a/src/servers/CMakeLists.txt b/src/servers/CMakeLists.txt
index 82613bd6..28e43594 100644
--- a/src/servers/CMakeLists.txt
+++ b/src/servers/CMakeLists.txt
@@ -12,3 +12,4 @@ include_directories("${PROJECT_SOURCE_DIR}")
 add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_lobby)
 add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_api)
 add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_zone)
+add_subdirectory(${PROJECT_SOURCE_DIR}/Scripts)
diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/Scripts/CMakeLists.txt
similarity index 82%
rename from src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
rename to src/servers/Scripts/CMakeLists.txt
index 2647b366..5f938985 100644
--- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
+++ b/src/servers/Scripts/CMakeLists.txt
@@ -3,8 +3,6 @@ project(Sapphire_Script)
 
 file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 
-include_directories("${CMAKE_SOURCE_DIR}/src/servers/")
-
 message("exec: ${EXECUTABLE_OUTPUT_DIRECTORY}")
 
 set(SCRIPT_LIB_DIR "${EXECUTABLE_OUTPUT_DIRECTORY}/compiledscripts/" )
@@ -38,14 +36,11 @@ foreach(_scriptDir ${children})
         endforeach()
 
         add_library("script_${_name}" MODULE ${SCRIPT_BUILD_FILES} "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
-        target_link_libraries("script_${_name}" sapphire_zone)
+        target_link_libraries( "script_${_name}" sapphire_zone )
 
         if(MSVC)
-            target_link_libraries("script_${_name}" ${Boost_LIBRARIES})
-        endif()
-
-        if(MSVC)
-            set_target_properties("script_${_name}" PROPERTIES
+            target_link_libraries( "script_${_name}" ${Boost_LIBRARIES})
+            set_target_properties( "script_${_name}" PROPERTIES
                 CXX_STANDARD 14
                 CXX_STANDARD_REQUIRED ON
                 CXX_EXTENSIONS ON
@@ -56,10 +51,7 @@ foreach(_scriptDir ${children})
             )
         endif()
         target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/")
-        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/Script")
-        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/Script/Scripts")
-        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/")
-        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/common")
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/Script/Scripts")
         target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
         target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Scripts")
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/ScriptLoader.cpp.in b/src/servers/Scripts/ScriptLoader.cpp.in
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/ScriptLoader.cpp.in
rename to src/servers/Scripts/ScriptLoader.cpp.in
diff --git a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h b/src/servers/Scripts/ScriptObject.h
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
rename to src/servers/Scripts/ScriptObject.h
diff --git a/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp b/src/servers/Scripts/action/ActionSprint3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
rename to src/servers/Scripts/action/ActionSprint3.cpp
diff --git a/src/servers/Scripts/action/ScriptLoader.cpp b/src/servers/Scripts/action/ScriptLoader.cpp
new file mode 100644
index 00000000..e7ba87ee
--- /dev/null
+++ b/src/servers/Scripts/action/ScriptLoader.cpp
@@ -0,0 +1,15 @@
+#include <Script/NativeScriptApi.h>
+
+#include "ActionSprint3.cpp"
+
+const ScriptObject* ptrs[] =
+{
+   static_cast< ScriptObject* >( new ActionSprint3 ),
+
+   nullptr
+};
+
+extern "C" EXPORT const ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp b/src/servers/Scripts/common/Aethernet.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
rename to src/servers/Scripts/common/Aethernet.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp b/src/servers/Scripts/common/Aetheryte.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp
rename to src/servers/Scripts/common/Aetheryte.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp
rename to src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
rename to src/servers/Scripts/common/CmnDefInnBed.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp b/src/servers/Scripts/common/CmnDefLinkShell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp
rename to src/servers/Scripts/common/CmnDefLinkShell.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp
rename to src/servers/Scripts/common/HouFurOrchestrion.cpp
diff --git a/src/servers/Scripts/common/ScriptLoader.cpp b/src/servers/Scripts/common/ScriptLoader.cpp
new file mode 100644
index 00000000..e4bc7a56
--- /dev/null
+++ b/src/servers/Scripts/common/ScriptLoader.cpp
@@ -0,0 +1,25 @@
+#include <Script/NativeScriptApi.h>
+
+#include "Aethernet.cpp"
+#include "Aetheryte.cpp"
+#include "HouFurOrchestrion.cpp"
+#include "CmnDefInnBed.cpp"
+#include "CmnDefCutSceneReplay.cpp"
+#include "CmnDefLinkShell.cpp"
+
+const ScriptObject* ptrs[] =
+{
+   static_cast< ScriptObject* >( new Aethernet ),
+   static_cast< ScriptObject* >( new Aetheryte ),
+   static_cast< ScriptObject* >( new HouFurOrchestrion ),
+   static_cast< ScriptObject* >( new CmnDefInnBed ),
+   static_cast< ScriptObject* >( new CmnDefCutSceneReplay ),
+   static_cast< ScriptObject* >( new CmnDefLinkShell ),
+
+   nullptr
+};
+
+extern "C" EXPORT const ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
rename to src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
diff --git a/src/servers/Scripts/instances/ScriptLoader.cpp b/src/servers/Scripts/instances/ScriptLoader.cpp
new file mode 100644
index 00000000..2c0c33c0
--- /dev/null
+++ b/src/servers/Scripts/instances/ScriptLoader.cpp
@@ -0,0 +1,547 @@
+#include <Script/NativeScriptApi.h>
+
+#include "pvp/TheFeastTeamRanked.cpp"
+#include "pvp/SealRockSeize.cpp"
+#include "pvp/TheFeast4on4Ranked.cpp"
+#include "pvp/TheFeast4on4LightParty.cpp"
+#include "pvp/TheFeastRanked.cpp"
+#include "pvp/TheFieldsofGloryShatter.cpp"
+#include "pvp/TheFeastTraining.cpp"
+#include "pvp/Astragalos.cpp"
+#include "pvp/TheFeast4on4Training.cpp"
+#include "pvp/TheFeastCustomMatchFeastingGrounds.cpp"
+#include "pvp/TheFeastCustomMatchLichenweed.cpp"
+#include "pvp/TheBorderlandRuinsSecure.cpp"
+#include "pvp/TheFeastCustomMatchCrystalTower.cpp"
+#include "dungeons/TheTamTaraDeepcroft.cpp"
+#include "dungeons/DomaCastle.cpp"
+#include "dungeons/HullbreakerIsleHard.cpp"
+#include "dungeons/Snowcloak.cpp"
+#include "dungeons/TheGreatGubalLibrary.cpp"
+#include "dungeons/TheWanderersPalace.cpp"
+#include "dungeons/Xelphatol.cpp"
+#include "dungeons/TheLostCityofAmdaporHard.cpp"
+#include "dungeons/SaintMociannesArboretum.cpp"
+#include "dungeons/BardamsMettle.cpp"
+#include "dungeons/TheTamTaraDeepcroftHard.cpp"
+#include "dungeons/KuganeCastle.cpp"
+#include "dungeons/TheDrownedCityofSkalla.cpp"
+#include "dungeons/ShisuioftheVioletTides.cpp"
+#include "dungeons/CuttersCry.cpp"
+#include "dungeons/HellsLid.cpp"
+#include "dungeons/TheVault.cpp"
+#include "dungeons/TheStoneVigilHard.cpp"
+#include "dungeons/Sastasha.cpp"
+#include "dungeons/TheFractalContinuum.cpp"
+#include "dungeons/TheLostCityofAmdapor.cpp"
+#include "dungeons/TheAurumVale.cpp"
+#include "dungeons/SohrKhai.cpp"
+#include "dungeons/TheSunkenTempleofQarnHard.cpp"
+#include "dungeons/Neverreap.cpp"
+#include "dungeons/TheAntitower.cpp"
+#include "dungeons/Halatali.cpp"
+#include "dungeons/TheAery.cpp"
+#include "dungeons/PharosSiriusHard.cpp"
+#include "dungeons/CastrumMeridianum.cpp"
+#include "dungeons/TheGreatGubalLibraryHard.cpp"
+#include "dungeons/SohmAl.cpp"
+#include "dungeons/TheTempleoftheFist.cpp"
+#include "dungeons/TheKeeperoftheLake.cpp"
+#include "dungeons/AmdaporKeepHard.cpp"
+#include "dungeons/TheWanderersPalaceHard.cpp"
+#include "dungeons/CastrumAbania.cpp"
+#include "dungeons/AlaMhigo.cpp"
+#include "dungeons/PharosSirius.cpp"
+#include "dungeons/TheStoneVigil.cpp"
+#include "dungeons/TheThousandMawsofTotoRak.cpp"
+#include "dungeons/BrayfloxsLongstopHard.cpp"
+#include "dungeons/DzemaelDarkhold.cpp"
+#include "dungeons/SohmAlHard.cpp"
+#include "dungeons/HaukkeManor.cpp"
+#include "dungeons/HullbreakerIsle.cpp"
+#include "dungeons/TheFractalContinuumHard.cpp"
+#include "dungeons/TheSirensongSea.cpp"
+#include "dungeons/BaelsarsWall.cpp"
+#include "dungeons/HalataliHard.cpp"
+#include "dungeons/TheAetherochemicalResearchFacility.cpp"
+#include "dungeons/SastashaHard.cpp"
+#include "dungeons/CopperbellMinesHard.cpp"
+#include "dungeons/TheSunkenTempleofQarn.cpp"
+#include "dungeons/AmdaporKeep.cpp"
+#include "dungeons/TheDuskVigil.cpp"
+#include "dungeons/BrayfloxsLongstop.cpp"
+#include "dungeons/HaukkeManorHard.cpp"
+#include "dungeons/CopperbellMines.cpp"
+#include "dungeons/ThePraetorium.cpp"
+#include "questbattles/RaisingtheSword.cpp"
+#include "questbattles/InterdimensionalRift.cpp"
+#include "questbattles/CuriousGorgeMeetsHisMatch.cpp"
+#include "questbattles/WithHeartandSteel.cpp"
+#include "questbattles/OneLifeforOneWorld.cpp"
+#include "questbattles/ABloodyReunion.cpp"
+#include "questbattles/MatsubaMayhem.cpp"
+#include "questbattles/BloodontheDeck.cpp"
+#include "questbattles/OurCompromise.cpp"
+#include "questbattles/Naadam.cpp"
+#include "questbattles/InThalsName.cpp"
+#include "questbattles/TheResonant.cpp"
+#include "questbattles/OurUnsungHeroes.cpp"
+#include "questbattles/DarkwingDragon.cpp"
+#include "questbattles/BloodDragoon.cpp"
+#include "questbattles/ASpectaclefortheAges.cpp"
+#include "questbattles/ItsProbablyaTrap.cpp"
+#include "questbattles/TheBattleonBekko.cpp"
+#include "questbattles/TheHeartoftheProblem.cpp"
+#include "questbattles/TheOrphansandtheBrokenBlade.cpp"
+#include "questbattles/TheCarteneauFlatsHeliodrome.cpp"
+#include "questbattles/ReturnoftheBull.cpp"
+#include "questbattles/TheFaceofTrueEvil.cpp"
+#include "questbattles/WhenClansCollide.cpp"
+#include "raids/AlexanderTheArmoftheSonSavage.cpp"
+#include "raids/TheLabyrinthoftheAncients.cpp"
+#include "raids/SigmascapeV30.cpp"
+#include "raids/TheVoidArk.cpp"
+#include "raids/SyrcusTower.cpp"
+#include "raids/DeltascapeV20.cpp"
+#include "raids/TheFinalCoilofBahamutTurn1.cpp"
+#include "raids/SigmascapeV20Savage.cpp"
+#include "raids/TheFinalCoilofBahamutTurn3.cpp"
+#include "raids/SigmascapeV30Savage.cpp"
+#include "raids/TheBindingCoilofBahamutTurn2.cpp"
+#include "raids/AlexanderTheSouloftheCreatorSavage.cpp"
+#include "raids/DunScaith.cpp"
+#include "raids/DeltascapeV40Savage.cpp"
+#include "raids/TheSecondCoilofBahamutTurn1.cpp"
+#include "raids/AlexanderTheHeartoftheCreatorSavage.cpp"
+#include "raids/DeltascapeV40.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn2.cpp"
+#include "raids/TheSecondCoilofBahamutTurn3.cpp"
+#include "raids/TheUnendingCoilofBahamutUltimate.cpp"
+#include "raids/TheSecondCoilofBahamutTurn2.cpp"
+#include "raids/TheWorldofDarkness.cpp"
+#include "raids/SigmascapeV10.cpp"
+#include "raids/AlexanderTheBurdenoftheSonSavage.cpp"
+#include "raids/TheFinalCoilofBahamutTurn2.cpp"
+#include "raids/AlexanderTheBurdenoftheFatherSavage.cpp"
+#include "raids/AlexanderTheHeartoftheCreator.cpp"
+#include "raids/TheBindingCoilofBahamutTurn4.cpp"
+#include "raids/AlexanderTheBreathoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheEyesoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheArmoftheFatherSavage.cpp"
+#include "raids/DeltascapeV30.cpp"
+#include "raids/AlexanderTheFistoftheFather.cpp"
+#include "raids/DeltascapeV10.cpp"
+#include "raids/DeltascapeV10Savage.cpp"
+#include "raids/SigmascapeV40Savage.cpp"
+#include "raids/AlexanderTheCuffoftheSon.cpp"
+#include "raids/AlexanderTheFistoftheSonSavage.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn3.cpp"
+#include "raids/AlexanderTheArmoftheFather.cpp"
+#include "raids/AlexanderTheCuffoftheSonSavage.cpp"
+#include "raids/TheBindingCoilofBahamutTurn5.cpp"
+#include "raids/SigmascapeV20.cpp"
+#include "raids/AlexanderTheCuffoftheFather.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn1.cpp"
+#include "raids/TheBindingCoilofBahamutTurn1.cpp"
+#include "raids/AlexanderTheBurdenoftheSon.cpp"
+#include "raids/AlexanderTheBreathoftheCreator.cpp"
+#include "raids/TheFinalCoilofBahamutTurn4.cpp"
+#include "raids/DeltascapeV30Savage.cpp"
+#include "raids/AlexanderTheFistoftheSon.cpp"
+#include "raids/AlexanderTheFistoftheFatherSavage.cpp"
+#include "raids/AlexanderTheArmoftheSon.cpp"
+#include "raids/TheBindingCoilofBahamutTurn3.cpp"
+#include "raids/SigmascapeV40.cpp"
+#include "raids/TheSecondCoilofBahamutTurn4.cpp"
+#include "raids/AlexanderTheCuffoftheFatherSavage.cpp"
+#include "raids/SigmascapeV10Savage.cpp"
+#include "raids/DeltascapeV20Savage.cpp"
+#include "raids/TheWeepingCityofMhach.cpp"
+#include "raids/TheRoyalCityofRabanastre.cpp"
+#include "raids/AlexanderTheBurdenoftheFather.cpp"
+#include "raids/AlexanderTheEyesoftheCreator.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn4.cpp"
+#include "raids/AlexanderTheSouloftheCreator.cpp"
+#include "AkhAfahAmphitheatreExtreme.cpp"
+#include "guildhests/HeroontheHalfShell.cpp"
+#include "guildhests/BasicTrainingEnemyStrongholds.cpp"
+#include "guildhests/ShadowandClaw.cpp"
+#include "guildhests/AnnoytheVoid.cpp"
+#include "guildhests/StingingBack.cpp"
+#include "guildhests/FlickingSticksandTakingNames.cpp"
+#include "guildhests/SolemnTrinity.cpp"
+#include "guildhests/UndertheArmor.cpp"
+#include "guildhests/LongLivetheQueen.cpp"
+#include "guildhests/AllsWellthatEndsintheWell.cpp"
+#include "guildhests/MorethanaFeeler.cpp"
+#include "guildhests/PullingPoisonPosies.cpp"
+#include "guildhests/WardUp.cpp"
+#include "guildhests/BasicTrainingEnemyParties.cpp"
+#include "trials/TheStrikingTreeHard.cpp"
+#include "trials/TheJadeStoaExtreme.cpp"
+#include "trials/TheMinstrelsBalladThordansReign.cpp"
+#include "trials/TheBowlofEmbersHard.cpp"
+#include "trials/TheSingularityReactor.cpp"
+#include "trials/ContainmentBayS1T7Extreme.cpp"
+#include "trials/ContainmentBayS1T7.cpp"
+#include "trials/TheHowlingEyeHard.cpp"
+#include "trials/TheStrikingTreeExtreme.cpp"
+#include "trials/Emanation.cpp"
+#include "trials/SpecialEventI.cpp"
+#include "trials/TheLimitlessBlueExtreme.cpp"
+#include "trials/ThePoolofTributeExtreme.cpp"
+#include "trials/BattleontheBigBridge.cpp"
+#include "trials/TheRoyalMenagerie.cpp"
+#include "trials/BattleintheBigKeep.cpp"
+#include "trials/UrthsFount.cpp"
+#include "trials/EmanationExtreme.cpp"
+#include "trials/TheJadeStoa.cpp"
+#include "trials/TheHowlingEyeExtreme.cpp"
+#include "trials/TheBowlofEmbers.cpp"
+#include "trials/TheChrysalis.cpp"
+#include "trials/TheStepsofFaith.cpp"
+#include "trials/ARelicReborntheChimera.cpp"
+#include "trials/ContainmentBayP1T6.cpp"
+#include "trials/TheMinstrelsBalladNidhoggsRage.cpp"
+#include "trials/ThokastThokExtreme.cpp"
+#include "trials/ThornmarchExtreme.cpp"
+#include "trials/TheLimitlessBlueHard.cpp"
+#include "trials/ContainmentBayP1T6Extreme.cpp"
+#include "trials/TheNavelExtreme.cpp"
+#include "trials/SpecialEventII.cpp"
+#include "trials/TheWhorleaterExtreme.cpp"
+#include "trials/TheMinstrelsBalladUltimasBane.cpp"
+#include "trials/ContainmentBayZ1T9.cpp"
+#include "trials/TheFinalStepsofFaith.cpp"
+#include "trials/ThokastThokHard.cpp"
+#include "trials/AkhAfahAmphitheatreHard.cpp"
+#include "trials/CapeWestwind.cpp"
+#include "trials/TheMinstrelsBalladShinryusDomain.cpp"
+#include "trials/ContainmentBayZ1T9Extreme.cpp"
+#include "trials/SpecialEventIII.cpp"
+#include "trials/ThornmarchHard.cpp"
+#include "trials/TheDragonsNeck.cpp"
+#include "trials/TheNavelHard.cpp"
+#include "trials/TheWhorleaterHard.cpp"
+#include "trials/TheNavel.cpp"
+#include "trials/TheBowlofEmbersExtreme.cpp"
+#include "trials/ARelicReborntheHydra.cpp"
+#include "trials/ThePoolofTribute.cpp"
+#include "trials/TheHowlingEye.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors181190.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors6170.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors151160.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors4150.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors5160.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors3140.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors1120.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors110.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors141150.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors161170.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors131140.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors7180.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors101110.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors171180.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors2130.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors191200.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors121130.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors111120.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors91100.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors8190.cpp"
+#include "treasurehunt/TheAquapolis.cpp"
+#include "treasurehunt/TheLostCanalsofUznair.cpp"
+#include "treasurehunt/TheHiddenCanalsofUznair.cpp"
+#include "hallofthenovice/InteractwiththeBattlefield.cpp"
+#include "hallofthenovice/AvoidEngagedTargets.cpp"
+#include "hallofthenovice/AvoidAreaofEffectAttacks.cpp"
+#include "hallofthenovice/HealMultipleAllies.cpp"
+#include "hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp"
+#include "hallofthenovice/AssistAlliesinDefeatingaTarget.cpp"
+#include "hallofthenovice/HealanAlly.cpp"
+#include "hallofthenovice/EngageMultipleTargets.cpp"
+#include "hallofthenovice/FinalExercise.cpp"
+#include "hallofthenovice/EngageEnemyReinforcements.cpp"
+#include "hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp"
+#include "hallofthenovice/ExecuteaComboinBattle.cpp"
+#include "hallofthenovice/DefeatanOccupiedTarget.cpp"
+#include "hallofthenovice/AccrueEnmityfromMultipleTargets.cpp"
+#include "events/TheValentionesCeremony.cpp"
+#include "events/TheHauntedManor.cpp"
+
+const ScriptObject* ptrs[] =
+{
+   static_cast< ScriptObject* >( new TheFeastTeamRanked ),
+   static_cast< ScriptObject* >( new SealRockSeize ),
+   static_cast< ScriptObject* >( new TheFeast4on4Ranked ),
+   static_cast< ScriptObject* >( new TheFeast4on4LightParty ),
+   static_cast< ScriptObject* >( new TheFeastRanked ),
+   static_cast< ScriptObject* >( new TheFieldsofGloryShatter ),
+   static_cast< ScriptObject* >( new TheFeastTraining ),
+   static_cast< ScriptObject* >( new Astragalos ),
+   static_cast< ScriptObject* >( new TheFeast4on4Training ),
+   static_cast< ScriptObject* >( new TheFeastCustomMatchFeastingGrounds ),
+   static_cast< ScriptObject* >( new TheFeastCustomMatchLichenweed ),
+   static_cast< ScriptObject* >( new TheBorderlandRuinsSecure ),
+   static_cast< ScriptObject* >( new TheFeastCustomMatchCrystalTower ),
+   static_cast< ScriptObject* >( new TheTamTaraDeepcroft ),
+   static_cast< ScriptObject* >( new DomaCastle ),
+   static_cast< ScriptObject* >( new HullbreakerIsleHard ),
+   static_cast< ScriptObject* >( new Snowcloak ),
+   static_cast< ScriptObject* >( new TheGreatGubalLibrary ),
+   static_cast< ScriptObject* >( new TheWanderersPalace ),
+   static_cast< ScriptObject* >( new Xelphatol ),
+   static_cast< ScriptObject* >( new TheLostCityofAmdaporHard ),
+   static_cast< ScriptObject* >( new SaintMociannesArboretum ),
+   static_cast< ScriptObject* >( new BardamsMettle ),
+   static_cast< ScriptObject* >( new TheTamTaraDeepcroftHard ),
+   static_cast< ScriptObject* >( new KuganeCastle ),
+   static_cast< ScriptObject* >( new TheDrownedCityofSkalla ),
+   static_cast< ScriptObject* >( new ShisuioftheVioletTides ),
+   static_cast< ScriptObject* >( new CuttersCry ),
+   static_cast< ScriptObject* >( new HellsLid ),
+   static_cast< ScriptObject* >( new TheVault ),
+   static_cast< ScriptObject* >( new TheStoneVigilHard ),
+   static_cast< ScriptObject* >( new Sastasha ),
+   static_cast< ScriptObject* >( new TheFractalContinuum ),
+   static_cast< ScriptObject* >( new TheLostCityofAmdapor ),
+   static_cast< ScriptObject* >( new TheAurumVale ),
+   static_cast< ScriptObject* >( new SohrKhai ),
+   static_cast< ScriptObject* >( new TheSunkenTempleofQarnHard ),
+   static_cast< ScriptObject* >( new Neverreap ),
+   static_cast< ScriptObject* >( new TheAntitower ),
+   static_cast< ScriptObject* >( new Halatali ),
+   static_cast< ScriptObject* >( new TheAery ),
+   static_cast< ScriptObject* >( new PharosSiriusHard ),
+   static_cast< ScriptObject* >( new CastrumMeridianum ),
+   static_cast< ScriptObject* >( new TheGreatGubalLibraryHard ),
+   static_cast< ScriptObject* >( new SohmAl ),
+   static_cast< ScriptObject* >( new TheTempleoftheFist ),
+   static_cast< ScriptObject* >( new TheKeeperoftheLake ),
+   static_cast< ScriptObject* >( new AmdaporKeepHard ),
+   static_cast< ScriptObject* >( new TheWanderersPalaceHard ),
+   static_cast< ScriptObject* >( new CastrumAbania ),
+   static_cast< ScriptObject* >( new AlaMhigo ),
+   static_cast< ScriptObject* >( new PharosSirius ),
+   static_cast< ScriptObject* >( new TheStoneVigil ),
+   static_cast< ScriptObject* >( new TheThousandMawsofTotoRak ),
+   static_cast< ScriptObject* >( new BrayfloxsLongstopHard ),
+   static_cast< ScriptObject* >( new DzemaelDarkhold ),
+   static_cast< ScriptObject* >( new SohmAlHard ),
+   static_cast< ScriptObject* >( new HaukkeManor ),
+   static_cast< ScriptObject* >( new HullbreakerIsle ),
+   static_cast< ScriptObject* >( new TheFractalContinuumHard ),
+   static_cast< ScriptObject* >( new TheSirensongSea ),
+   static_cast< ScriptObject* >( new BaelsarsWall ),
+   static_cast< ScriptObject* >( new HalataliHard ),
+   static_cast< ScriptObject* >( new TheAetherochemicalResearchFacility ),
+   static_cast< ScriptObject* >( new SastashaHard ),
+   static_cast< ScriptObject* >( new CopperbellMinesHard ),
+   static_cast< ScriptObject* >( new TheSunkenTempleofQarn ),
+   static_cast< ScriptObject* >( new AmdaporKeep ),
+   static_cast< ScriptObject* >( new TheDuskVigil ),
+   static_cast< ScriptObject* >( new BrayfloxsLongstop ),
+   static_cast< ScriptObject* >( new HaukkeManorHard ),
+   static_cast< ScriptObject* >( new CopperbellMines ),
+   static_cast< ScriptObject* >( new ThePraetorium ),
+   static_cast< ScriptObject* >( new RaisingtheSword ),
+   static_cast< ScriptObject* >( new InterdimensionalRift ),
+   static_cast< ScriptObject* >( new CuriousGorgeMeetsHisMatch ),
+   static_cast< ScriptObject* >( new WithHeartandSteel ),
+   static_cast< ScriptObject* >( new OneLifeforOneWorld ),
+   static_cast< ScriptObject* >( new ABloodyReunion ),
+   static_cast< ScriptObject* >( new MatsubaMayhem ),
+   static_cast< ScriptObject* >( new BloodontheDeck ),
+   static_cast< ScriptObject* >( new OurCompromise ),
+   static_cast< ScriptObject* >( new Naadam ),
+   static_cast< ScriptObject* >( new InThalsName ),
+   static_cast< ScriptObject* >( new TheResonant ),
+   static_cast< ScriptObject* >( new OurUnsungHeroes ),
+   static_cast< ScriptObject* >( new DarkwingDragon ),
+   static_cast< ScriptObject* >( new BloodDragoon ),
+   static_cast< ScriptObject* >( new ASpectaclefortheAges ),
+   static_cast< ScriptObject* >( new ItsProbablyaTrap ),
+   static_cast< ScriptObject* >( new TheBattleonBekko ),
+   static_cast< ScriptObject* >( new TheHeartoftheProblem ),
+   static_cast< ScriptObject* >( new TheOrphansandtheBrokenBlade ),
+   static_cast< ScriptObject* >( new TheCarteneauFlatsHeliodrome ),
+   static_cast< ScriptObject* >( new ReturnoftheBull ),
+   static_cast< ScriptObject* >( new TheFaceofTrueEvil ),
+   static_cast< ScriptObject* >( new WhenClansCollide ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheSonSavage ),
+   static_cast< ScriptObject* >( new TheLabyrinthoftheAncients ),
+   static_cast< ScriptObject* >( new SigmascapeV30 ),
+   static_cast< ScriptObject* >( new TheVoidArk ),
+   static_cast< ScriptObject* >( new SyrcusTower ),
+   static_cast< ScriptObject* >( new DeltascapeV20 ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn1 ),
+   static_cast< ScriptObject* >( new SigmascapeV20Savage ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn3 ),
+   static_cast< ScriptObject* >( new SigmascapeV30Savage ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn2 ),
+   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreatorSavage ),
+   static_cast< ScriptObject* >( new DunScaith ),
+   static_cast< ScriptObject* >( new DeltascapeV40Savage ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn1 ),
+   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreatorSavage ),
+   static_cast< ScriptObject* >( new DeltascapeV40 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn2 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn3 ),
+   static_cast< ScriptObject* >( new TheUnendingCoilofBahamutUltimate ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn2 ),
+   static_cast< ScriptObject* >( new TheWorldofDarkness ),
+   static_cast< ScriptObject* >( new SigmascapeV10 ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSonSavage ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn2 ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFatherSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreator ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn4 ),
+   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreatorSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreatorSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheFatherSavage ),
+   static_cast< ScriptObject* >( new DeltascapeV30 ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheFather ),
+   static_cast< ScriptObject* >( new DeltascapeV10 ),
+   static_cast< ScriptObject* >( new DeltascapeV10Savage ),
+   static_cast< ScriptObject* >( new SigmascapeV40Savage ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheSonSavage ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn3 ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheFather ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSonSavage ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn5 ),
+   static_cast< ScriptObject* >( new SigmascapeV20 ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFather ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn1 ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn1 ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreator ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn4 ),
+   static_cast< ScriptObject* >( new DeltascapeV30Savage ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheFatherSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheSon ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn3 ),
+   static_cast< ScriptObject* >( new SigmascapeV40 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn4 ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFatherSavage ),
+   static_cast< ScriptObject* >( new SigmascapeV10Savage ),
+   static_cast< ScriptObject* >( new DeltascapeV20Savage ),
+   static_cast< ScriptObject* >( new TheWeepingCityofMhach ),
+   static_cast< ScriptObject* >( new TheRoyalCityofRabanastre ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFather ),
+   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreator ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn4 ),
+   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreator ),
+   static_cast< ScriptObject* >( new AkhAfahAmphitheatreExtreme ),
+   static_cast< ScriptObject* >( new HeroontheHalfShell ),
+   static_cast< ScriptObject* >( new BasicTrainingEnemyStrongholds ),
+   static_cast< ScriptObject* >( new ShadowandClaw ),
+   static_cast< ScriptObject* >( new AnnoytheVoid ),
+   static_cast< ScriptObject* >( new StingingBack ),
+   static_cast< ScriptObject* >( new FlickingSticksandTakingNames ),
+   static_cast< ScriptObject* >( new SolemnTrinity ),
+   static_cast< ScriptObject* >( new UndertheArmor ),
+   static_cast< ScriptObject* >( new LongLivetheQueen ),
+   static_cast< ScriptObject* >( new AllsWellthatEndsintheWell ),
+   static_cast< ScriptObject* >( new MorethanaFeeler ),
+   static_cast< ScriptObject* >( new PullingPoisonPosies ),
+   static_cast< ScriptObject* >( new WardUp ),
+   static_cast< ScriptObject* >( new BasicTrainingEnemyParties ),
+   static_cast< ScriptObject* >( new TheStrikingTreeHard ),
+   static_cast< ScriptObject* >( new TheJadeStoaExtreme ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladThordansReign ),
+   static_cast< ScriptObject* >( new TheBowlofEmbersHard ),
+   static_cast< ScriptObject* >( new TheSingularityReactor ),
+   static_cast< ScriptObject* >( new ContainmentBayS1T7Extreme ),
+   static_cast< ScriptObject* >( new ContainmentBayS1T7 ),
+   static_cast< ScriptObject* >( new TheHowlingEyeHard ),
+   static_cast< ScriptObject* >( new TheStrikingTreeExtreme ),
+   static_cast< ScriptObject* >( new Emanation ),
+   static_cast< ScriptObject* >( new SpecialEventI ),
+   static_cast< ScriptObject* >( new TheLimitlessBlueExtreme ),
+   static_cast< ScriptObject* >( new ThePoolofTributeExtreme ),
+   static_cast< ScriptObject* >( new BattleontheBigBridge ),
+   static_cast< ScriptObject* >( new TheRoyalMenagerie ),
+   static_cast< ScriptObject* >( new BattleintheBigKeep ),
+   static_cast< ScriptObject* >( new UrthsFount ),
+   static_cast< ScriptObject* >( new EmanationExtreme ),
+   static_cast< ScriptObject* >( new TheJadeStoa ),
+   static_cast< ScriptObject* >( new TheHowlingEyeExtreme ),
+   static_cast< ScriptObject* >( new TheBowlofEmbers ),
+   static_cast< ScriptObject* >( new TheChrysalis ),
+   static_cast< ScriptObject* >( new TheStepsofFaith ),
+   static_cast< ScriptObject* >( new ARelicReborntheChimera ),
+   static_cast< ScriptObject* >( new ContainmentBayP1T6 ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladNidhoggsRage ),
+   static_cast< ScriptObject* >( new ThokastThokExtreme ),
+   static_cast< ScriptObject* >( new ThornmarchExtreme ),
+   static_cast< ScriptObject* >( new TheLimitlessBlueHard ),
+   static_cast< ScriptObject* >( new ContainmentBayP1T6Extreme ),
+   static_cast< ScriptObject* >( new TheNavelExtreme ),
+   static_cast< ScriptObject* >( new SpecialEventII ),
+   static_cast< ScriptObject* >( new TheWhorleaterExtreme ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladUltimasBane ),
+   static_cast< ScriptObject* >( new ContainmentBayZ1T9 ),
+   static_cast< ScriptObject* >( new TheFinalStepsofFaith ),
+   static_cast< ScriptObject* >( new ThokastThokHard ),
+   static_cast< ScriptObject* >( new AkhAfahAmphitheatreHard ),
+   static_cast< ScriptObject* >( new CapeWestwind ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladShinryusDomain ),
+   static_cast< ScriptObject* >( new ContainmentBayZ1T9Extreme ),
+   static_cast< ScriptObject* >( new SpecialEventIII ),
+   static_cast< ScriptObject* >( new ThornmarchHard ),
+   static_cast< ScriptObject* >( new TheDragonsNeck ),
+   static_cast< ScriptObject* >( new TheNavelHard ),
+   static_cast< ScriptObject* >( new TheWhorleaterHard ),
+   static_cast< ScriptObject* >( new TheNavel ),
+   static_cast< ScriptObject* >( new TheBowlofEmbersExtreme ),
+   static_cast< ScriptObject* >( new ARelicReborntheHydra ),
+   static_cast< ScriptObject* >( new ThePoolofTribute ),
+   static_cast< ScriptObject* >( new TheHowlingEye ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors181190 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors6170 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors151160 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors4150 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors5160 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors3140 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors1120 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors110 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors141150 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors161170 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors131140 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors7180 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors101110 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors171180 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors2130 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors191200 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors121130 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors111120 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors91100 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors8190 ),
+   static_cast< ScriptObject* >( new TheAquapolis ),
+   static_cast< ScriptObject* >( new TheLostCanalsofUznair ),
+   static_cast< ScriptObject* >( new TheHiddenCanalsofUznair ),
+   static_cast< ScriptObject* >( new InteractwiththeBattlefield ),
+   static_cast< ScriptObject* >( new AvoidEngagedTargets ),
+   static_cast< ScriptObject* >( new AvoidAreaofEffectAttacks ),
+   static_cast< ScriptObject* >( new HealMultipleAllies ),
+   static_cast< ScriptObject* >( new ExecuteaCombotoIncreaseEnmity ),
+   static_cast< ScriptObject* >( new AssistAlliesinDefeatingaTarget ),
+   static_cast< ScriptObject* >( new HealanAlly ),
+   static_cast< ScriptObject* >( new EngageMultipleTargets ),
+   static_cast< ScriptObject* >( new FinalExercise ),
+   static_cast< ScriptObject* >( new EngageEnemyReinforcements ),
+   static_cast< ScriptObject* >( new ExecuteaRangedAttacktoIncreaseEnmity ),
+   static_cast< ScriptObject* >( new ExecuteaComboinBattle ),
+   static_cast< ScriptObject* >( new DefeatanOccupiedTarget ),
+   static_cast< ScriptObject* >( new AccrueEnmityfromMultipleTargets ),
+   static_cast< ScriptObject* >( new TheValentionesCeremony ),
+   static_cast< ScriptObject* >( new TheHauntedManor ),
+
+   nullptr
+};
+
+extern "C" EXPORT const ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
rename to src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
rename to src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
rename to src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
rename to src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
rename to src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
rename to src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
rename to src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
rename to src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
rename to src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
rename to src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
rename to src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
rename to src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
rename to src/servers/Scripts/instances/dungeons/CuttersCry.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
rename to src/servers/Scripts/instances/dungeons/DomaCastle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
rename to src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp b/src/servers/Scripts/instances/dungeons/Halatali.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
rename to src/servers/Scripts/instances/dungeons/Halatali.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
rename to src/servers/Scripts/instances/dungeons/HalataliHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
rename to src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
rename to src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/Scripts/instances/dungeons/HellsLid.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
rename to src/servers/Scripts/instances/dungeons/HellsLid.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
rename to src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
rename to src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
rename to src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/Scripts/instances/dungeons/Neverreap.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
rename to src/servers/Scripts/instances/dungeons/Neverreap.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
rename to src/servers/Scripts/instances/dungeons/PharosSirius.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
rename to src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
rename to src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/Scripts/instances/dungeons/Sastasha.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
rename to src/servers/Scripts/instances/dungeons/Sastasha.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
rename to src/servers/Scripts/instances/dungeons/SastashaHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
rename to src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
rename to src/servers/Scripts/instances/dungeons/Snowcloak.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/Scripts/instances/dungeons/SohmAl.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
rename to src/servers/Scripts/instances/dungeons/SohmAl.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
rename to src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
rename to src/servers/Scripts/instances/dungeons/SohrKhai.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp b/src/servers/Scripts/instances/dungeons/TheAery.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
rename to src/servers/Scripts/instances/dungeons/TheAery.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
rename to src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
rename to src/servers/Scripts/instances/dungeons/TheAntitower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
rename to src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
rename to src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
rename to src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
rename to src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
rename to src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
rename to src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
rename to src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
rename to src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
rename to src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
rename to src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
rename to src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
rename to src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
rename to src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
rename to src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
rename to src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
rename to src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
rename to src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
rename to src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
rename to src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
rename to src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp b/src/servers/Scripts/instances/dungeons/TheVault.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
rename to src/servers/Scripts/instances/dungeons/TheVault.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
rename to src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
rename to src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
rename to src/servers/Scripts/instances/dungeons/Xelphatol.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/Scripts/instances/events/TheHauntedManor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
rename to src/servers/Scripts/instances/events/TheHauntedManor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
rename to src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
rename to src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp
rename to src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
rename to src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
rename to src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
rename to src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp
rename to src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp
rename to src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp
rename to src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp
rename to src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp
rename to src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp
rename to src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp b/src/servers/Scripts/instances/guildhests/StingingBack.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp
rename to src/servers/Scripts/instances/guildhests/StingingBack.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp
rename to src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp b/src/servers/Scripts/instances/guildhests/WardUp.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp
rename to src/servers/Scripts/instances/guildhests/WardUp.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
rename to src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
rename to src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
rename to src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
rename to src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
rename to src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
rename to src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
rename to src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
rename to src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
rename to src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
rename to src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
rename to src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
rename to src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
rename to src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
rename to src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp b/src/servers/Scripts/instances/pvp/Astragalos.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
rename to src/servers/Scripts/instances/pvp/Astragalos.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
rename to src/servers/Scripts/instances/pvp/SealRockSeize.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
rename to src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
rename to src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
rename to src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
rename to src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
rename to src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
rename to src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
rename to src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
rename to src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
rename to src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
rename to src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
rename to src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp
rename to src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
rename to src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp
rename to src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp
rename to src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
rename to src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp
rename to src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp b/src/servers/Scripts/instances/questbattles/InThalsName.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp
rename to src/servers/Scripts/instances/questbattles/InThalsName.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp
rename to src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
rename to src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp
rename to src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp b/src/servers/Scripts/instances/questbattles/Naadam.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp
rename to src/servers/Scripts/instances/questbattles/Naadam.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
rename to src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp
rename to src/servers/Scripts/instances/questbattles/OurCompromise.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp
rename to src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp
rename to src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp
rename to src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp
rename to src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
rename to src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
rename to src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
rename to src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
rename to src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp b/src/servers/Scripts/instances/questbattles/TheResonant.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp
rename to src/servers/Scripts/instances/questbattles/TheResonant.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp
rename to src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp
rename to src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
rename to src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV10.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV20.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV30.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV40.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp
rename to src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp b/src/servers/Scripts/instances/raids/DunScaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp
rename to src/servers/Scripts/instances/raids/DunScaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV10.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV20.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV30.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV40.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp
rename to src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp b/src/servers/Scripts/instances/raids/SyrcusTower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp
rename to src/servers/Scripts/instances/raids/SyrcusTower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
rename to src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
rename to src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
rename to src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
rename to src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
rename to src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
rename to src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
rename to src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
rename to src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
rename to src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
rename to src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
rename to src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
rename to src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
rename to src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp b/src/servers/Scripts/instances/raids/TheVoidArk.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp
rename to src/servers/Scripts/instances/raids/TheVoidArk.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp
rename to src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp
rename to src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
rename to src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
rename to src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
rename to src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
rename to src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
rename to src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
rename to src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
rename to src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
rename to src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/Scripts/instances/trials/CapeWestwind.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
rename to src/servers/Scripts/instances/trials/CapeWestwind.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp
rename to src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
rename to src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp
rename to src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
rename to src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp
rename to src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
rename to src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp b/src/servers/Scripts/instances/trials/Emanation.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
rename to src/servers/Scripts/instances/trials/Emanation.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
rename to src/servers/Scripts/instances/trials/EmanationExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp b/src/servers/Scripts/instances/trials/SpecialEventI.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp
rename to src/servers/Scripts/instances/trials/SpecialEventI.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp b/src/servers/Scripts/instances/trials/SpecialEventII.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp
rename to src/servers/Scripts/instances/trials/SpecialEventII.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp
rename to src/servers/Scripts/instances/trials/SpecialEventIII.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
rename to src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
rename to src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
rename to src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/Scripts/instances/trials/TheChrysalis.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
rename to src/servers/Scripts/instances/trials/TheChrysalis.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
rename to src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
rename to src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
rename to src/servers/Scripts/instances/trials/TheHowlingEye.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
rename to src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
rename to src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp
rename to src/servers/Scripts/instances/trials/TheJadeStoa.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp
rename to src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
rename to src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
rename to src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
rename to src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
rename to src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
rename to src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
rename to src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/Scripts/instances/trials/TheNavel.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
rename to src/servers/Scripts/instances/trials/TheNavel.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
rename to src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/Scripts/instances/trials/TheNavelHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
rename to src/servers/Scripts/instances/trials/TheNavelHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
rename to src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
rename to src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
rename to src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
rename to src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
rename to src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
rename to src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
rename to src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
rename to src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
rename to src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
rename to src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
rename to src/servers/Scripts/instances/trials/ThokastThokHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
rename to src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
rename to src/servers/Scripts/instances/trials/ThornmarchHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp b/src/servers/Scripts/instances/trials/UrthsFount.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
rename to src/servers/Scripts/instances/trials/UrthsFount.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp
rename to src/servers/Scripts/opening/OpeningGridania.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp
rename to src/servers/Scripts/opening/OpeningLimsa.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp
rename to src/servers/Scripts/opening/OpeningUldah.cpp
diff --git a/src/servers/Scripts/opening/ScriptLoader.cpp b/src/servers/Scripts/opening/ScriptLoader.cpp
new file mode 100644
index 00000000..e3349224
--- /dev/null
+++ b/src/servers/Scripts/opening/ScriptLoader.cpp
@@ -0,0 +1,19 @@
+#include <Script/NativeScriptApi.h>
+
+#include "OpeningLimsa.cpp"
+#include "OpeningGridania.cpp"
+#include "OpeningUldah.cpp"
+
+const ScriptObject* ptrs[] =
+{
+   static_cast< ScriptObject* >( new OpeningLimsa ),
+   static_cast< ScriptObject* >( new OpeningGridania ),
+   static_cast< ScriptObject* >( new OpeningUldah ),
+
+   nullptr
+};
+
+extern "C" EXPORT const ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp
rename to src/servers/Scripts/quest/ManFst001.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp
rename to src/servers/Scripts/quest/ManFst002.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp
rename to src/servers/Scripts/quest/ManFst003.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp
rename to src/servers/Scripts/quest/ManFst004.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp
rename to src/servers/Scripts/quest/ManSea001.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp
rename to src/servers/Scripts/quest/ManSea002.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp
rename to src/servers/Scripts/quest/ManWil001.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp
rename to src/servers/Scripts/quest/ManWil002.cpp
diff --git a/src/servers/Scripts/quest/ScriptLoader.cpp b/src/servers/Scripts/quest/ScriptLoader.cpp
new file mode 100644
index 00000000..004f37c9
--- /dev/null
+++ b/src/servers/Scripts/quest/ScriptLoader.cpp
@@ -0,0 +1,37 @@
+#include <Script/NativeScriptApi.h>
+
+#include "ManFst004.cpp"
+#include "ManSea002.cpp"
+#include "ManFst002.cpp"
+#include "ManFst003.cpp"
+#include "ManWil001.cpp"
+#include "ManWil002.cpp"
+#include "ManFst001.cpp"
+#include "subquest/gridania/SubFst002.cpp"
+#include "subquest/gridania/SubFst013.cpp"
+#include "subquest/gridania/SubFst001.cpp"
+#include "subquest/gridania/SubFst010.cpp"
+#include "ManSea001.cpp"
+
+const ScriptObject* ptrs[] =
+{
+   static_cast< ScriptObject* >( new ManFst004 ),
+   static_cast< ScriptObject* >( new ManSea002 ),
+   static_cast< ScriptObject* >( new ManFst002 ),
+   static_cast< ScriptObject* >( new ManFst003 ),
+   static_cast< ScriptObject* >( new ManWil001 ),
+   static_cast< ScriptObject* >( new ManWil002 ),
+   static_cast< ScriptObject* >( new ManFst001 ),
+   static_cast< ScriptObject* >( new SubFst002 ),
+   static_cast< ScriptObject* >( new SubFst013 ),
+   static_cast< ScriptObject* >( new SubFst001 ),
+   static_cast< ScriptObject* >( new SubFst010 ),
+   static_cast< ScriptObject* >( new ManSea001 ),
+
+   nullptr
+};
+
+extern "C" EXPORT const ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp
rename to src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp
rename to src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp
rename to src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp
rename to src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
diff --git a/src/servers/sapphire_api/main.cpp b/src/servers/sapphire_api/main.cpp
index da037f9e..d42d53cf 100644
--- a/src/servers/sapphire_api/main.cpp
+++ b/src/servers/sapphire_api/main.cpp
@@ -29,10 +29,13 @@
 #include <vector>
 #include <algorithm>
 
+#include <Framework.h>
+
 #include "Forwards.h"
 #include "SapphireAPI.h"
 
 
+Core::Framework g_fw;
 Core::Logger g_log;
 Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
 Core::Data::ExdDataGenerated g_exdDataGen;
@@ -739,6 +742,8 @@ void defaultGet( shared_ptr<HttpServer::Response> response, shared_ptr<HttpServe
 
 int main( int argc, char* argv[] )
 {
+   auto pLog = boost::shared_ptr< Core::Logger >( new Core::Logger() );
+   g_fw.set< Core::Logger >( pLog );
    g_log.setLogPath( "log/SapphireAPI" );
    g_log.init();
 
diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp
index a68c2723..82693b12 100644
--- a/src/servers/sapphire_lobby/ServerLobby.cpp
+++ b/src/servers/sapphire_lobby/ServerLobby.cpp
@@ -16,6 +16,8 @@
 
 #include "GameConnection.h"
 #include "RestConnector.h"
+#include "Forwards.h"
+#include <Forwards.h>
 
 #include <thread>
 #include <boost/thread.hpp>
diff --git a/src/servers/sapphire_zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp
index 0021b1ff..37806683 100644
--- a/src/servers/sapphire_zone/Action/ActionCast.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCast.cpp
@@ -20,7 +20,7 @@ using namespace Core::Network;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Action::ActionCast::ActionCast()
 {
@@ -29,10 +29,11 @@ Core::Action::ActionCast::ActionCast()
 
 Core::Action::ActionCast::ActionCast( Entity::CharaPtr pActor, Entity::CharaPtr pTarget, uint16_t actionId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    m_startTime = 0;
    m_id = actionId;
    m_handleActionType = HandleActionType::Spell;
-   m_castTime = g_framework.getExdDataGen().get< Core::Data::Action >( actionId )->cast100ms * 100; // TODO: Add security checks.
+   m_castTime = pExdData->get< Core::Data::Action >( actionId )->cast100ms * 100; // TODO: Add security checks.
    m_pSource = pActor;
    m_pTarget = pTarget;
    m_bInterrupt = false;
@@ -67,6 +68,8 @@ void Core::Action::ActionCast::onFinish()
    if( !m_pSource )
       return;
 
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+
    auto pPlayer = m_pSource->getAsPlayer();
    pPlayer->sendDebug( "onFinish()" );
 
@@ -76,7 +79,7 @@ void Core::Action::ActionCast::onFinish()
                                            0x219, m_id, m_id, m_id, m_id );
    m_pSource->sendToInRangeSet( control, true );*/
 
-   g_framework.getScriptMgr().onCastFinish( *pPlayer, m_pTarget, m_id );
+   pScriptMgr->onCastFinish( *pPlayer, m_pTarget, m_id );
 }
 
 void Core::Action::ActionCast::onInterrupt()
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
index 434494c1..88ffc71e 100644
--- a/src/servers/sapphire_zone/Action/ActionTeleport.cpp
+++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
@@ -15,7 +15,7 @@ using namespace Core::Network;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Action::ActionTeleport::ActionTeleport()
 {
@@ -24,10 +24,11 @@ Core::Action::ActionTeleport::ActionTeleport()
 
 Core::Action::ActionTeleport::ActionTeleport( Entity::CharaPtr pActor, uint16_t targetZone, uint16_t cost )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    m_startTime = 0;
    m_id = 5;
    m_handleActionType = HandleActionType::Teleport;
-   m_castTime = g_framework.getExdDataGen().get< Core::Data::Action >( 5 )->cast100ms * 100; // TODO: Add security checks.
+   m_castTime = pExdData->get< Core::Data::Action >( 5 )->cast100ms * 100; // TODO: Add security checks.
    m_pSource = pActor;
    m_bInterrupt = false;
    m_targetAetheryte = targetZone;
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index 6ea5f541..e0578dce 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -11,7 +11,7 @@
 #include "EventAction.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network;
@@ -26,11 +26,13 @@ Core::Action::EventAction::EventAction()
 Core::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
                                         ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
    m_additional = additional;
    m_handleActionType = HandleActionType::Event;
    m_eventId = eventId;
    m_id = action;
-   m_castTime = g_framework.getExdDataGen().get< Core::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
+   m_castTime = pExdData->get< Core::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
    m_onActionFinishClb = finishRef;
    m_onActionInterruptClb = interruptRef;
    m_pSource = pActor;
@@ -93,7 +95,8 @@ void Core::Action::EventAction::onFinish()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
@@ -132,7 +135,8 @@ void Core::Action::EventAction::onInterrupt()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp
index 0188a4ed..91f40ca5 100644
--- a/src/servers/sapphire_zone/Action/EventItemAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventItemAction.cpp
@@ -12,7 +12,7 @@
 #include "EventItemAction.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network;
@@ -86,7 +86,8 @@ void Core::Action::EventItemAction::onFinish()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
@@ -115,7 +116,8 @@ void Core::Action::EventItemAction::onInterrupt()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 622b004a..0de580e6 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -35,7 +35,7 @@
 
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -288,12 +288,12 @@ Send a packet to all players in range, potentially to self if set and is player
 */
 void Core::Entity::Actor::sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf )
 {
-
+   auto pServerZone = g_fw.get< ServerZone >();
    if( bToSelf && isPlayer() )
    {
       auto pPlayer = getAsPlayer();
 
-      auto pSession = g_framework.getServerZone().getSession( pPlayer->getId() );
+      auto pSession = pServerZone->getSession( pPlayer->getId() );
 
       // it might be that the player DC'd in which case the session would be invalid
       if( pSession )
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index 01130f40..d905c341 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -25,7 +25,7 @@
 #include "Zone/TerritoryMgr.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -421,14 +421,14 @@ ChaiScript Skill Handler.
 void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1,
                                              uint64_t param2, Entity::Chara& target )
 {
-
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    if( isPlayer() )
    {
       getAsPlayer()->sendDebug( std::to_string( target.getId() ) );
       getAsPlayer()->sendDebug( "Handle script skill type: " + std::to_string( type ) );
    }
 
-   auto actionInfoPtr = g_framework.getExdDataGen().get< Core::Data::Action >( actionId );
+   auto actionInfoPtr = pExdData->get< Core::Data::Action >( actionId );
 
    // Todo: Effect packet generator. 90% of this is basically setting params and it's basically unreadable.
    // Prepare packet. This is seemingly common for all packets in the action handler.
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 432ab466..64e59688 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -15,8 +15,8 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Logger g_log;
-
+#include "Framework.h"
+extern Core::Framework g_fw;
 
 Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId,
                                         uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
@@ -104,7 +104,9 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
    if( !pTarget->isObjSpawnIndexValid( spawnIndex ) )
       return;
 
-   g_log.debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
+   auto pLog = g_fw.get< Logger >();
+
+   pLog->debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
    ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( getId(), pTarget->getId() );
    eobjStatePacket.data().spawnIndex = spawnIndex;
    eobjStatePacket.data().objKind = getObjKind();
@@ -121,7 +123,8 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
 
 void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget )
 {
-   g_log.debug( "despawn eobj: " + std::to_string( getId() ) );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "despawn eobj: " + std::to_string( getId() ) );
 
    pTarget->freeObjSpawnIndexForActorId( getId( ) );
 }
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 32a26169..43466af4 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -30,6 +30,10 @@
 
 #include "Script/ScriptMgr.h"
 
+#include <Social/Manager/SocialMgr.h>
+#include "Social/FriendList.h"
+
+#include "Script/ScriptMgr.h"
 #include "Inventory/Item.h"
 #include "Inventory/Inventory.h"
 
@@ -46,7 +50,7 @@
 #include "ServerZone.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -100,7 +104,8 @@ Core::Entity::Player::~Player()
 
 void Core::Entity::Player::injectPacket( std::string path )
 {
-   auto session = g_framework.getServerZone().getSession( getId() );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto session = pServerZone->getSession( getId() );
    if( session )
       session->getZoneConnection()->injectPacket( path, *this );
 }
@@ -223,9 +228,11 @@ void Core::Entity::Player::calculateStats()
    uint8_t level = getLevel();
    uint8_t job = static_cast< uint8_t >( getClass() );
 
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( job );
-   auto tribeInfo = g_framework.getExdDataGen().get< Core::Data::Tribe >( tribe );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( job );
+   auto tribeInfo = pExdData->get< Core::Data::Tribe >( tribe );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( level );
 
    // TODO: put formula somewhere else...
    float base = Math::CalcStats::calculateBaseStat( getAsPlayer() );
@@ -301,9 +308,17 @@ void Core::Entity::Player::sendStats()
    queuePacket( statPacket );
 }
 
+uint64_t Core::Entity::Player::getFriendsListId() const
+{
+   return m_friendsListId;
+}
+
 void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
 {
-   auto data = g_framework.getExdDataGen().get< Core::Data::Aetheryte >( aetheryteId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+
+   auto data = pExdData->get< Core::Data::Aetheryte >( aetheryteId );
 
    if( data == nullptr )
    {
@@ -311,7 +326,7 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
    }
 
    setStateFlag( PlayerStateFlag::BetweenAreas );
-   auto targetPos = g_framework.getTerritoryMgr().getTerritoryPosition( data->levelId );
+   auto targetPos = pTeriMgr->getTerritoryPosition( data->levelId );
 
    Common::FFXIVARR_POSITION3 pos;
    pos.x = 0;
@@ -325,8 +340,8 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
       rot = targetPos->getTargetRotation();
    }
 
-   sendDebug( "Teleport: " + g_framework.getExdDataGen().get< Core::Data::PlaceName >( data->placeName )->name + " " +
-                             g_framework.getExdDataGen().get< Core::Data::PlaceName >( data->aethernetName )->name +
+   sendDebug( "Teleport: " + pExdData->get< Core::Data::PlaceName >( data->placeName )->name + " " +
+                             pExdData->get< Core::Data::PlaceName >( data->aethernetName )->name +
                "(" + std::to_string( data->territory ) + ")" );
 
    // TODO: this should be simplified and a type created in server_common/common.h.
@@ -368,15 +383,16 @@ void Core::Entity::Player::returnToHomepoint()
 
 void Core::Entity::Player::setZone( uint32_t zoneId )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    m_onEnterEventDone = false;
-   if( !g_framework.getTerritoryMgr().movePlayer( zoneId, getAsPlayer() ) )
+   if( !pTeriMgr->movePlayer( zoneId, getAsPlayer() ) )
    {
       // todo: this will require proper handling, for now just return the player to their previous area
       m_pos = m_prevPos;
       m_rot = m_prevRot;
       m_zoneId = m_prevZoneId;
 
-      if( !g_framework.getTerritoryMgr().movePlayer( m_zoneId, getAsPlayer() ) )
+      if( !pTeriMgr->movePlayer( m_zoneId, getAsPlayer() ) )
          return;
    }
 
@@ -385,8 +401,9 @@ void Core::Entity::Player::setZone( uint32_t zoneId )
 
 bool Core::Entity::Player::setInstance( uint32_t instanceContentId )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    m_onEnterEventDone = false;
-   auto instance = g_framework.getTerritoryMgr().getInstanceZonePtr( instanceContentId );
+   auto instance = pTeriMgr->getInstanceZonePtr( instanceContentId );
    if( !instance )
       return false;
 
@@ -399,6 +416,8 @@ bool Core::Entity::Player::setInstance( ZonePtr instance )
    if( !instance )
       return false;
 
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+
    // zoning within the same zone won't cause the prev data to be overwritten
    if( instance->getTerritoryId() != m_zoneId )
    {
@@ -407,7 +426,7 @@ bool Core::Entity::Player::setInstance( ZonePtr instance )
       m_prevZoneId = m_zoneId;
    }
 
-   if( !g_framework.getTerritoryMgr().movePlayer( instance, getAsPlayer() ) )
+   if( !pTeriMgr->movePlayer( instance, getAsPlayer() ) )
       return false;
 
    sendZonePackets();
@@ -417,7 +436,8 @@ bool Core::Entity::Player::setInstance( ZonePtr instance )
 
 bool Core::Entity::Player::exitInstance()
 {
-   if( !g_framework.getTerritoryMgr().movePlayer( m_prevZoneId, getAsPlayer() ) )
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   if( !pTeriMgr->movePlayer( m_prevZoneId, getAsPlayer() ) )
       return false;
 
    m_pos = m_prevPos;
@@ -490,9 +510,11 @@ void Core::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
    // section to starts at 320 - 4 bytes long
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
    int32_t offset = 4;
 
-   auto info = g_framework.getExdDataGen().get< Core::Data::Map >( g_framework.getExdDataGen().get< Core::Data::TerritoryType >( getCurrentZone()->getTerritoryId() )->map );
+   auto info = pExdData->get< Core::Data::Map >( pExdData->get< Core::Data::TerritoryType >( getCurrentZone()->getTerritoryId() )->map );
    if( info->discoveryArrayByte )
       offset = 4 + 2 * info->discoveryIndex;
    else
@@ -507,7 +529,7 @@ void Core::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
    uint16_t level = getLevel();
 
-   uint32_t exp = ( g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level )->expToNext * 5 / 100 );
+   uint32_t exp = ( pExdData->get< Core::Data::ParamGrow >( level )->expToNext * 5 / 100 );
 
    gainExp( exp );
 
@@ -580,13 +602,15 @@ bool Core::Entity::Player::isActionLearned( uint8_t actionId ) const
 
 void Core::Entity::Player::gainExp( uint32_t amount )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
    uint32_t currentExp = getExp();
 
    uint16_t level = getLevel();
 
-   uint32_t neededExpToLevel = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level )->expToNext;
+   uint32_t neededExpToLevel = pExdData->get< Core::Data::ParamGrow >( level )->expToNext;
 
-   uint32_t neededExpToLevelplus1 = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level + 1 )->expToNext;
+   uint32_t neededExpToLevelplus1 = pExdData->get< Core::Data::ParamGrow >( level + 1 )->expToNext;
 
    queuePacket( ActorControlPacket143( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
 
@@ -659,25 +683,28 @@ void Core::Entity::Player::sendStatusUpdate( bool toSelf )
 
 uint8_t Core::Entity::Player::getLevel() const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    return static_cast< uint8_t >( m_classArray[classJobIndex] );
 }
 
 uint8_t Core::Entity::Player::getLevelForClass( Common::ClassJob pClass ) const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex;
    return static_cast< uint8_t >( m_classArray[classJobIndex] );
 }
 
 uint32_t Core::Entity::Player::getExp() const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    return m_expArray[classJobIndex];
 }
 
 void Core::Entity::Player::setExp( uint32_t amount )
-{
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+{   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    m_expArray[classJobIndex] = amount;
 }
 
@@ -717,13 +744,15 @@ void Core::Entity::Player::setClassJob( Common::ClassJob classJob )
 
 void Core::Entity::Player::setLevel( uint8_t level )
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    m_classArray[classJobIndex] = level;
 }
 
 void Core::Entity::Player::setLevelForClass( uint8_t level, Common::ClassJob classjob )
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex;
 
    if( m_classArray[classJobIndex] == 0 )
       insertDbClass( classJobIndex );
@@ -797,7 +826,8 @@ void Core::Entity::Player::setLookAt( uint8_t index, uint8_t value )
 // spawn this player for pTarget
 void Core::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 {
-   g_framework.getLogger().debug( "[" + std::to_string( pTarget->getId() ) + "] Spawning " +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "[" + std::to_string( pTarget->getId() ) + "] Spawning " +
                 getName() + " for " +
                 pTarget->getName() );
 
@@ -809,8 +839,8 @@ void Core::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget )
 {
    auto pPlayer = pTarget;
-
-   g_framework.getLogger().debug( "despawning " + getName() + " for " + pTarget->getName() );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "despawning " + getName() + " for " + pTarget->getName() );
 
    pPlayer->freePlayerSpawnId( getId() );
 
@@ -875,7 +905,8 @@ const uint8_t* Core::Entity::Player::getStateFlags() const
 
 bool Core::Entity::Player::actionHasCastTime( uint32_t actionId ) //TODO: Add logic for special cases
 {
-   auto actionInfoPtr = g_framework.getExdDataGen().get< Core::Data::Action >( actionId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto actionInfoPtr = pExdData->get< Core::Data::Action >( actionId );
    if( actionInfoPtr->preservesCombo )
       return false;
 
@@ -1035,7 +1066,8 @@ void Core::Entity::Player::update( int64_t currTime )
 
 void Core::Entity::Player::onMobKill( uint16_t nameId )
 {
-   g_framework.getScriptMgr().onMobKill( *getAsPlayer(), nameId );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onMobKill( *getAsPlayer(), nameId );
 }
 
 void Core::Entity::Player::freePlayerSpawnId( uint32_t actorId )
@@ -1145,7 +1177,8 @@ const uint8_t* Core::Entity::Player::getGcRankArray() const
 
 void Core::Entity::Player::queuePacket( Network::Packets::GamePacketPtr pPacket )
 {
-   auto pSession = g_framework.getServerZone().getSession( m_id );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( m_id );
 
    if( !pSession )
       return;
@@ -1159,7 +1192,8 @@ void Core::Entity::Player::queuePacket( Network::Packets::GamePacketPtr pPacket
 
 void Core::Entity::Player::queueChatPacket( Network::Packets::GamePacketPtr pPacket )
 {
-   auto pSession = g_framework.getServerZone().getSession( m_id );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( m_id );
 
    if( !pSession )
       return;
@@ -1621,14 +1655,14 @@ void Core::Entity::Player::emote( uint32_t emoteId, uint64_t targetId )
 
 void Core::Entity::Player::teleportQuery( uint16_t aetheryteId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    // TODO: only register this action if enough gil is in possession
-   auto& exdDataGen = g_framework.getExdDataGen();
-   auto targetAetheryte = exdDataGen.get< Core::Data::Aetheryte >( aetheryteId );
+   auto targetAetheryte = pExdData->get< Core::Data::Aetheryte >( aetheryteId );
 
    if( targetAetheryte )
    {
-      auto fromAetheryte = exdDataGen.get< Core::Data::Aetheryte >(
-                                          exdDataGen.get< Core::Data::TerritoryType >( getZoneId() )->aetheryte );
+      auto fromAetheryte = pExdData->get< Core::Data::Aetheryte >(
+                             pExdData->get< Core::Data::TerritoryType >( getZoneId() )->aetheryte );
 
       // calculate cost - does not apply for favorite points or homepoints neither checks for aether tickets
       auto cost = static_cast< uint16_t > ( ( sqrt( pow( fromAetheryte->aetherstreamX - targetAetheryte->aetherstreamX, 2 ) +
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 7ae38c98..9fbe8ee4 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -378,6 +378,11 @@ public:
    void calculateStats() override;
    void sendStats();
 
+   // Social-based
+   //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+   uint64_t getFriendsListId() const;
+
 
    // Aetheryte / Action / Attribute bitmasks
    //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -659,6 +664,10 @@ private:
    uint8_t m_gmRank;
    uint16_t zoneId;
 
+   // Social-based
+
+   uint64_t m_friendsListId;
+
    uint8_t m_equipDisplayFlags;
 
    bool m_bInCombat;
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index b4c435ba..9ebdbcd2 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -26,7 +26,7 @@
 #include "ServerZone.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -84,7 +84,8 @@ void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene,
    auto pEvent = getEvent( eventId );
    if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -147,7 +148,8 @@ void Core::Entity::Player::eventPlay( uint32_t eventId, uint32_t scene,
    }
    else if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -175,7 +177,8 @@ void Core::Entity::Player::eventPlay( uint32_t eventId, uint32_t scene,
    }
    else if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -193,7 +196,8 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
 
    if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -262,7 +266,8 @@ void Core::Entity::Player::eventActionStart( uint32_t eventId,
    }
    else if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -290,7 +295,8 @@ void Core::Entity::Player::eventItemActionStart( uint32_t eventId,
 
 void Core::Entity::Player::onLogin()
 {
-   for( auto& child : g_framework.getServerZone().getConfig()->getChild( "Settings.Parameters.MotDArray" ) )
+   auto pConfig = g_fw.get< XMLConfig >();
+   for( auto& child : pConfig->getChild( "Settings.Parameters.MotDArray" ) )
    {
       sendNotice( child.second.data() );
    }
diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
index 1cf4e9a0..160d02dc 100644
--- a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
@@ -12,7 +12,7 @@
 #include "Player.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -1014,14 +1014,15 @@ void Core::Entity::Player::removeQuestsCompleted( uint32_t questId )
 
 bool Core::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optionalChoice )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    uint32_t playerLevel = getLevel();
-   auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( questId );
+   auto questInfo = pExdData->get< Core::Data::Quest >( questId );
    
 
    if( !questInfo )
       return false;
 
-   auto paramGrowth = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( questInfo->classJobLevel0 );
+   auto paramGrowth = pExdData->get< Core::Data::ParamGrow >( questInfo->classJobLevel0 );
 
    // TODO: use the correct formula, this one is wrong
    uint32_t exp = ( questInfo->expFactor * paramGrowth->questExpModifier * ( 45 + 5 * questInfo->classJobLevel0 ) ) / 100;
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index 14520794..745bb49c 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -26,7 +26,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -35,12 +35,16 @@ using namespace Core::Network::Packets::Server;
 // load player from the db
 bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   auto pLog = g_fw.get< Logger >();
+
    const std::string char_id_str = std::to_string( charId );
 
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_SEL );
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_SEL );
 
    stmt->setUInt( 1, charId );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    if( !res->next() )
       return false;
@@ -68,10 +72,10 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    ZonePtr pCurrZone = nullptr;
 
    // if the zone is an instanceContent zone, we need to actually find the instance
-   if( g_framework.getTerritoryMgr().isInstanceContentTerritory( zoneId ) )
+   if( pTeriMgr->isInstanceContentTerritory( zoneId ) )
    {
       // try to find an instance actually linked to this player
-      pCurrZone = g_framework.getTerritoryMgr().getLinkedInstance( m_id );
+      pCurrZone = pTeriMgr->getLinkedInstance( m_id );
       // if none found, revert to previous zone and position
       if( !pCurrZone )
       {
@@ -80,12 +84,12 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
          m_pos.y = m_prevPos.y;
          m_pos.z = m_prevPos.z;
          setRot( m_prevRot );
-         pCurrZone = g_framework.getTerritoryMgr().getZoneByTerriId( zoneId );
+         pCurrZone = pTeriMgr->getZoneByTerriId( zoneId );
       }
    }
    else
    {
-      pCurrZone = g_framework.getTerritoryMgr().getZoneByTerriId( zoneId );
+      pCurrZone =pTeriMgr->getZoneByTerriId( zoneId );
    }
 
    m_zoneId = zoneId;
@@ -94,12 +98,12 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    // see if a valid zone could be found for the character
    if( !pCurrZone )
    {
-      g_framework.getLogger().error( "[" + char_id_str + "] Zone " + std::to_string( zoneId ) + " not found!" );
-      g_framework.getLogger().error( "[" + char_id_str + "] Setting default zone instead" );
+      pLog->error( "[" + char_id_str + "] Zone " + std::to_string( zoneId ) + " not found!" );
+      pLog->error( "[" + char_id_str + "] Setting default zone instead" );
 
       // default to new gridania
       // TODO: should probably just abort and mark character as corrupt
-      pCurrZone = g_framework.getTerritoryMgr().getZoneByTerriId( 132 );
+      pCurrZone = pTeriMgr->getZoneByTerriId( 132 );
 
       m_pos.x = 0.0f;
       m_pos.y = 0.0f;
@@ -186,7 +190,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    m_pCell = nullptr;
 
    if( !loadActiveQuests() || !loadClassData() || !loadSearchInfo() )
-      g_framework.getLogger().error( "Player id " + char_id_str + " data corrupt!" );
+      pLog->error( "Player id " + char_id_str + " data corrupt!" );
 
    m_maxHp = getMaxHp();
    m_maxMp = getMaxMp();
@@ -230,7 +234,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
 
    initSpawnIdQueue();
 
-   if( !g_framework.getTerritoryMgr().movePlayer( pCurrZone, getAsPlayer() ) )
+   if( !pTeriMgr->movePlayer( pCurrZone, getAsPlayer() ) )
       return false;
 
    return true;
@@ -238,11 +242,11 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
 
 bool Core::Entity::Player::loadActiveQuests()
 {
-
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_QUEST_SEL );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_QUEST_SEL );
 
    stmt->setUInt( 1, m_id );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    while( res->next() )
    {
@@ -274,11 +278,11 @@ bool Core::Entity::Player::loadActiveQuests()
 
 bool Core::Entity::Player::loadClassData()
 {
-
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    // ClassIdx, Exp, Lvl
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_CLASS_SEL );
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_CLASS_SEL );
    stmt->setUInt( 1, m_id );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    while( res->next() )
    {
@@ -295,9 +299,10 @@ bool Core::Entity::Player::loadClassData()
 
 bool Core::Entity::Player::loadSearchInfo()
 {
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_SEARCHINFO_SEL );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_SEARCHINFO_SEL );
    stmt->setUInt( 1, m_id );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    if( !res->next() )
       return false;
@@ -315,7 +320,7 @@ bool Core::Entity::Player::loadSearchInfo()
 
 void Core::Entity::Player::updateSql()
 {
-
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
            /*"Hp 1, Mp 2, Tp 3, Gp 4, Mode 5, Mount 6, InvincibleGM 7, Voice 8, "
            "Customize 9, ModelMainWeapon 10, ModelSubWeapon 11, ModelSystemWeapon 12, "
            "ModelEquip 13, EmoteModeType 14, Language 15, IsNewGame 16, IsNewAdventurer 17, "
@@ -326,7 +331,7 @@ void Core::Entity::Player::updateSql()
            "EquippedMannequin 44, ConfigFlags 45, QuestCompleteFlags 46, OpeningSequence 47, "
            "QuestTracking 48, GrandCompany 49, GrandCompanyRank 50, Discovery 51, GMRank 52, Unlocks 53, "
            "CFPenaltyUntil 54"*/
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_UP );
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_UP );
 
    stmt->setInt( 1, getHp() );
    stmt->setInt( 2, getMp() );
@@ -435,7 +440,7 @@ void Core::Entity::Player::updateSql()
 
    stmt->setInt( 55, m_id );
 
-   g_framework.getCharaDb().execute( stmt );
+   pDb->execute( stmt );
 
    ////// Searchinfo
    updateDbSearchInfo();
@@ -450,54 +455,58 @@ void Core::Entity::Player::updateSql()
 
 void Core::Entity::Player::updateDbClass() const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast<uint8_t>( getClass() ) )->expArrayIndex;
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast<uint8_t>( getClass() ) )->expArrayIndex;
 
    //Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ?
-   auto stmtS = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_CLASS_UP );
+   auto stmtS = pDb->getPreparedStatement( Db::CHARA_CLASS_UP );
    stmtS->setInt( 1, getExp() );
    stmtS->setInt( 2, getLevel() );
    stmtS->setInt( 3, m_id );
    stmtS->setInt( 4, classJobIndex );
-   g_framework.getCharaDb().execute( stmtS );
+   pDb->execute( stmtS );
 }
 
 void Core::Entity::Player::insertDbClass( const uint8_t classJobIndex ) const
 {
-   auto stmtClass = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_CLASS_INS );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmtClass = pDb->getPreparedStatement( Db::CHARA_CLASS_INS );
    stmtClass->setInt( 1, getId() );
    stmtClass->setInt( 2, classJobIndex );
    stmtClass->setInt( 3, 0 );
    stmtClass->setInt( 4, 1 );
-   g_framework.getCharaDb().directExecute( stmtClass );
+   pDb->directExecute( stmtClass );
 }
 
 void Core::Entity::Player::updateDbSearchInfo() const
 {
-   auto stmtS = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTCLASS );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmtS = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTCLASS );
    stmtS->setInt( 1, m_searchSelectClass );
    stmtS->setInt( 2, m_id );
-   g_framework.getCharaDb().execute( stmtS );
+   pDb->execute( stmtS );
 
-   auto stmtS1 = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
+   auto stmtS1 = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
    stmtS1->setInt( 1, m_searchSelectRegion );
    stmtS1->setInt( 2, m_id );
-   g_framework.getCharaDb().execute( stmtS1 );
+   pDb->execute( stmtS1 );
 
-   auto stmtS2 = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
+   auto stmtS2 = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
    stmtS2->setString( 1, string( m_searchMessage != nullptr ? m_searchMessage : "" ) );
    stmtS2->setInt( 2, m_id );
-   g_framework.getCharaDb().execute( stmtS2 );
+   pDb->execute( stmtS2 );
 }
 
 void Core::Entity::Player::updateDbAllQuests() const
 {
-
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    for( int32_t i = 0; i < 30; i++ )
    {
       if( !m_activeQuests[i] )
          continue;
 
-      auto stmtS3 = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_QUEST_UP );
+      auto stmtS3 = pDb->getPreparedStatement( Db::CHARA_QUEST_UP );
       stmtS3->setInt( 1, m_activeQuests[i]->c.sequence );
       stmtS3->setInt( 2, m_activeQuests[i]->c.flags );
       stmtS3->setInt( 3, m_activeQuests[i]->c.UI8A );
@@ -509,22 +518,24 @@ void Core::Entity::Player::updateDbAllQuests() const
       stmtS3->setInt( 9, m_activeQuests[i]->c.padding1 );
       stmtS3->setInt( 10, m_id);
       stmtS3->setInt( 11, m_activeQuests[i]->c.questId );
-      g_framework.getCharaDb().execute( stmtS3 );
+      pDb->execute( stmtS3 );
 
    }
 }
 
 void Core::Entity::Player::deleteQuest( uint16_t questId ) const
 {
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_QUEST_DEL );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_DEL );
    stmt->setInt( 1, m_id );
    stmt->setInt( 2, questId );
-   g_framework.getCharaDb().execute( stmt );
+   pDb->execute( stmt );
 }
 
 void Core::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t seq ) const
 {
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_QUEST_INS );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_INS );
    stmt->setInt( 1, m_id );
    stmt->setInt( 2, index );
    stmt->setInt( 3, questId );
@@ -537,5 +548,5 @@ void Core::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t
    stmt->setInt( 10, 0 );
    stmt->setInt( 11, 0 );
    stmt->setInt( 12, 0 );
-   g_framework.getCharaDb().execute( stmt );
+   pDb->execute( stmt );
 }
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
index d342233c..2f54bba3 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.0.2)
 cmake_policy(SET CMP0015 NEW)
 cmake_policy(SET CMP0014 OLD)
 
-add_subdirectory("Script/Scripts")
-
 project(sapphire_zone)
 
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -18,6 +16,8 @@ file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         Network/*.h
         Network/Handlers/*.h
         Network/PacketWrappers/*.h
+		Social/*.h
+        Social/Manager/*.h
         Script/*.h
         StatusEffect/*.h
         Zone/*.h)
@@ -25,6 +25,8 @@ file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         *.c*
         Actor/*.c*
+        Actor/Social/*.c*
+        Actor/Social/Manager/*.c*
         Action/*.c*
         DebugCommand/*.c*
         Event/*.c*
@@ -34,6 +36,8 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         Network/*.c*
         Network/Handlers/*.c*
         Network/PacketWrappers/*.c*
+		Social/*.c*
+        Social/Manager/*.c*
         Script/*.c*
         StatusEffect/*.c*
         Zone/*.c*)
@@ -68,6 +72,5 @@ endif()
 target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" )
-target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script/Scripts" )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" )
-cotire( sapphire_zone )
+#cotire( sapphire_zone )
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 0adf199d..310d9f78 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -2,6 +2,7 @@
 #include <boost/make_shared.hpp>
 #include <boost/format.hpp>
 #include <cinttypes>
+#include <random>
 
 #include <Common.h>
 #include <Version.h>
@@ -38,7 +39,7 @@
 #include "Session.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 // instanciate and initialize commands
 Core::DebugCommandHandler::DebugCommandHandler()
@@ -133,6 +134,8 @@ void Core::DebugCommandHandler::help( char* data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    std::string subCommand = "";
    std::string params = "";
 
@@ -151,7 +154,7 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
@@ -219,8 +222,8 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
          "', '" + std::to_string( map_id ) +
          "', '" + std::to_string( discover_id ) + "')";
 
-      g_framework.getCharaDb().execute( query1 );
-      g_framework.getCharaDb().execute( query2 );
+      pDb->execute( query1 );
+      pDb->execute( query2 );
 
    }
 
@@ -316,6 +319,7 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
    std::string subCommand;
    std::string params = "";
 
@@ -334,7 +338,7 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost:
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
@@ -417,6 +421,8 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    std::string subCommand;
    std::string params = "";
 
@@ -435,14 +441,14 @@ void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost:
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
    if( ( subCommand == "pos" ) )
    {
 
-      int16_t map_id = g_framework.getExdDataGen().get< Core::Data::TerritoryType >( player.getCurrentZone()->getTerritoryId() )->map;
+      int16_t map_id = pExdData->get< Core::Data::TerritoryType >( player.getCurrentZone()->getTerritoryId() )->map;
 
       player.sendNotice( "Pos:\n" +
                          std::to_string( player.getPos().x ) + "\n" +
@@ -461,20 +467,24 @@ void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::injectPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
-   auto pSession = g_framework.getServerZone().getSession( player.getId() );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( player.getId() );
    if( pSession )
       pSession->getZoneConnection()->injectPacket( data + 7, player );
 }
 
 void Core::DebugCommandHandler::injectChatPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
-   auto pSession = g_framework.getServerZone().getSession( player.getId() );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( player.getId() );
    if( pSession )
       pSession->getChatConnection()->injectPacket( data + 8, player );
 }
 
 void Core::DebugCommandHandler::replay( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pServerZone = g_fw.get< ServerZone >();
    std::string subCommand;
    std::string params = "";
 
@@ -493,25 +503,25 @@ void Core::DebugCommandHandler::replay( char * data, Entity::Player& player, boo
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
    if( subCommand == "start" )
    {
-      auto pSession = g_framework.getServerZone().getSession( player.getId() );
+      auto pSession = pServerZone->getSession( player.getId() );
       if( pSession )
          pSession->startReplay( params );
    }
    else if( subCommand == "stop" )
    {
-      auto pSession = g_framework.getServerZone().getSession( player.getId() );
+      auto pSession = pServerZone->getSession( player.getId() );
       if( pSession )
          pSession->stopReplay();
    }
    else if( subCommand == "info" )
    {
-      auto pSession = g_framework.getServerZone().getSession( player.getId() );
+      auto pSession = pServerZone->getSession( player.getId() );
       if( pSession )
          pSession->sendReplayInfo();
    }
@@ -572,13 +582,16 @@ void Core::DebugCommandHandler::nudge( char * data, Entity::Player& player, boos
 
 void Core::DebugCommandHandler::serverInfo( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pServerZone = g_fw.get< ServerZone >();
    player.sendDebug( "SapphireZone " + Version::VERSION + "\nRev: " + Version::GIT_HASH );
    player.sendDebug( "Compiled: " __DATE__ " " __TIME__ );
-   player.sendDebug( "Sessions: " + std::to_string( g_framework.getServerZone().getSessionCount() ) );
+   player.sendDebug( "Sessions: " + std::to_string( pServerZone->getSessionCount() ) );
 }
 
 void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    std::string subCommand;
    std::string params = "";
 
@@ -598,7 +611,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
    if( subCommand == "unload" )
@@ -606,7 +619,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
       if ( subCommand == params )
          player.sendDebug( "Command failed: requires name of script" );
       else
-         if( g_framework.getScriptMgr().getNativeScriptHandler().unloadScript( params ) )
+         if( pScriptMgr->getNativeScriptHandler().unloadScript( params ) )
             player.sendDebug( "Unloaded script successfully." );
          else
             player.sendDebug( "Failed to unload script: " + params );
@@ -618,7 +631,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
       else
       {
          std::set< Core::Scripting::ScriptInfo* > scripts;
-         g_framework.getScriptMgr().getNativeScriptHandler().findScripts( scripts, params );
+         pScriptMgr->getNativeScriptHandler().findScripts( scripts, params );
 
          if( !scripts.empty() )
          {
@@ -642,7 +655,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
          player.sendDebug( "Command failed: requires relative path to script" );
       else
       {
-         if ( g_framework.getScriptMgr().getNativeScriptHandler().loadScript( params ) )
+         if ( pScriptMgr->getNativeScriptHandler().loadScript( params ) )
             player.sendDebug( "Loaded '" + params + "' successfully" );
          else
             player.sendDebug( "Failed to load '" + params + "'" );
@@ -655,7 +668,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
          player.sendDebug( "Command failed: requires name of script to reload" );
       else
       {
-         g_framework.getScriptMgr().getNativeScriptHandler().queueScriptReload( params );
+         pScriptMgr->getNativeScriptHandler().queueScriptReload( params );
          player.sendDebug( "Queued script reload for script: " + params );
       }
    }
@@ -667,6 +680,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
 
 void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    std::string cmd( data ), params, subCommand;
    auto cmdPos = cmd.find_first_of( ' ' );
 
@@ -690,7 +704,7 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       uint32_t instanceContentId;
       sscanf( params.c_str(), "%d", &instanceContentId );
 
-      auto instance = g_framework.getTerritoryMgr().createInstanceContent( instanceContentId );
+      auto instance = pTeriMgr->createInstanceContent( instanceContentId );
       if( instance )
          player.sendDebug( "Created instance with id: " + std::to_string( instance->getGuId() ) + " -> " + instance->getName() );
       else
@@ -701,7 +715,7 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       uint32_t terriId;
       sscanf( params.c_str(), "%d", &terriId );
 
-      if( g_framework.getTerritoryMgr().removeTerritoryInstance( terriId ) )
+      if( pTeriMgr->removeTerritoryInstance( terriId ) )
          player.sendDebug( "Removed instance with id: " + std::to_string( terriId ) );
       else
          player.sendDebug( "Failed to remove instance with id: " + std::to_string( terriId ) );
diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 3423fc85..4a389965 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -6,13 +6,14 @@
 #include <boost/range/algorithm/remove_if.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 
 using namespace Core::Common;
 
 std::string Core::Event::getEventName( uint32_t eventId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    uint16_t eventType = eventId >> 16;
 
    auto unknown = std::string{ "unknown" };
@@ -21,7 +22,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
    {
    case Event::EventHandler::EventHandlerType::Quest:
    {
-      auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( eventId );
+      auto questInfo = pExdData->get< Core::Data::Quest >( eventId );
       if( !questInfo )
          return unknown + "Quest";
 
@@ -32,7 +33,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
    }
    case Event::EventHandler::EventHandlerType::CustomTalk:
    {
-      auto customTalkInfo = g_framework.getExdDataGen().get< Core::Data::CustomTalk >( eventId );
+      auto customTalkInfo = pExdData->get< Core::Data::CustomTalk >( eventId );
       if( !customTalkInfo )
          return unknown + "CustomTalk";
 
@@ -43,21 +44,21 @@ std::string Core::Event::getEventName( uint32_t eventId )
    }
    case Event::EventHandler::EventHandlerType::Opening:
    {
-      auto openingInfo = g_framework.getExdDataGen().get< Core::Data::Opening >( eventId );
+      auto openingInfo = pExdData->get< Core::Data::Opening >( eventId );
       if( openingInfo )
          return openingInfo->name;
       return unknown + "Opening";
    }
    case Event::EventHandler::EventHandlerType::Aetheryte:
    {
-      auto aetherInfo = g_framework.getExdDataGen().get< Core::Data::Aetheryte >( eventId & 0xFFFF );
+      auto aetherInfo = pExdData->get< Core::Data::Aetheryte >( eventId & 0xFFFF );
       if( aetherInfo->isAetheryte )
          return "Aetheryte";
       return "Aethernet";
    }
    case Event::EventHandler::EventHandlerType::ICDirector:
    {
-      auto contentInfo = g_framework.getExdDataGen().get< Core::Data::InstanceContent >( eventId & 0xFFFF );
+      auto contentInfo = pExdData->get< Core::Data::InstanceContent >( eventId & 0xFFFF );
       std::string name = contentInfo->name;
 
       name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
@@ -78,7 +79,8 @@ std::string Core::Event::getEventName( uint32_t eventId )
 
 uint32_t Core::Event::mapEventActorToRealActor( uint32_t eventActorId )
 {
-   auto levelInfo = g_framework.getExdDataGen().get< Core::Data::Level >( eventActorId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto levelInfo = pExdData->get< Core::Data::Level >( eventActorId );
    if( levelInfo )
       return levelInfo->objectKey;
 
diff --git a/src/servers/sapphire_zone/Framework.cpp b/src/servers/sapphire_zone/Framework.cpp
deleted file mode 100644
index b50a7806..00000000
--- a/src/servers/sapphire_zone/Framework.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <boost/make_shared.hpp>
-
-#include "Framework.h"
-
-Core::ServerZone g_serverZone( "config/settings_zone.xml" );
-
-Core::Logger& Core::Framework::getLogger()
-{
-   return g_log;
-}
-
-Core::DebugCommandHandler& Core::Framework::getDebugCommandHandler()
-{
-   return g_debugCmdHandler;
-}
-
-Core::Scripting::ScriptMgr& Core::Framework::getScriptMgr()
-{
-   return g_scriptMgr;
-}
-
-Core::Data::ExdDataGenerated& Core::Framework::getExdDataGen()
-{
-   return g_exdDataGen;
-}
-
-Core::TerritoryMgr& Core::Framework::getTerritoryMgr()
-{
-   return g_territoryMgr;
-}
-
-Core::LinkshellMgr& Core::Framework::getLinkshellMgr()
-{
-   return g_linkshellMgr;
-}
-
-Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >& Core::Framework::getCharaDb()
-{
-   return g_charaDb;
-}
-
-Core::ServerZone& Core::Framework::getServerZone()
-{
-   return g_serverZone;
-}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Framework.h b/src/servers/sapphire_zone/Framework.h
deleted file mode 100644
index 2609fa83..00000000
--- a/src/servers/sapphire_zone/Framework.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef CORE_FRAMEWORK_H
-#define CORE_FRAMEWORK_H
-
-#include <boost/shared_ptr.hpp>
-#include <map>
-
-#include "Forwards.h"
-
-#include "ServerZone.h"
-
-#include <Logging/Logger.h>
-#include <Exd/ExdDataGenerated.h>
-#include <Database/CharaDbConnection.h>
-#include <Database/DbWorkerPool.h>
-
-#include "Script/ScriptMgr.h"
-
-#include "Linkshell/LinkshellMgr.h"
-
-#include "Zone/TerritoryMgr.h"
-
-#include "DebugCommand/DebugCommandHandler.h"
-
-
-namespace Core
-{
-
-class Framework
-{
-private:
-
-   Logger g_log;
-   DebugCommandHandler g_debugCmdHandler;
-   Scripting::ScriptMgr g_scriptMgr;
-   Data::ExdDataGenerated g_exdDataGen;
-   TerritoryMgr g_territoryMgr;
-   LinkshellMgr g_linkshellMgr;
-   Db::DbWorkerPool< Db::CharaDbConnection > g_charaDb;
-
-public:
-
-   Logger& getLogger();
-   DebugCommandHandler& getDebugCommandHandler();
-   Scripting::ScriptMgr& getScriptMgr();
-   Data::ExdDataGenerated& getExdDataGen();
-   TerritoryMgr& getTerritoryMgr();
-   LinkshellMgr& getLinkshellMgr();
-   Db::DbWorkerPool< Db::CharaDbConnection >& getCharaDb();
-   ServerZone& getServerZone();
-
-};
-
-}
-#endif // CORE_FRAMEWORK_H
diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
index 820ab435..b601dd81 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.cpp
+++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp
@@ -18,7 +18,7 @@
 #include "Item.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network;
@@ -132,7 +132,9 @@ Core::ItemPtr Core::Inventory::getItemAt( uint16_t containerId, uint8_t slotId )
 
 Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint8_t quantity )
 {
-   auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( catalogId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
 
    uint8_t itemAmount = quantity;
 
@@ -153,7 +155,7 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint8_t quantity
    pItem->setModelIds( itemInfo->modelMain, itemInfo->modelSub );
    pItem->setCategory( static_cast< ItemUICategory >( itemInfo->itemUICategory ) );
 
-   g_framework.getCharaDb().execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
+  pDb->execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
                       std::to_string( m_pOwner->getId() ) + ", " +
                       std::to_string( pItem->getUId() ) + ", " +
                       std::to_string( pItem->getId() ) + ", " +
@@ -235,6 +237,7 @@ bool Core::Inventory::addCurrency( CurrencyType type, uint32_t amount )
 
 void Core::Inventory::updateCurrencyDb()
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    int32_t firstItemPos = -1;
    std::string query = "UPDATE charaitemcurrency SET ";
 
@@ -256,12 +259,13 @@ void Core::Inventory::updateCurrencyDb()
 
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() );
 
-   g_framework.getCharaDb().execute( query );
+   pDb->execute( query );
 }
 
 
 void Core::Inventory::updateCrystalDb()
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    int32_t firstItemPos = -1;
    std::string query = "UPDATE charaitemcrystal SET ";
 
@@ -283,11 +287,12 @@ void Core::Inventory::updateCrystalDb()
 
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() );
 
-   g_framework.getCharaDb().execute( query );
+   pDb->execute( query );
 }
 
 void Core::Inventory::updateBagDb( InventoryType type )
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    std::string query = "UPDATE charaiteminventory SET ";
 
    for( int32_t i = 0; i <= 34; i++ )
@@ -303,7 +308,7 @@ void Core::Inventory::updateBagDb( InventoryType type )
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() ) +
       " AND storageId = " + std::to_string( static_cast< uint16_t >( type ) );
 
-   g_framework.getCharaDb().execute( query );
+   pDb->execute( query );
 }
 
 bool Core::Inventory::isArmory( uint16_t containerId )
@@ -371,6 +376,8 @@ bool Core::Inventory::isEquipment( uint16_t containerId )
 
 void Core::Inventory::updateMannequinDb( InventoryType type )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    std::string query = "UPDATE charaitemgearset SET ";
 
    for( int32_t i = 0; i <= 13; i++ )
@@ -386,14 +393,15 @@ void Core::Inventory::updateMannequinDb( InventoryType type )
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() ) +
       " AND storageId = " + std::to_string( static_cast< uint16_t >( type ) );
 
-   g_framework.getLogger().debug( query );
-   g_framework.getCharaDb().execute( query );
+   pLog->debug( query );
+   pDb->execute( query );
 }
 
 
 void Core::Inventory::updateItemDb( Core::ItemPtr pItem ) const
 {
-   g_framework.getCharaDb().execute( "UPDATE charaglobalitem SET stack = " + std::to_string( pItem->getStackSize() ) + " " +
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   pDb->execute( "UPDATE charaglobalitem SET stack = " + std::to_string( pItem->getStackSize() ) + " " +
                      // TODO: add other attributes
                      " WHERE itemId = " + std::to_string( pItem->getUId() ) );
 }
@@ -469,8 +477,9 @@ bool Core::Inventory::isObtainable( uint32_t catalogId, uint8_t quantity )
 
 int16_t Core::Inventory::addItem( uint16_t inventoryId, int8_t slotId, uint32_t catalogId, uint8_t quantity )
 {
-
-   auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( catalogId );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
 
    // if item data doesn't exist or it's a blank field
    if( !itemInfo || itemInfo->levelItem == 0 )
@@ -503,7 +512,7 @@ int16_t Core::Inventory::addItem( uint16_t inventoryId, int8_t slotId, uint32_t
 
       m_inventoryMap[inventoryId]->setItem( rSlotId, item );
 
-      g_framework.getCharaDb().execute( "UPDATE charaiteminventory SET container_" + std::to_string( rSlotId ) + " = " + std::to_string( item->getUId() ) +
+      pDb->execute( "UPDATE charaiteminventory SET container_" + std::to_string( rSlotId ) + " = " + std::to_string( item->getUId() ) +
                          " WHERE storageId = " + std::to_string( inventoryId ) +
                          " AND CharacterId = " + std::to_string( m_pOwner->getId() ) );
 
@@ -646,14 +655,16 @@ void Core::Inventory::discardItem( uint16_t fromInventoryId, uint8_t fromSlotId
 
 Core::ItemPtr Core::Inventory::loadItem( uint64_t uId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    // load actual item 
-   auto itemRes = g_framework.getCharaDb().query( "SELECT catalogId, stack, flags FROM charaglobalitem WHERE itemId = " + std::to_string( uId ) + ";" );
+   auto itemRes = pDb->query( "SELECT catalogId, stack, flags FROM charaglobalitem WHERE itemId = " + std::to_string( uId ) + ";" );
    if( !itemRes->next() )
       return nullptr;
 
    try
    {
-      auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( itemRes->getUInt( 1 ) );
+      auto itemInfo = pExdData->get< Core::Data::Item >( itemRes->getUInt( 1 ) );
       bool isHq = itemRes->getUInt( 3 ) == 1 ? true : false;
       ItemPtr pItem( new Item( uId, 
                                itemRes->getUInt( 1 ),
@@ -673,9 +684,10 @@ Core::ItemPtr Core::Inventory::loadItem( uint64_t uId )
 
 bool Core::Inventory::load()
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    //////////////////////////////////////////////////////////////////////////////////////////////////////
    // load active gearset
-   auto res = g_framework.getCharaDb().query( "SELECT storageId, container_0, container_1, container_2, container_3, "
+   auto res = pDb->query( "SELECT storageId, container_0, container_1, container_2, container_3, "
                                "container_4, container_5, container_6, container_7, "
                                "container_8, container_9, container_10, container_11, "
                                "container_12, container_13 "
@@ -705,7 +717,7 @@ bool Core::Inventory::load()
 
    ///////////////////////////////////////////////////////////////////////////////////////////////////////
    // Load Bags
-   auto bagRes = g_framework.getCharaDb().query( "SELECT storageId, "
+   auto bagRes = pDb->query( "SELECT storageId, "
                                   "container_0, container_1, container_2, container_3, container_4, "
                                   "container_5, container_6, container_7, container_8, container_9, "
                                   "container_10, container_11, container_12, container_13, container_14, "
@@ -738,7 +750,7 @@ bool Core::Inventory::load()
 
    ///////////////////////////////////////////////////////////////////////////////////////////////////////
    // Load Currency
-   auto curRes = g_framework.getCharaDb().query( "SELECT storageId, "
+   auto curRes = pDb->query( "SELECT storageId, "
                                   "container_0, container_1, container_2, container_3, container_4, "
                                   "container_5, container_6, container_7, container_8, container_9, "
                                   "container_10, container_11 "
@@ -767,7 +779,7 @@ bool Core::Inventory::load()
 
    ///////////////////////////////////////////////////////////////////////////////////////////////////////
    // Load Crystals
-   auto crystalRes = g_framework.getCharaDb().query( "SELECT storageId, "
+   auto crystalRes = pDb->query( "SELECT storageId, "
                                       "container_0, container_1, container_2, container_3, container_4, "
                                       "container_5, container_6, container_7, container_8, container_9, "
                                       "container_10, container_11, container_12, container_13, container_14, "
@@ -874,7 +886,8 @@ uint16_t Core::Inventory::calculateEquippedGearItemLevel()
          }
          else
          {
-            g_framework.getLogger().debug( "Is one handed" );
+            auto pLog = g_fw.get< Logger >();
+            pLog->debug( "Is one handed" );
          }
       }
 
@@ -923,8 +936,8 @@ Core::Inventory::ContainerType Core::Inventory::getContainerType( uint32_t conta
 uint32_t Core::Inventory::getNextUId()
 {
    uint32_t charId = 0;
-
-   auto pQR = g_framework.getCharaDb().query( "SELECT MAX(ItemId) FROM charaglobalitem" );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pQR = pDb->query( "SELECT MAX(ItemId) FROM charaglobalitem" );
 
    if( !pQR->next() )
       return 0x00500001;
diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp
index f5907f98..e77210bc 100644
--- a/src/servers/sapphire_zone/Inventory/Item.cpp
+++ b/src/servers/sapphire_zone/Inventory/Item.cpp
@@ -4,7 +4,7 @@
 #include "Framework.h"
 #include "Item.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Item::Item()
 {
@@ -26,7 +26,8 @@ Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t mo
    m_model2( model2 ),
    m_isHq( isHq )
 {
-   auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( catalogId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
    m_delayMs = itemInfo->delayms;
    m_physicalDmg = itemInfo->damagePhys;
    m_magicalDmg = itemInfo->damageMag;
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
index 23670cfa..54a65309 100644
--- a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
+++ b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
@@ -9,7 +9,7 @@
 #include "Forwards.h"
 #include "ItemContainer.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::ItemContainer::ItemContainer( uint16_t locationId ) : 
    m_id( locationId ),
@@ -35,19 +35,21 @@ uint8_t Core::ItemContainer::getEntryCount() const
 
 void Core::ItemContainer::removeItem( uint8_t slotId )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    ItemMap::iterator it = m_itemMap.find( slotId );
 
    if( it != m_itemMap.end() )
    {
-      g_framework.getCharaDb().execute( "DELETE FROM charaglobalitem WHERE itemId = " + std::to_string( it->second->getUId() ) );
+      pDb->execute( "DELETE FROM charaglobalitem WHERE itemId = " + std::to_string( it->second->getUId() ) );
 
       m_itemMap.erase( it );
 
-      g_framework.getLogger().debug( "Dropped item from slot " + std::to_string( slotId ) );
+      pLog->debug( "Dropped item from slot " + std::to_string( slotId ) );
    }
    else
    {
-      g_framework.getLogger().debug( "Item could not be dropped from slot " + std::to_string( slotId ) );
+      pLog->debug( "Item could not be dropped from slot " + std::to_string( slotId ) );
    }
 }
 
@@ -78,7 +80,8 @@ Core::ItemPtr Core::ItemContainer::getItem( uint8_t slotId )
 
    if( ( slotId > m_size ) || ( slotId == -1 ) )
    {
-      g_framework.getLogger().error( "Slot out of range " + std::to_string( slotId ) );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Slot out of range " + std::to_string( slotId ) );
       return nullptr;
    }
 
diff --git a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
index 5cdd5ad9..ab30816b 100644
--- a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
+++ b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
@@ -7,7 +7,7 @@
 #include "Framework.h"
 #include "LinkshellMgr.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::LinkshellMgr::LinkshellMgr()
 {
@@ -16,8 +16,8 @@ Core::LinkshellMgr::LinkshellMgr()
 
 bool Core::LinkshellMgr::loadLinkshells()
 {
-
-   auto res = g_framework.getCharaDb().query( "SELECT LinkshellId, MasterCharacterId, CharacterIdList, "
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto res = pDb->query( "SELECT LinkshellId, MasterCharacterId, CharacterIdList, "
                                       "LinkshellName, LeaderIdList, InviteIdList "
                                       "FROM infolinkshell "
                                "ORDER BY LinkshellId ASC;" );
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.cpp b/src/servers/sapphire_zone/Math/CalcBattle.cpp
index 4a68d6b0..5010537c 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.cpp
+++ b/src/servers/sapphire_zone/Math/CalcBattle.cpp
@@ -10,7 +10,7 @@
 #include "CalcBattle.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Math;
 using namespace Core::Entity;
@@ -33,8 +33,9 @@ using namespace Core::Entity;
 
 uint32_t CalcBattle::calculateHealValue( PlayerPtr pPlayer, uint32_t potency )
 {
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( pPlayer->getLevel() );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() );
 
    if( !classInfo || !paramGrowthInfo )
       return 0;
diff --git a/src/servers/sapphire_zone/Math/CalcStats.cpp b/src/servers/sapphire_zone/Math/CalcStats.cpp
index 10119e4a..2f8932e6 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.cpp
+++ b/src/servers/sapphire_zone/Math/CalcStats.cpp
@@ -13,7 +13,7 @@
 using namespace Core::Math;
 using namespace Core::Entity;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 /*
    Class used for battle-related formulas and calculations.
@@ -59,12 +59,13 @@ float CalcStats::calculateBaseStat( PlayerPtr pPlayer )
 
 uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    // TODO: Replace ApproxBaseHP with something that can get us an accurate BaseHP.
    // Is there any way to pull reliable BaseHP without having to manually use a pet for every level, and using the values from a table?
    // More info here: https://docs.google.com/spreadsheets/d/1de06KGT0cNRUvyiXNmjNgcNvzBCCQku7jte5QxEQRbs/edit?usp=sharing
    
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( pPlayer->getLevel() );
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() );
 
    if( !classInfo || !paramGrowthInfo )
       return 0;
@@ -96,8 +97,9 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer )
 
 uint32_t CalcStats::calculateMaxMp( PlayerPtr pPlayer )
 {
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( pPlayer->getLevel() );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() );
 
    if( !classInfo || !paramGrowthInfo )
       return 0;
diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp
index 3dfdcd8b..318abe70 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.cpp
+++ b/src/servers/sapphire_zone/Network/GameConnection.cpp
@@ -21,7 +21,7 @@
 #include "Framework.h"
 #include "Forwards.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -54,6 +54,7 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive,
    setZoneHandler( ClientZoneIpcType::PlayTimeHandler,      "PlayTimeHandler",          &GameConnection::playTimeHandler );
    setZoneHandler( ClientZoneIpcType::LogoutHandler,        "LogoutHandler",            &GameConnection::logoutHandler );
 
+   setZoneHandler( ClientZoneIpcType::SocialReqSendHandler, "SocialReqSendHandler",     &GameConnection::socialReqSendHandler );
    setZoneHandler( ClientZoneIpcType::SocialListHandler,    "SocialListHandler",        &GameConnection::socialListHandler );
    setZoneHandler( ClientZoneIpcType::SetSearchInfoHandler, "SetSearchInfoHandler",     &GameConnection::setSearchInfoHandler );
    setZoneHandler( ClientZoneIpcType::ReqSearchInfoHandler, "ReqSearchInfoHandler",     &GameConnection::reqSearchInfoHandler );
@@ -111,34 +112,35 @@ void Core::Network::GameConnection::OnAccept( const std::string & host, uint16_t
 {
    GameConnectionPtr connection( new GameConnection( m_hive, m_pAcceptor ) );
    m_pAcceptor->Accept( connection );
-
-   g_framework.getLogger().info( "Connect from " + m_socket.remote_endpoint().address().to_string() );
+   auto pLog = g_fw.get< Logger >();
+   pLog->info( "Connect from " + m_socket.remote_endpoint().address().to_string() );
 }
 
 
 void Core::Network::GameConnection::OnDisconnect()
 {
-   g_framework.getLogger().debug( "GameConnection DISCONNECT" );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "GameConnection DISCONNECT" );
    m_pSession = nullptr;
 }
 
 void Core::Network::GameConnection::OnRecv( std::vector< uint8_t > & buffer )
 {
    // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-
+   auto pLog = g_fw.get< Logger >();
    Packets::FFXIVARR_PACKET_HEADER packetHeader{};
    const auto headerResult = Packets::getHeader( buffer, 0, packetHeader );
 
    if( headerResult == Incomplete )
    {
-      g_framework.getLogger().info( "Dropping connection due to incomplete packet header." );
-      g_framework.getLogger().info( "FIXME: Packet message bounary is not implemented." );
+      pLog->info( "Dropping connection due to incomplete packet header." );
+      pLog->info( "FIXME: Packet message bounary is not implemented." );
       Disconnect();
       return;
    }
    else if( headerResult == Malformed )
    {
-      g_framework.getLogger().info( "Dropping connection due to malformed packet header." );
+      pLog->info( "Dropping connection due to malformed packet header." );
       Disconnect();
       return;
    }
@@ -150,14 +152,14 @@ void Core::Network::GameConnection::OnRecv( std::vector< uint8_t > & buffer )
    
    if( packetResult == Incomplete )
    {
-      g_framework.getLogger().info( "Dropping connection due to incomplete packets." );
-      g_framework.getLogger().info( "FIXME: Packet message bounary is not implemented." );
+      pLog->info( "Dropping connection due to incomplete packets." );
+      pLog->info( "FIXME: Packet message bounary is not implemented." );
       Disconnect();
       return;
    }
    else if( packetResult == Malformed )
    {
-      g_framework.getLogger().info( "Dropping connection due to malformed packets." );
+      pLog->info( "Dropping connection due to malformed packets." );
       Disconnect();
       return;
    }
@@ -168,7 +170,8 @@ void Core::Network::GameConnection::OnRecv( std::vector< uint8_t > & buffer )
 
 void Core::Network::GameConnection::OnError( const boost::system::error_code & error )
 {
-   g_framework.getLogger().debug( "GameConnection ERROR: " + error.message() );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "GameConnection ERROR: " + error.message() );
 }
 
 void Core::Network::GameConnection::queueInPacket( Core::Network::Packets::GamePacketPtr inPacket )
@@ -183,6 +186,7 @@ void Core::Network::GameConnection::queueOutPacket( Core::Network::Packets::Game
 
 void Core::Network::GameConnection::handleZonePacket( const Packets::GamePacket& pPacket )
 {
+   auto pLog = g_fw.get< Logger >();
    auto it = m_zoneHandlerMap.find( pPacket.getSubType() );
 
    std::string sessionStr = "[" + std::to_string( m_pSession->getId() ) + "]";
@@ -195,7 +199,7 @@ void Core::Network::GameConnection::handleZonePacket( const Packets::GamePacket&
       if( pPacket.getSubType() != PingHandler &&
           pPacket.getSubType() != UpdatePositionHandler )
 
-         g_framework.getLogger().debug( sessionStr + " Handling Zone IPC : " + name + "( " +
+         pLog->debug( sessionStr + " Handling Zone IPC : " + name + "( " +
                       boost::str( boost::format( "%|04X|" ) %
                                          static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
 
@@ -203,16 +207,17 @@ void Core::Network::GameConnection::handleZonePacket( const Packets::GamePacket&
    }
    else
    {
-      g_framework.getLogger().debug( sessionStr + " Undefined Zone IPC : Unknown ( " +
+      pLog->debug( sessionStr + " Undefined Zone IPC : Unknown ( " +
                    boost::str( boost::format( "%|04X|" ) %
                                       static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
-      g_framework.getLogger().debug( "\n" + pPacket.toString() );
+      pLog->debug( "\n" + pPacket.toString() );
    }
 }
 
 
 void Core::Network::GameConnection::handleChatPacket( const Packets::GamePacket& pPacket )
 {
+   auto pLog = g_fw.get< Logger >();
    auto it = m_chatHandlerMap.find( pPacket.getSubType() );
 
    std::string sessionStr = "[" + std::to_string( m_pSession->getId() ) + "]";
@@ -223,7 +228,7 @@ void Core::Network::GameConnection::handleChatPacket( const Packets::GamePacket&
       std::string name = itStr != m_chatHandlerStrMap.end() ? itStr->second : "unknown";
       // dont display packet notification if it is a ping or pos update, don't want the spam
 
-      g_framework.getLogger().debug( sessionStr + " Handling Chat IPC : " + name + "( " +
+      pLog->debug( sessionStr + " Handling Chat IPC : " + name + "( " +
                    boost::str( boost::format( "%|04X|" ) %
                                       static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
 
@@ -231,10 +236,10 @@ void Core::Network::GameConnection::handleChatPacket( const Packets::GamePacket&
    }
    else
    {
-      g_framework.getLogger().debug( sessionStr + " Undefined Chat IPC : Unknown ( " +
+      pLog->debug( sessionStr + " Undefined Chat IPC : Unknown ( " +
                   boost::str( boost::format( "%|04X|" ) %
                                      static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
-      g_framework.getLogger().debug( pPacket.toString() );
+      pLog->debug( pPacket.toString() );
    }
 }
 
@@ -276,7 +281,7 @@ void Core::Network::GameConnection::processInQueue()
 
 void Core::Network::GameConnection::processOutQueue()
 {
-
+   auto pLog = g_fw.get< Logger >();
    if( m_outQueue.size() < 1 )
       return;
 
@@ -290,7 +295,7 @@ void Core::Network::GameConnection::processOutQueue()
    {
       if( pPacket->getSize() == 0 )
       {
-         g_framework.getLogger().debug( "end of packet set" );
+         pLog->debug( "end of packet set" );
          break;
       }
 
@@ -362,6 +367,8 @@ void Core::Network::GameConnection::injectPacket( const std::string& packetpath,
 void Core::Network::GameConnection::handlePackets( const Core::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
                                                    const std::vector< Core::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pServerZone = g_fw.get< ServerZone >();
    // if a session is set, update the last time it recieved a game packet
    if( m_pSession )
       m_pSession->updateLastDataTime();
@@ -377,23 +384,23 @@ void Core::Network::GameConnection::handlePackets( const Core::Network::Packets:
          auto pCon = boost::static_pointer_cast< GameConnection, Connection >( shared_from_this() );
 
          // try to retrieve the session for this id
-         auto session = g_framework.getServerZone().getSession( playerId );
+         auto session = pServerZone->getSession( playerId );
 
          if( !session )
          {
-            g_framework.getLogger().info( "[" + std::string( id ) + "] Session not registered, creating" );
+            pLog->info( "[" + std::string( id ) + "] Session not registered, creating" );
             // return;
-            if( !g_framework.getServerZone().createSession( playerId ) )
+            if( !pServerZone->createSession( playerId ) )
             {
                Disconnect();
                return;
             }
-            session = g_framework.getServerZone().getSession( playerId );
+            session = pServerZone->getSession( playerId );
          }
          //TODO: Catch more things in lobby and send real errors
          else if( !session->isValid() || ( session->getPlayer() && session->getPlayer()->getLastPing() != 0 ) )
          {
-            g_framework.getLogger().error( "[" + std::string(id) + "] Session INVALID, disconnecting" );
+            pLog->error( "[" + std::string(id) + "] Session INVALID, disconnecting" );
             Disconnect();
             return;
          }
@@ -414,7 +421,7 @@ void Core::Network::GameConnection::handlePackets( const Core::Network::Packets:
             pPe = GamePacket( 0x00, 0x38, 0, 0, 0x02 );
             pPe.setValAt< uint32_t >( 0x10, playerId );
             sendSinglePacket( &pPe );
-            g_framework.getLogger().info( "[" + std::string( id ) + "] Setting session for zone connection" );
+            pLog->info( "[" + std::string( id ) + "] Setting session for zone connection" );
             session->setZoneConnection( pCon );
          }
          // chat connection, assinging it to the session
@@ -424,7 +431,7 @@ void Core::Network::GameConnection::handlePackets( const Core::Network::Packets:
             pPe.setValAt< uint32_t >( 0x10, playerId );
             sendSinglePacket( &pPe );
 
-            g_framework.getLogger().info( "[" + std::string( id ) + "] Setting session for chat connection" );
+            pLog->info( "[" + std::string( id ) + "] Setting session for chat connection" );
             session->setChatConnection( pCon );
             pPe = GamePacket( 0x02, 0x28, playerId, playerId, 0x03 );
             sendSinglePacket( &pPe );
diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h
index e8a8af37..3cb2e107 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.h
+++ b/src/servers/sapphire_zone/Network/GameConnection.h
@@ -86,6 +86,8 @@ public:
    DECLARE_HANDLER( initHandler );
    DECLARE_HANDLER( finishLoadingHandler );
    DECLARE_HANDLER( blackListHandler );
+   DECLARE_HANDLER( socialReqResponseHandler );
+   DECLARE_HANDLER( socialReqSendHandler );
    DECLARE_HANDLER( socialListHandler );
    DECLARE_HANDLER( linkshellListHandler );
    DECLARE_HANDLER( playTimeHandler );
@@ -125,7 +127,6 @@ public:
    DECLARE_HANDLER( performNoteHandler );
 
    DECLARE_HANDLER( tellHandler );
-
 };
 
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 961106d7..2e1ad688 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -39,7 +39,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -107,6 +107,7 @@ enum ClientTrigger
 void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& inPacket,
                                                    Entity::Player& player )
 {
+    auto pLog = g_fw.get< Logger >();
     uint16_t commandId = inPacket.getValAt< uint16_t >( 0x20 );
     uint64_t param1 = inPacket.getValAt< uint64_t >( 0x24 );
     uint32_t param11 = inPacket.getValAt< uint32_t >( 0x24 );
@@ -114,7 +115,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
     uint32_t param2 = inPacket.getValAt< uint32_t >( 0x2C );
     uint64_t param3 = inPacket.getValAt< uint64_t >( 0x38 );
 
-    g_framework.getLogger().debug( "[" + std::to_string( m_pSession->getId() ) + "] Incoming action: " +
+    pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Incoming action: " +
                  boost::str( boost::format( "%|04X|" ) % ( uint32_t ) ( commandId & 0xFFFF ) ) +
                  "\nparam1: " + boost::str( boost::format( "%|016X|" ) % ( uint64_t ) ( param1 & 0xFFFFFFFFFFFFFFF ) ) +
                  "\nparam2: " + boost::str( boost::format( "%|08X|" ) % ( uint32_t ) ( param2 & 0xFFFFFFFF ) ) +
@@ -271,7 +272,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
         }
         default:
         {
-           g_framework.getLogger().debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
+           pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
               boost::str( boost::format( "%|04X|" ) % (uint32_t) ( commandId & 0xFFFF ) ) );
            break;
         }
diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
index 5a0bc0a4..0ece4964 100644
--- a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
@@ -22,7 +22,7 @@
 #include "Session.h"
 
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -35,7 +35,7 @@ void Core::Network::GameConnection::cfDutyInfoRequest( const Packets::GamePacket
    ZoneChannelPacket< FFXIVIpcCFDutyInfo > dutyInfoPacket( player.getId() );
 
    auto penaltyMinutes = player.getCFPenaltyMinutes();
-   if (penaltyMinutes > 255)
+   if( penaltyMinutes > 255 )
    {
       // cap it since it's uint8_t in packets
       penaltyMinutes = 255;
@@ -52,6 +52,8 @@ void Core::Network::GameConnection::cfDutyInfoRequest( const Packets::GamePacket
 void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& inPacket,
                                                     Entity::Player& player)
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    // TODO use for loop for this
    auto contentId1 = inPacket.getValAt< uint16_t >( 0x2E );
    auto contentId2 = inPacket.getValAt< uint16_t >( 0x30 );
@@ -59,12 +61,12 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
    auto contentId4 = inPacket.getValAt< uint16_t >( 0x34 );
    auto contentId5 = inPacket.getValAt< uint16_t >( 0x36 );
 
-   player.sendDebug("Duty register request");
-   player.sendDebug("ContentId1: " + std::to_string(contentId1));
-   player.sendDebug("ContentId2: " + std::to_string(contentId2));
-   player.sendDebug("ContentId3: " + std::to_string(contentId3));
-   player.sendDebug("ContentId4: " + std::to_string(contentId4));
-   player.sendDebug("ContentId5: " + std::to_string(contentId5));
+   player.sendDebug( "Duty register request");
+   player.sendDebug( "ContentId1: " + std::to_string( contentId1 ) );
+   player.sendDebug( "ContentId2: " + std::to_string( contentId2 ) );
+   player.sendDebug( "ContentId3: " + std::to_string( contentId3 ) );
+   player.sendDebug( "ContentId4: " + std::to_string( contentId4 ) );
+   player.sendDebug( "ContentId5: " + std::to_string( contentId5 ) );
 
    // let's cancel it because otherwise you can't register it again
    ZoneChannelPacket< FFXIVIpcCFNotify > cfCancelPacket( player.getId() );
@@ -72,11 +74,11 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
    cfCancelPacket.data().state2 = 1; // Your registration is withdrawn.
    queueOutPacket( cfCancelPacket );
 
-   auto cfCondition = g_framework.getExdDataGen().get< Core::Data::ContentFinderCondition >( contentId1 );
+   auto cfCondition = pExdData->get< Core::Data::ContentFinderCondition >( contentId1 );
    if( !cfCondition )
       return;
 
-   auto instance = g_framework.getTerritoryMgr().createInstanceContent( cfCondition->instanceContent );
+   auto instance = pTeriMgr->createInstanceContent( cfCondition->instanceContent );
    if( !instance )
       return;
 
@@ -88,11 +90,11 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
 void Core::Network::GameConnection::cfRegisterRoulette( const Packets::GamePacket& inPacket,
                                                         Entity::Player& player)
 {
-   player.sendDebug("Roulette register");
+   player.sendDebug( "Roulette register" );
 }
 
 void Core::Network::GameConnection::cfDutyAccepted( const Packets::GamePacket& inPacket,
                                                     Entity::Player& player)
 {
-   player.sendDebug("TODO: Duty accept");
+   player.sendDebug( "TODO: Duty accept" );
 }
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index e4d0c4f0..32dfaba5 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -28,7 +28,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -36,6 +36,8 @@ using namespace Core::Network::Packets::Server;
 
 void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket& inPacket, Entity::Player& player )
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    auto actorId = inPacket.getValAt< uint64_t >( 0x20 );
    auto eventId = inPacket.getValAt< uint32_t >( 0x28 );
    auto eventType = static_cast< uint16_t >( eventId >> 16 );
@@ -60,10 +62,10 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket&
    {
       instance->onTalk( player, eventId, actorId );
    }
-   else if( !g_framework.getScriptMgr().onTalk( player, actorId, eventId ) &&
+   else if( !pScriptMgr->onTalk( player, actorId, eventId ) &&
             eventType == Event::EventHandler::EventHandlerType::Quest )
    {
-      auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( eventId );
+      auto questInfo = pExdData->get< Core::Data::Quest >( eventId );
       if( questInfo )
          player.sendUrgent( "Quest not implemented: " + questInfo->name + " (" + questInfo->id + ")" );
    }
@@ -75,6 +77,8 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket&
 void Core::Network::GameConnection::eventHandlerEmote( const Packets::GamePacket& inPacket, Entity::Player& player )
 {
 
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    auto actorId = inPacket.getValAt< uint64_t >( 0x20 );
    auto eventId = inPacket.getValAt< uint32_t >( 0x28 );
    auto emoteId = inPacket.getValAt< uint16_t >( 0x2C );
@@ -95,10 +99,10 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::GamePacket
 
    player.eventStart( actorId, eventId, Event::EventHandler::Emote, 0, emoteId );
 
-   if( !g_framework.getScriptMgr().onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) )  &&
+   if( !pScriptMgr->onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) )  &&
        eventType == Event::EventHandler::EventHandlerType::Quest )
    {
-      auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( eventId );
+      auto questInfo = pExdData->get< Core::Data::Quest >( eventId );
       if( questInfo )
          player.sendUrgent( "Quest not implemented: " + questInfo->name );
    }
@@ -109,7 +113,7 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::GamePacket
 void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::GamePacket& inPacket,
                                                              Entity::Player& player )
 {
-
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    auto eventId = inPacket.getValAt< uint32_t >( 0x24 );
    auto param1 = inPacket.getValAt< uint32_t >( 0x20 );
    auto x = inPacket.getValAt< float >( 0x28 );
@@ -123,7 +127,7 @@ void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::Game
 
    player.eventStart( player.getId(), eventId, Event::EventHandler::WithinRange, 1, param1 );
 
-   g_framework.getScriptMgr().onWithinRange( player, eventId, param1, x, y, z );
+   pScriptMgr->onWithinRange( player, eventId, param1, x, y, z );
 
    player.checkEvent( eventId );
 }
@@ -131,7 +135,7 @@ void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::Game
 void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::GamePacket& inPacket,
                                                               Entity::Player& player )
 {
-
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    auto eventId = inPacket.getValAt< uint32_t >( 0x24 );
    auto param1 = inPacket.getValAt< uint32_t >( 0x20 );
    auto x = inPacket.getValAt< float >( 0x28 );
@@ -145,7 +149,7 @@ void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::Gam
 
    player.eventStart( player.getId(), eventId, Event::EventHandler::WithinRange, 1, param1 );
 
-   g_framework.getScriptMgr().onOutsideRange( player, eventId, param1, x, y, z );
+   pScriptMgr->onOutsideRange( player, eventId, param1, x, y, z );
 
    player.checkEvent( eventId );
 }
@@ -153,6 +157,7 @@ void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::Gam
 void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::GamePacket &inPacket,
                                                                 Entity::Player &player )
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    auto eventId = inPacket.getValAt< uint32_t >( 0x20 );
    auto param1 = inPacket.getValAt< uint16_t >( 0x24 );
    auto param2 = inPacket.getValAt< uint16_t >( 0x26 );
@@ -163,21 +168,15 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::G
 
    player.sendDebug( "Calling: " + objName + "." + eventName + " - " + std::to_string( eventId ) );
 
-   player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId(), 0 );
-
    if( auto instance = player.getCurrentInstance() )
    {
-      // param2 of eventStart
-      // 0 = default state?
-      // 1 = restore state?
-      // (^ Mordred: Nope, i don't think thats it )
       player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId(), instance->getDirectorId() & 0xFFFF );
       instance->onEnterTerritory( player, eventId, param1, param2 );
    }
    else
    {
       player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId() );
-      g_framework.getScriptMgr().onEnterTerritory( player, eventId, param1, param2 );
+      pScriptMgr->onEnterTerritory( player, eventId, param1, param2 );
    }
 
    player.checkEvent( eventId );
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index dba11f3c..afffb561 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -46,7 +46,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -109,7 +109,8 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    uint32_t param2 = inPacket.getValAt< uint32_t >( 0x28 );
    uint32_t param3 = inPacket.getValAt< uint32_t >( 0x38 );
 
-   g_framework.getLogger().debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) +
       ", params: " + std::to_string( param1 ) + ", " +
       std::to_string( param2 ) + ", " + std::to_string( param3 ) );
 
@@ -409,19 +410,20 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Teri:
    {
-      if( auto instance = g_framework.getTerritoryMgr().getInstanceZonePtr( param1 ) )
+      auto pTeriMgr = g_fw.get< TerritoryMgr >();
+      if( auto instance = pTeriMgr->getInstanceZonePtr( param1 ) )
       {
          player.sendDebug( "Found instance: " + instance->getName() + ", id: " + std::to_string( param1 ) );
 
          player.setInstance( instance );
       }
-      else if( !g_framework.getTerritoryMgr().isValidTerritory( param1 )  )
+      else if( !pTeriMgr->isValidTerritory( param1 )  )
       {
          player.sendUrgent( "Invalid zone " + std::to_string( param1 ) );
       }
       else
       {
-         auto pZone = g_framework.getTerritoryMgr().getZoneByTerriId( param1 );
+         auto pZone = pTeriMgr->getZoneByTerriId( param1 );
          if( !pZone )
          {
             player.sendUrgent( "No zone instance found for " + std::to_string( param1 ) );
@@ -467,13 +469,16 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
 {
    if( player.getGmRank() <= 0 )
       return;
+   
+   auto pLog = g_fw.get< Logger >();
+   auto pServerZone = g_fw.get< ServerZone >();
 
    uint32_t commandId = inPacket.getValAt< uint32_t >( 0x20 );
    std::string param1 = inPacket.getStringAt( 0x34 );
 
-   g_framework.getLogger().debug( player.getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 );
+   pLog->debug( player.getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 );
 
-   auto targetSession = g_framework.getServerZone().getSession( param1 );
+   auto targetSession = pServerZone->getSession( param1 );
    Core::Entity::CharaPtr targetActor;
 
    if( targetSession != nullptr )
diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
index 1d4983c3..00b57c72 100644
--- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
@@ -24,7 +24,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -53,10 +53,12 @@ void Core::Network::GameConnection::inventoryModifyHandler( const Packets::GameP
    ackPacket.data().sequence = seq;
    ackPacket.data().type = 7;
    player.queuePacket( ackPacket );
+  
+   auto pLog = g_fw.get< Logger >();
 
 
-   g_framework.getLogger().debug( inPacket.toString() );
-   g_framework.getLogger().debug( "InventoryAction: " + std::to_string( action ) );
+   pLog->debug( inPacket.toString() );
+   pLog->debug( "InventoryAction: " + std::to_string( action ) );
 
    // TODO: other inventory operations need to be implemented
    switch( action )
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 2648374e..945ee886 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -7,6 +7,9 @@
 #include <Network/PacketContainer.h>
 #include <Network/PacketDef/Chat/ServerChatDef.h>
 #include <Database/DatabaseDef.h>
+#include <Database/DbWorkerPool.h>
+#include <Database/CharaDbConnection.h>
+
 #include <boost/format.hpp>
 #include <unordered_map>
 #include "Network/GameConnection.h"
@@ -37,13 +40,15 @@
 
 #include "Action/Action.h"
 #include "Action/ActionTeleport.h"
+#include "Social/Manager/SocialMgr.h"
+#include "Social/FriendList.h"
 
 #include "Session.h"
 #include "ServerZone.h"
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -285,20 +290,20 @@ void Core::Network::GameConnection::updatePositionHandler( const Packets::GamePa
 void Core::Network::GameConnection::reqEquipDisplayFlagsHandler( const Packets::GamePacket& inPacket,
                                                                  Entity::Player& player )
 {
-   g_framework.getLogger().info( "[" + std::to_string( player.getId() ) + "] Setting EquipDisplayFlags to " + std::to_string( inPacket.getValAt< uint8_t >( 0x20 ) ) );
    player.setEquipDisplayFlags( inPacket.getValAt< uint8_t >( 0x20 ) );
 }
 
 void Core::Network::GameConnection::zoneLineHandler( const Packets::GamePacket& inPacket,
                                                      Entity::Player& player )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    uint32_t zoneLineId = inPacket.getValAt< uint32_t >( 0x20 );
 
    player.sendDebug( "Walking ZoneLine " + std::to_string( zoneLineId ) );
 
    auto pZone = player.getCurrentZone();
 
-   auto pLine = g_framework.getTerritoryMgr().getTerritoryPosition( zoneLineId );
+   auto pLine = pTeriMgr->getTerritoryPosition( zoneLineId );
 
    Common::FFXIVARR_POSITION3 targetPos{};
    uint32_t targetZone;
@@ -337,7 +342,9 @@ void Core::Network::GameConnection::discoveryHandler( const Packets::GamePacket&
 {
    uint32_t ref_position_id = inPacket.getValAt< uint32_t >( 0x20 );
 
-   auto pQR = g_framework.getCharaDb().query( "SELECT id, map_id, discover_id "
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+
+   auto pQR = pDb->query( "SELECT id, map_id, discover_id "
                                "FROM discoveryinfo "
                                "WHERE id = " + std::to_string( ref_position_id ) + ";" );
 
@@ -430,11 +437,11 @@ void Core::Network::GameConnection::finishLoadingHandler( const Packets::GamePac
 void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket& inPacket,
                                                        Entity::Player& player )
 {
-
+    
    uint8_t type = inPacket.getValAt< uint8_t >( 0x2A );
    uint8_t count = inPacket.getValAt< uint8_t >( 0x2B );
 
-   if( type == 0x02 )
+   if( type == SocialListType::PartyList )
    { // party list
 
       ZoneChannelPacket< FFXIVIpcSocialList > listPacket( player.getId() );
@@ -450,11 +457,11 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket
       listPacket.data().entries[0].bytes[4] = 0x02;
       listPacket.data().entries[0].bytes[6] = 0x3B;
       listPacket.data().entries[0].bytes[11] = 0x10;
-      listPacket.data().entries[0].classJob = static_cast< uint8_t >( player.getClass() );
+      listPacket.data().entries[0].classJob = player.getClass();
       listPacket.data().entries[0].contentId = player.getContentId();
       listPacket.data().entries[0].level = player.getLevel();
       listPacket.data().entries[0].zoneId = player.getCurrentZone()->getTerritoryId();
-      listPacket.data().entries[0].zoneId1 = 0x0100;
+      // listPacket.data().entries[0].zoneId1 = 0x0100;
       // TODO: no idea what this does
       //listPacket.data().entries[0].one = 1;
 
@@ -469,7 +476,7 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket
       queueOutPacket( listPacket );
 
    }
-   else if( type == 0x0b )
+   else if( type == SocialListType::FriendList )
    { // friend list
 
       ZoneChannelPacket< FFXIVIpcSocialList > listPacket( player.getId() );
@@ -477,18 +484,245 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket
       listPacket.data().sequence = count;
       memset( listPacket.data().entries, 0, sizeof( listPacket.data().entries ) );
 
+      uint16_t i = 0;
+
+      auto playerFriendsList = g_fw.get< Social::SocialMgr< Social::FriendList > >()->findGroupById( player.getFriendsListId() );
+
+      // todo: move this garbage else fucking where
+      for ( auto member : playerFriendsList.getMembers() )
+      {
+         // more elegant way to break over list entries pls
+         if ( i == 10 )
+            break;
+
+         g_fw.get< Logger >()->debug( "aaa" + std::to_string( i ) + ": " + member.second.name );
+         listPacket.data().entries[i] = Core::Social::Group::generatePlayerEntry( member.second );
+         i++;
+      }
+
+      queueOutPacket( listPacket );
+
    }
-   else if( type == 0x0e )
+   else if( type == SocialListType::SearchList )
    { // player search result
      // TODO: implement player search
    }
 
 }
 
+void Core::Network::GameConnection::socialReqResponseHandler( const Packets::GamePacket& inPacket,
+                                                              Entity::Player& player )
+{
+   auto targetId = inPacket.getValAt< uint32_t >( 0x20 );
+   auto category = inPacket.getValAt< Common::SocialCategory >( 0x28 );
+   auto action = inPacket.getValAt< Common::SocialRequestAction >( 0x29 );
+
+   ZoneChannelPacket< FFXIVIpcSocialRequestError > info( targetId, player.getId() );
+   ZoneChannelPacket< FFXIVIpcSocialRequestResponse > response( targetId, player.getId() );
+
+   info.data().category = category;
+   response.data().category = category;
+
+   //auto pQR = g_database.query( "SELECT Name FROM dbchara WHERE CharacterId = " + to_string( targetId ) );
+   auto name = player.getName();
+   /*
+   if( pQR->getRowCount() > 0 )
+   {
+      name = pQR->fetch()->getString();
+   }
+   else
+   {
+      // todo: enumerate these messages
+      std::array< uint32_t, 5> categoryError = { 0,
+         320, // Unable to process party command.
+         310, // Unable to process friend list command.
+         3035, // Unable to reply. Free company invite invalid. // todo: find actual message
+         3035, // Unable to reply. Free company invite invalid.
+      };
+
+      response.data().messageId = categoryError[category];
+      response.data().category = category; // client only uses messageId if this is 1 for some reason
+      pPlayer->queuePacket( response );
+      return;
+   }*/
+
+   g_fw.get< Logger >()->debug( std::to_string( static_cast<uint8_t>( action ) ) );
+
+   auto pSession = g_fw.get< ServerZone >()->getSession( targetId );
+
+   // todo: notify both inviter/invitee with 0x00CB packet
+
+   if( pSession )
+   {
+      g_fw.get< Logger >()->debug( std::to_string(static_cast<uint8_t>(action)) );
+   }
+   response.data().response = Common::SocialRequestResponse::Accept;
+   memcpy( &( response.data().name ), name.c_str(), 32 );
+   player.queuePacket( response );
+}
+
+void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePacket& inPacket,
+                                                          Entity::Player& player )
+{
+      // todo: handle all social request packets here
+   auto category = inPacket.getValAt< Common::SocialCategory >( 0x20 );
+   auto name = std::string( inPacket.getStringAt( 0x21 ) );
+
+   auto pSession = g_fw.get< ServerZone >()->getSession( name );
+
+   // only the requester needs the response
+   ZoneChannelPacket< FFXIVIpcSocialRequestError > response( player.getId() );
+   memcpy( &( response.data().name ), name.c_str(), 32 );
+
+   // todo: enumerate log messages
+   response.data().messageId = 319; // That name does not exist. Please confirm the spelling.
+   response.data().category = category;
+
+   // todo: enumerate and move each of these cases into their classes?
+   if( pSession )
+   {
+      bool successful = false;
+      Entity::PlayerPtr pRecipient = pSession->getPlayer();
+
+      std::array<std::string, 5> typeVar{ "", "PartyInvite", "FriendInvite", "FreeCompanyPetition", "FreeCompanyInvite" };
+
+      // todo: proper handling of invites already sent
+      // todo: move this to world server
+      // check if an invite has already been sent by me
+      /*
+      if( pRecipient->getTempVariable( typeVar[category] + "Id" ) )
+      {
+         if( pRecipient->getTempVariable( typeVar[category] + "Id" ) == pPlayer->getId() )
+         {
+            response.data().messageId = 328; // That player has already been invited.
+            pPlayer->queuePacket( response );
+         }
+         return;
+      }*/
+
+      if( pRecipient->getId() == player.getId() )
+      {
+         response.data().messageId = 321; // Unable to invite.
+      }
+
+      switch( category )
+      {
+         // party invite
+         case Core::Common::SocialCategory::Party:
+         {
+            /*
+            if( pRecipient->getParty() )
+            {
+               response.data().messageId = 326; // That player is already in another party.
+            }
+            else if( pRecipient->getTempVariable( "PartyInviteId" ) == pPlayer->getId() )
+            {
+               response.data().messageId = 328; // That player has already been invited.
+            }
+            else if( pPlayer->getParty() && pPlayer->getParty()->getPartyMemberCount() >= pPlayer->getParty()->getType() )
+            {
+               response.data().messageId = 329; // Unable to invite. The party is full.
+            }*/
+            if( !pRecipient->isLoadingComplete() ) // || pRecipient->getDuty() )
+            {
+               response.data().messageId = 331; // Unable to invite. That player is currently bound by duty or in a different area.
+            }
+            else if( pRecipient->getOnlineStatus() == Common::OnlineStatus::Busy )
+            {
+               response.data().messageId = 334; // Unable to send party invite. Player's online status is set to Busy.
+            }
+            else if( pRecipient->getOnlineStatus() == Common::OnlineStatus::ViewingCutscene )
+            {
+               response.data().messageId = 336; // Unable to invite. That player is currently watching a cutscene.
+            }
+            else
+            {
+               successful = true;
+            }
+            // response.data().messageId = 62; // <name> declines the party invite.
+         }
+         break;
+
+         case Common::SocialCategory::Friends:
+         {
+            // todo: check if already on friends list or invite pending
+            /*
+            if( pPlayer->getFriendList()->find(name) )
+            {
+            response.data().messageId = 312; // That player is already a friend or has been sent a request.
+            }
+            else if( pRecipient->getFriendList()->getSize() >= 200 )
+            {
+            response.data().messageId = 314; // Unable to send friend request. The other player's friend list is full.
+            }
+            else if( pPlayer->getFriendList()->getSize() >= 200 )
+            {
+            response.data().messageId = 313; // Your friend list is full.
+            }
+            */
+            successful = true;
+         }
+         break;
+
+         default:
+            break;
+      }
+
+      if( successful )
+      {
+         ZoneChannelPacket< FFXIVIpcSocialRequestReceive > packet( player.getId(), pRecipient->getId() );
+
+         std::array<uint16_t, 5> typeMessage{ 0,
+            1, // You invite <name> to a party.
+            10, // You send a friend request to <name>.
+            1884, // You invite <name> to your free company.
+            3044, // Free company petition signature request sent to <name>
+         };
+
+         // TODO: confirm the timers on retail
+         auto expireTime = time( nullptr ) + 120;
+
+         // todo: fix this for cross zone parties (move to world server)
+         /*
+         pRecipient->setTempVariable( typeVar[category] + "Id", pPlayer->getId() );
+         pRecipient->setTempVariable( typeVar[category] + "Timer", expireTime );*/
+
+         packet.data().actorId = player.getId();
+         packet.data().category = category;
+         packet.data().action = Core::Common::SocialRequestAction::Invite;
+         packet.data().unknown3 = 80;
+         packet.data().unknown = 46;
+         packet.data().unknown2 = 64;
+         memcpy( &( packet.data().name ), player.getName().c_str(), 32 );
+
+         pRecipient->queuePacket( packet );
+         pRecipient->sendDebug( "ding ding" );
+
+         auto recipientFriendsList = g_fw.get< Social::SocialMgr< Social::FriendList > >()->findGroupById( pRecipient->getFriendsListId() );
+
+         auto senderResultPacket = recipientFriendsList.inviteMember( player.getAsPlayer(), pRecipient, player.getId(), pRecipient->getId() );
+
+         player.queuePacket( senderResultPacket );
+
+         if ( recipientFriendsList.isFriendList() )
+         {
+            g_fw.get< Logger >()->debug( "he HAA HAAA" );
+         }
+
+         response.data().messageId = typeMessage[category];
+      }
+   }
+
+   player.queuePacket( response );
+   // todo: handle party, friend request
+   g_fw.get< Logger >()->debug( "sent to " + name );
+}
+
 void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPacket,
                                                  Entity::Player& player )
 {
 
+   auto pDebugCom = g_fw.get< DebugCommandHandler >();
    std::string chatString( inPacket.getStringAt( 0x3a ) );
 
    uint32_t sourceId = inPacket.getValAt< uint32_t >( 0x24 );
@@ -496,7 +730,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    if( chatString.at( 0 ) == '!' )
    {
       // execute game console command
-      g_framework.getDebugCommandHandler().execCommand( const_cast< char * >( chatString.c_str() ) + 1, player );
+      pDebugCom->execCommand( const_cast< char * >( chatString.c_str() ) + 1, player );
       return;
    }
 
@@ -553,15 +787,15 @@ void Core::Network::GameConnection::tellHandler( const Packets::GamePacket& inPa
    std::string targetPcName = inPacket.getStringAt( 0x21 );
    std::string msg = inPacket.getStringAt( 0x41 );
 
-   auto pSession = g_framework.getServerZone().getSession( targetPcName );
+   auto pZoneServer = g_fw.get< ServerZone >();
+
+   auto pSession = pZoneServer->getSession( targetPcName );
 
    if( !pSession )
    {
       ChatChannelPacket< FFXIVIpcTellErrNotFound > tellErrPacket( player.getId() );
       strcpy( tellErrPacket.data().receipientName, targetPcName.c_str() );
       sendSinglePacket( tellErrPacket );
-
-      g_framework.getLogger().debug( "TargetPc not found" );
       return;
    }
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index cf09e092..4ae0ebfe 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -30,7 +30,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -47,6 +47,9 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
     uint64_t targetId = inPacket.getValAt< uint64_t >( 0x30 );
 
     player.sendDebug( "Skill type:" + std::to_string( type ) );
+  
+    auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+    auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
 
     switch( type )
     {
@@ -57,7 +60,7 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
         std::string actionIdStr = boost::str( boost::format( "%|04X|" ) % action );
         player.sendDebug( "---------------------------------------" );
         player.sendDebug( "ActionHandler ( " + actionIdStr + " | " +
-                          g_framework.getExdDataGen().get< Core::Data::Action >( action )->name +
+                          pExdData->get< Core::Data::Action >( action )->name +
                           " | " + std::to_string( targetId ) + " )" );
 
         player.queuePacket( ActorControlPacket142( player.getId(), ActorControlType::ActionStart, 0x01, action ) );
@@ -80,7 +83,7 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
 
             if( !player.actionHasCastTime( action ) )
             {
-                g_framework.getScriptMgr().onCastFinish( player, targetActor->getAsChara(), action );
+                pScriptMgr->onCastFinish( player, targetActor->getAsChara(), action );
             }
             else
             {
@@ -97,11 +100,10 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
     }
     else if( action < 3000000 ) // item action
     {
-        auto info = g_framework.getExdDataGen().get< Core::Data::EventItem >( action );
+        auto info = pExdData->get< Core::Data::EventItem >( action );
         if( info )
         {
-            g_framework.getLogger().debug( info->name );
-            g_framework.getScriptMgr().onEventItem( player, action, info->quest, info->castTime, targetId );
+            pScriptMgr->onEventItem( player, action, info->quest, info->castTime, targetId );
         }
     }
     else if( action > 3000000 ) // unknown
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
index 6479a809..05530db9 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
@@ -2,13 +2,15 @@
 
 #include <Logging/Logger.h>
 #include <Config/XMLConfig.h>
-#include "Framework.h"
+
+#include "ServerZone.h"
 
 #include <boost/format.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 
-extern Core::Framework g_framework;
+#include "Framework.h"
+extern Core::Framework g_fw;
 
 namespace fs = boost::filesystem;
 
@@ -33,31 +35,35 @@ bool Core::Scripting::ScriptLoader::unloadModule( ModuleHandle handle )
 #else
    bool success = dlclose( handle ) == 0;
 #endif
+  
+   auto pLog = g_fw.get< Logger >();
 
    if( !success )
    {
-      g_framework.getLogger().error( "Failed to unload module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
+      pLog->error( "Failed to unload module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
 
       return false;
    }
 
-   g_framework.getLogger().debug( "Unloaded module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
+   pLog->debug( "Unloaded module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
 
    return true;
 }
 
 Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const std::string& path )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pConfig = g_fw.get< XMLConfig >();
    fs::path f( path );
 
    if( isModuleLoaded( f.stem().string() ) )
    {
-      g_framework.getLogger().error( "Unable to load module '" + f.stem().string() + "' as it is already loaded" );
+      pLog->error( "Unable to load module '" + f.stem().string() + "' as it is already loaded" );
       return nullptr;
    }
 
    // copy to temp dir
-   fs::path cacheDir( f.parent_path() /= g_framework.getServerZone().getConfig()->getValue< std::string >( "Settings.General.Scripts.CachePath", "./cache/" ) );
+   fs::path cacheDir( f.parent_path() /= pConfig->getValue< std::string >( "Settings.General.Scripts.CachePath", "./cache/" ) );
    fs::create_directories( cacheDir );
    fs::path dest( cacheDir /= f.filename().string() );
 
@@ -67,7 +73,7 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
    }
    catch( const boost::filesystem::filesystem_error& err )
    {
-      g_framework.getLogger().error( "Error copying file to cache: " + err.code().message() );
+      pLog->error( "Error copying file to cache: " + err.code().message() );
 
       return nullptr;
    }
@@ -81,12 +87,12 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
 
    if( !handle )
    {
-      g_framework.getLogger().error( "Failed to load module from: " + path );
+      pLog->error( "Failed to load module from: " + path );
 
       return nullptr;
    }
 
-   g_framework.getLogger().debug( "Loaded module '" + f.filename().string() + "' @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
+   pLog->debug( "Loaded module '" + f.filename().string() + "' @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
 
    auto info = new ScriptInfo;
    info->handle = handle;
@@ -102,6 +108,7 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
 ScriptObject** Core::Scripting::ScriptLoader::getScripts( ModuleHandle handle )
 {
    using getScripts = ScriptObject**( *)( );
+   auto pLog = g_fw.get< Logger >();
 
 #ifdef _WIN32
    getScripts func = reinterpret_cast< getScripts >( GetProcAddress( handle, "getScripts" ) );
@@ -113,7 +120,7 @@ ScriptObject** Core::Scripting::ScriptLoader::getScripts( ModuleHandle handle )
    {
       auto ptr = func();
 
-      g_framework.getLogger().debug( "got ScriptObject array @ 0x" + boost::str( boost::format( "%|08X|" ) % ptr ) );
+      pLog->debug( "got ScriptObject array @ 0x" + boost::str( boost::format( "%|08X|" ) % ptr ) );
 
       return ptr;
    }
@@ -128,6 +135,7 @@ bool Core::Scripting::ScriptLoader::unloadScript( Core::Scripting::ScriptInfo* i
 
 bool Core::Scripting::ScriptLoader::unloadScript( ModuleHandle handle )
 {
+   auto pLog = g_fw.get< Logger >();
    for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it )
    {
       if( it->second->handle == handle )
@@ -146,7 +154,7 @@ bool Core::Scripting::ScriptLoader::unloadScript( ModuleHandle handle )
             return true;
          }
 
-         g_framework.getLogger().error( "failed to unload module: " + info->library_name );
+         pLog->error( "failed to unload module: " + info->library_name );
 
          return false;
       }
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
index ca7a5d83..dabcaeb6 100644
--- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
@@ -30,7 +30,7 @@
 // enable the ambiguity fix for every platform to avoid #define nonsense
 #define WIN_AMBIGUITY_FIX
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Scripting::ScriptMgr::ScriptMgr() :
    m_firstScriptChangeNotificiation( false )
@@ -51,8 +51,10 @@ void Core::Scripting::ScriptMgr::update()
 bool Core::Scripting::ScriptMgr::init()
 {
    std::set< std::string > files;
+   auto pConfig = g_fw.get< XMLConfig >();
+   auto pLog = g_fw.get< Logger >();
 
-   loadDir( g_framework.getServerZone().getConfig()->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ),
+   loadDir( pConfig->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ),
             files, m_nativeScriptMgr->getModuleExtension() );
 
    uint32_t scriptsFound = 0;
@@ -68,7 +70,7 @@ bool Core::Scripting::ScriptMgr::init()
          scriptsLoaded++;
    }
 
-   g_framework.getLogger().info( "ScriptMgr: Loaded " + std::to_string( scriptsLoaded ) + "/" + std::to_string( scriptsFound ) + " scripts successfully" );
+   pLog->info( "ScriptMgr: Loaded " + std::to_string( scriptsLoaded ) + "/" + std::to_string( scriptsFound ) + " scripts successfully" );
 
    watchDirectories();
 
@@ -77,11 +79,12 @@ bool Core::Scripting::ScriptMgr::init()
 
 void Core::Scripting::ScriptMgr::watchDirectories()
 {
-   auto shouldWatch = g_framework.getServerZone().getConfig()->getValue< bool >( "Settings.General.Scripts.HotSwap.Enabled", true );
+   auto pConfig = g_fw.get< XMLConfig >();
+   auto shouldWatch = pConfig->getValue< bool >( "Settings.General.Scripts.HotSwap.Enabled", true );
    if( !shouldWatch )
       return;
 
-   Watchdog::watchMany( g_framework.getServerZone().getConfig()->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ) + "*" + m_nativeScriptMgr->getModuleExtension(),
+   Watchdog::watchMany( pConfig->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ) + "*" + m_nativeScriptMgr->getModuleExtension(),
    [ this ]( const std::vector< ci::fs::path >& paths )
    {
       if( !m_firstScriptChangeNotificiation )
@@ -91,18 +94,19 @@ void Core::Scripting::ScriptMgr::watchDirectories()
          m_firstScriptChangeNotificiation = true;
          return;
       }
+      auto pLog = g_fw.get< Logger >();
 
       for( auto path : paths )
       {
          if( m_nativeScriptMgr->isModuleLoaded( path.stem().string() ) )
          {
-            g_framework.getLogger().debug( "Reloading changed script: " + path.stem().string() );
+            pLog->debug( "Reloading changed script: " + path.stem().string() );
 
             m_nativeScriptMgr->queueScriptReload( path.stem( ).string( ));
          }
          else
          {
-            g_framework.getLogger().debug( "Loading new script: " + path.stem().string() );
+            pLog->debug( "Loading new script: " + path.stem().string() );
 
             m_nativeScriptMgr->loadScript( path.string() );
          }
@@ -113,7 +117,8 @@ void Core::Scripting::ScriptMgr::watchDirectories()
 void Core::Scripting::ScriptMgr::loadDir( const std::string& dirname, std::set<std::string> &files, const std::string& ext )
 {
 
-   g_framework.getLogger().info( "ScriptEngine: loading scripts from " + dirname );
+   auto pLog = g_fw.get< Logger >();
+   pLog->info( "ScriptEngine: loading scripts from " + dirname );
 
    boost::filesystem::path targetDir( dirname );
 
@@ -145,13 +150,14 @@ void Core::Scripting::ScriptMgr::onPlayerFirstEnterWorld( Entity::Player& player
 bool Core::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId )
 {
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    uint16_t eventType = eventId >> 16;
    uint32_t scriptId = eventId;
 
    // aethernet/aetherytes need to be handled separately
    if( eventType == Event::EventHandler::EventHandlerType::Aetheryte )
    {
-      auto aetherInfo = g_framework.getExdDataGen().get< Core::Data::Aetheryte >( eventId & 0xFFFF );
+      auto aetherInfo = pExdData->get< Core::Data::Aetheryte >( eventId & 0xFFFF );
       scriptId = EVENTSCRIPT_AETHERYTE_ID;
       if( !aetherInfo->isAetheryte )
          scriptId = EVENTSCRIPT_AETHERNET_ID;
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index c4e88c79..adf350b6 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -31,6 +31,8 @@
 #include "Script/ScriptMgr.h"
 #include "Linkshell/LinkshellMgr.h"
 
+#include "Social/Manager/SocialMgr.h"
+
 #include "Forwards.h"
 #include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
@@ -39,26 +41,19 @@
 
 #include "Framework.h"
 
-Core::Framework g_framework;
-Core::Logger g_log;
+extern Core::Framework g_fw;
 
-Core::ServerZone::ServerZone( const std::string& configPath )
-   : m_configPath( configPath ),
-     m_bRunning( true ),
-     m_lastDBPingTime( 0 )
+Core::ServerZone::ServerZone( const std::string& configPath ) :
+   m_configPath( configPath ),
+   m_bRunning( true ),
+   m_lastDBPingTime( 0 )
 {
-   m_pConfig = XMLConfigPtr( new XMLConfig );
 }
 
 Core::ServerZone::~ServerZone()
 {
 }
 
-Core::XMLConfigPtr Core::ServerZone::getConfig() const
-{
-   return m_pConfig;
-}
-
 size_t Core::ServerZone::getSessionCount() const
 {
    return m_sessionMapById.size();
@@ -66,15 +61,20 @@ size_t Core::ServerZone::getSessionCount() const
 
 bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
 {
-   g_framework.getLogger().info( "Loading config " + m_configPath );
+   auto pLog = g_fw.get< Core::Logger >();
+   auto pConfig = g_fw.get< Core::XMLConfig >();
+   auto pExd = g_fw.get< Data::ExdDataGenerated >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
 
-   if( !m_pConfig->loadConfig( m_configPath ) )
+   pLog->info( "Loading config " + m_configPath );
+
+   if( !pConfig->loadConfig( m_configPath ) )
    {
-      g_framework.getLogger().fatal( "Error loading config " + m_configPath );
+      pLog->fatal( "Error loading config " + m_configPath );
       return false;
    }
 
-   std::vector<std::string> args( argv + 1, argv + argc );
+   std::vector< std::string > args( argv + 1, argv + argc );
    for( uint32_t i = 0; i + 1 < args.size(); i += 2 )
    {
       std::string arg( "" );
@@ -91,116 +91,113 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
          if( arg == "ip" )
          {
             // todo: ip addr in config
-            m_pConfig->setValue< std::string >( "Settings.General.ListenIP", val );
+            pConfig->setValue< std::string >( "Settings.General.ListenIP", val );
          }
          else if( arg == "p" || arg == "port" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.ListenPort", val );
+            pConfig->setValue< std::string >( "Settings.General.ListenPort", val );
          }
          else if( arg == "exdpath" || arg == "datapath" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.DataPath", val );
+            pConfig->setValue< std::string >( "Settings.General.DataPath", val );
          }
          else if( arg == "s" || arg == "scriptpath" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.ScriptPath", val );
+            pConfig->setValue< std::string >( "Settings.General.ScriptPath", val );
          }
          else if( arg == "h" || arg == "dbhost" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Host", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Host", val );
          }
          else if( arg == "dbport" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Port", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Port", val );
          }
          else if( arg == "u" || arg == "user" || arg == "dbuser" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Username", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Username", val );
          }
          else if( arg == "pass" || arg == "dbpass" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Pass", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Pass", val );
          }
          else if( arg == "d" || arg == "db" || arg == "database" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Database", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Database", val );
          }
       }
       catch( ... )
       {
-         g_framework.getLogger().error( "Error parsing argument: " + arg + " " + "value: " + val + "\n" );
-         g_framework.getLogger().error( "Usage: <arg> <val> \n" );
+         pLog->error( "Error parsing argument: " + arg + " " + "value: " + val + "\n" );
+         pLog->error( "Usage: <arg> <val> \n" );
       }
    }
 
-   g_framework.getLogger().info( "Setting up generated EXD data" );
-   if( !g_framework.getExdDataGen().init( m_pConfig->getValue< std::string >( "Settings.General.DataPath", "" ) ) )
+   pLog->info( "Setting up generated EXD data" );
+   if( !pExd->init( pConfig->getValue< std::string >( "Settings.General.DataPath", "" ) ) )
    {
-      g_framework.getLogger().fatal( "Error setting up generated EXD data " );
+      pLog->fatal( "Error setting up generated EXD data " );
       return false;
    }
 
    Core::Db::DbLoader loader;
 
    Core::Db::ConnectionInfo info;
-   info.password = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Pass", "" );
-   info.host = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Host", "127.0.0.1" );
-   info.database = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Database", "sapphire" );
-   info.port = m_pConfig->getValue< uint16_t >( "Settings.General.Mysql.Port", 3306 );
-   info.user = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Username", "root" );
-   info.syncThreads = m_pConfig->getValue< uint8_t >( "Settings.General.Mysql.SyncThreads", 2 );
-   info.asyncThreads = m_pConfig->getValue< uint8_t >( "Settings.General.Mysql.AsyncThreads", 2 );
+   info.password = pConfig->getValue< std::string >( "Settings.General.Mysql.Pass", "" );
+   info.host = pConfig->getValue< std::string >( "Settings.General.Mysql.Host", "127.0.0.1" );
+   info.database = pConfig->getValue< std::string >( "Settings.General.Mysql.Database", "sapphire" );
+   info.port = pConfig->getValue< uint16_t >( "Settings.General.Mysql.Port", 3306 );
+   info.user = pConfig->getValue< std::string >( "Settings.General.Mysql.Username", "root" );
+   info.syncThreads = pConfig->getValue< uint8_t >( "Settings.General.Mysql.SyncThreads", 2 );
+   info.asyncThreads = pConfig->getValue< uint8_t >( "Settings.General.Mysql.AsyncThreads", 2 );
 
-   loader.addDb( g_framework.getCharaDb(), info );
+   loader.addDb( *pDb, info );
    if( !loader.initDbs() )
       return false;
 
-   m_port = m_pConfig->getValue< uint16_t >( "Settings.General.ListenPort", 54992 );
-   m_ip = m_pConfig->getValue< std::string >( "Settings.General.ListenIp", "0.0.0.0" );
+   m_port = pConfig->getValue< uint16_t >( "Settings.General.ListenPort", 54992 );
+   m_ip = pConfig->getValue< std::string >( "Settings.General.ListenIp", "0.0.0.0" );
 
    return true;
 }
 
 void Core::ServerZone::run( int32_t argc, char* argv[] )
 {
-   // TODO: add more error checks for the entire initialisation
-   /*g_log.setLogPath( "log/SapphireZone_" );
-   g_log.init();*/
+   auto pLog = g_fw.get< Core::Logger>();
+   auto pScript = g_fw.get< Scripting::ScriptMgr >();
+   auto pLsMgr = g_fw.get< LinkshellMgr >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
 
    printBanner();
 
-   g_framework.getLogger().setLogPath( "log/SapphireZone_" );
-   g_framework.getLogger().init();
-
-   g_log = g_framework.getLogger();
-   
-
    if( !loadSettings( argc, argv ) )
    {
-      g_framework.getLogger().fatal( "Unable to load settings!" );
+      pLog->fatal( "Unable to load settings!" );
       return;
    }
 
-   g_framework.getLogger().info( "LinkshellMgr: Caching linkshells" );
-   if( !g_framework.getLinkshellMgr().loadLinkshells() )
+   pLog->info( "LinkshellMgr: Caching linkshells" );
+   if( !pLsMgr->loadLinkshells() )
    {
-      g_framework.getLogger().fatal( "Unable to load linkshells!" );
+      pLog->fatal( "Unable to load linkshells!" );
       return;
    }
 
+   //g_framework.getFriendsListMgr().findGroupById( 0 );
+
    Network::HivePtr hive( new Network::Hive() );
    Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive );
 
-   g_framework.getScriptMgr().init();
+   pScript->init();
 
-   g_framework.getLogger().info( "TerritoryMgr: Setting up zones" );
-   g_framework.getTerritoryMgr().init();
+   pLog->info( "TerritoryMgr: Setting up zones" );
+   pTeriMgr->init();
 
    std::vector< std::thread > thread_list;
    thread_list.emplace_back( std::thread( std::bind( &Network::Hive::Run, hive.get() ) ) );
 
-   g_framework.getLogger().info( "Server listening on port: " + std::to_string( m_port ) );
-   g_framework.getLogger().info( "Ready for connections..." );
+   pLog->info( "Server listening on port: " + std::to_string( m_port ) );
+   pLog->info( "Ready for connections..." );
 
    mainLoop();
 
@@ -213,25 +210,32 @@ void Core::ServerZone::run( int32_t argc, char* argv[] )
 
 void Core::ServerZone::printBanner() const
 {
-   g_framework.getLogger().info("===========================================================" );
-   g_framework.getLogger().info( "Sapphire Server Project " );
-   g_framework.getLogger().info( "Version: " + Version::VERSION );
-   g_framework.getLogger().info( "Git Hash: " + Version::GIT_HASH );
-   g_framework.getLogger().info( "Compiled: " __DATE__ " " __TIME__ );
-   g_framework.getLogger().info( "===========================================================" );
+   auto pLog = g_fw.get< Core::Logger>();
+
+   pLog->info("===========================================================" );
+   pLog->info( "Sapphire Server Project " );
+   pLog->info( "Version: " + Version::VERSION );
+   pLog->info( "Git Hash: " + Version::GIT_HASH );
+   pLog->info( "Compiled: " __DATE__ " " __TIME__ );
+   pLog->info( "===========================================================" );
 }
 
 void Core::ServerZone::mainLoop()
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+
    while( isRunning() )
    {
       this_thread::sleep_for( chrono::milliseconds( 50 ) );
 
       auto currTime = Util::getTimeSeconds();
 
-      g_framework.getTerritoryMgr().updateTerritoryInstances( currTime );
+      pTeriMgr->updateTerritoryInstances( currTime );
 
-      g_framework.getScriptMgr().update();
+      pScriptMgr->update();
 
       lock_guard< std::mutex > lock( this->m_sessionMutex );
       for( auto sessionIt : this->m_sessionMapById )
@@ -250,7 +254,7 @@ void Core::ServerZone::mainLoop()
 
       if( currTime - m_lastDBPingTime > 3 )
       {
-         g_framework.getCharaDb().keepAlive();
+         pDb->keepAlive();
          m_lastDBPingTime = currTime;
       }
 
@@ -268,7 +272,7 @@ void Core::ServerZone::mainLoop()
             it->second->close();
             // if( it->second.unique() )
             {
-               g_framework.getLogger().info("[" + std::to_string(it->second->getId() ) + "] Session removal" );
+               pLog->info("[" + std::to_string(it->second->getId() ) + "] Session removal" );
                it = this->m_sessionMapById.erase( it );
                removeSession( pPlayer->getName() );
                continue;
@@ -278,7 +282,7 @@ void Core::ServerZone::mainLoop()
          // remove sessions that simply timed out
          if( diff > 20 )
          {
-            g_framework.getLogger().info("[" + std::to_string( it->second->getId() ) + "] Session time out" );
+            pLog->info("[" + std::to_string( it->second->getId() ) + "] Session time out" );
 
             it->second->close();
             // if( it->second.unique() )
@@ -299,6 +303,8 @@ void Core::ServerZone::mainLoop()
 
 bool Core::ServerZone::createSession( uint32_t sessionId )
 {
+   auto pLog = g_fw.get< Core::Logger>();
+
    std::lock_guard< std::mutex > lock( m_sessionMutex );
 
    const std::string session_id_str = std::to_string( sessionId );
@@ -307,18 +313,18 @@ bool Core::ServerZone::createSession( uint32_t sessionId )
 
    if( it != m_sessionMapById.end() )
    {
-      g_framework.getLogger().error( "[" + session_id_str + "] Error creating session" );
+      pLog->error( "[" + session_id_str + "] Error creating session" );
       return false;
    }
 
-   g_framework.getLogger().info( "[" + session_id_str + "] Creating new session" );
+   pLog->info( "[" + session_id_str + "] Creating new session" );
 
    boost::shared_ptr<Session> newSession( new Session( sessionId ) );
    m_sessionMapById[sessionId] = newSession;
 
    if( !newSession->loadPlayer() )
    {
-      g_framework.getLogger().error( "[" + session_id_str + "] Error loading player " + session_id_str );
+      pLog->error( "[" + session_id_str + "] Error loading player " + session_id_str );
       return false;
    }
 
diff --git a/src/servers/sapphire_zone/ServerZone.h b/src/servers/sapphire_zone/ServerZone.h
index ef85c00e..4c728f9c 100644
--- a/src/servers/sapphire_zone/ServerZone.h
+++ b/src/servers/sapphire_zone/ServerZone.h
@@ -30,8 +30,6 @@ namespace Core {
       void updateSession( uint32_t id );
       void updateSession( std::string playerName );
 
-      XMLConfigPtr getConfig() const;
-
       size_t getSessionCount() const;
 
       void mainLoop();
@@ -51,8 +49,6 @@ namespace Core {
 
       std::string m_configPath;
 
-      XMLConfigPtr m_pConfig;
-
       std::mutex m_sessionMutex;
 
       std::map< uint32_t, SessionPtr > m_sessionMapById;
diff --git a/src/servers/sapphire_zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp
index 2a1c2e33..a676f158 100644
--- a/src/servers/sapphire_zone/Session.cpp
+++ b/src/servers/sapphire_zone/Session.cpp
@@ -12,7 +12,7 @@
 #include "Framework.h"
 
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Session::Session( uint32_t sessionId ) :
    m_sessionId( sessionId ),
@@ -112,6 +112,7 @@ void Core::Session::updateLastSqlTime()
 
 void Core::Session::startReplay( const std::string& path )
 {
+   auto pLog = g_fw.get< Logger >();
    if( !boost::filesystem::exists( path ) )
    {
       getPlayer()->sendDebug( "Couldn't find folder." );
@@ -148,7 +149,7 @@ void Core::Session::startReplay( const std::string& path )
       m_replayCache.push_back( std::tuple< uint64_t, std::string >(
          Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
 
-      g_framework.getLogger().info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) );
+      pLog->info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) );
    }
 
    getPlayer()->sendDebug( "Registered " + std::to_string( m_replayCache.size() ) + " sets for replay" );
diff --git a/src/servers/sapphire_zone/Social/ContentGroup.cpp b/src/servers/sapphire_zone/Social/ContentGroup.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/ContentGroup.h b/src/servers/sapphire_zone/Social/ContentGroup.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/FreeCompany.cpp b/src/servers/sapphire_zone/Social/FreeCompany.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/FreeCompany.h b/src/servers/sapphire_zone/Social/FreeCompany.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/FriendList.cpp b/src/servers/sapphire_zone/Social/FriendList.cpp
new file mode 100644
index 00000000..4ced6876
--- /dev/null
+++ b/src/servers/sapphire_zone/Social/FriendList.cpp
@@ -0,0 +1,35 @@
+#include <cassert>
+#include <boost/shared_ptr.hpp>
+#include <Logging/Logger.h>
+
+#include <sapphire_zone/Session.h>
+#include <Network/PacketDef/Ipcs.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <sapphire_zone/Actor/Actor.h>
+#include <sapphire_zone/Actor/Player.h>
+#include <sapphire_zone/ServerZone.h>
+#include <sapphire_zone/Zone/Zone.h>
+
+#include <Network/GamePacketNew.h>
+#include "Group.h"
+#include "FriendList.h"
+
+using namespace Core::Network::Packets;
+using namespace Core::Network::Packets::Server;
+
+std::vector< PlayerEntry > Core::Social::FriendList::getFriendListEntries( uint16_t entryAmount )
+{
+   std::vector< PlayerEntry > entryList = {};
+   uint16_t limit = 0;
+
+   for ( const auto& member : m_members )
+   {
+      if ( limit == entryAmount )
+         break;
+
+      entryList.push_back( generatePlayerEntry( member.second ) );
+      limit++;
+   }
+
+   return entryList;
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Social/FriendList.h b/src/servers/sapphire_zone/Social/FriendList.h
new file mode 100644
index 00000000..58e27d5a
--- /dev/null
+++ b/src/servers/sapphire_zone/Social/FriendList.h
@@ -0,0 +1,43 @@
+#ifndef _FRIENDLIST_H
+#define _FRIENDLIST_H
+
+#include <Common.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Forwards.h>
+#include <sapphire_zone/Forwards.h>
+#include <boost/enable_shared_from_this.hpp>
+#include <set>
+#include <cstdint>
+#include <map>
+#include "Group.h"
+
+
+namespace Core {
+namespace Social {
+
+class FriendList : public Group
+{
+
+public:
+   FriendList( uint64_t id, uint64_t ownerId ) :
+      Group( id, ownerId ),
+      m_id( id ), m_ownerId( ownerId ) {};
+
+   std::vector< Network::Packets::Server::PlayerEntry > getFriendListEntries( uint16_t entryAmount );
+
+protected:
+   uint64_t m_id{ 0 };
+   uint64_t m_ownerId{ 0 };
+   GroupType m_type{ GroupType::FriendList };
+   uint32_t m_maxCapacity{ 200 };
+
+   
+
+};
+
+
+using FriendListPtr = boost::shared_ptr< FriendList >;
+
+}
+};
+#endif // ! _FRIENDLIST_H
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Social/Group.cpp b/src/servers/sapphire_zone/Social/Group.cpp
new file mode 100644
index 00000000..06318636
--- /dev/null
+++ b/src/servers/sapphire_zone/Social/Group.cpp
@@ -0,0 +1,210 @@
+#include <cassert>
+#include <boost/shared_ptr.hpp>
+#include <Logging/Logger.h>
+
+#include <sapphire_zone/Session.h>
+#include <Network/PacketDef/Ipcs.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <sapphire_zone/Actor/Actor.h>
+#include <sapphire_zone/Actor/Player.h>
+#include <sapphire_zone/ServerZone.h>
+#include <sapphire_zone/Zone/Zone.h>
+#include <Network/GamePacketNew.h>
+
+#include "Group.h"
+#include "Framework.h"
+#include "Forwards.h"
+
+extern Core::Framework g_fw;
+
+using namespace Core::Social;
+using namespace Core::Network;
+
+// todo: invite map in g_serverZone.getGroupMgr(GroupType) and look up
+
+Core::Network::Packets::GamePacketPtr Group::addMember( Core::Entity::PlayerPtr pSender, Core::Entity::PlayerPtr pRecipient, uint64_t senderId, uint64_t recipientId )
+{
+   constexpr uint32_t logMessages[] = {
+      0, // 
+      1
+   };
+   assert( pSender != nullptr || senderId != 0 );
+
+   using namespace Core::Network::Packets;
+
+   uint64_t recipientContentId = 0;
+
+   if( pSender )
+   {
+      senderId = pSender->getId();
+   }
+
+   if( pRecipient )
+   {
+      recipientId = pRecipient->getId();
+      recipientContentId = pRecipient->getContentId();
+   }
+
+   auto packet = GamePacketNew< Server::FFXIVIpcSocialRequestResponse, ServerZoneIpcType >( recipientId, senderId );
+   packet.data().contentId = recipientContentId;
+   packet.data().category = Common::SocialCategory::Friends;
+
+   if( m_members.size() < m_maxCapacity )
+   {
+      // todo: broadcast join message
+
+      m_invites.erase( m_invites.find( recipientId ), m_invites.end() );
+      GroupMember member;
+      member.inviterId = senderId;
+      member.role = 0;
+      member.contentId = recipientId;
+      member.name = pSender->getName();
+      m_members.emplace( recipientId, member );
+   }
+   else
+   {
+   }
+
+   return packet;
+}
+
+Packets::GamePacketPtr Group::inviteMember( Core::Entity::PlayerPtr pSender, Core::Entity::PlayerPtr pRecipient, uint64_t senderId, uint64_t recipientId )
+{
+   assert( pSender != nullptr || senderId != 0 );
+
+
+   auto packet = Packets::GamePacketNew< Packets::Server::FFXIVIpcSocialRequestResponse, Packets::ServerZoneIpcType >( recipientId, senderId );
+   packet.data().contentId = recipientId;
+   packet.data().category = Common::SocialCategory::Friends;
+
+   if ( m_invites.size() < m_maxCapacity )
+   {
+      GroupMember member;
+      member.inviterId = senderId;
+      member.role = 0;
+      member.contentId = recipientId;
+      member.name = pSender->getName();
+
+      m_invites.emplace( recipientId, member );
+   }
+
+   return packet;
+}
+
+// todo: fix
+Core::Network::Packets::GamePacketPtr Group::removeMember( Core::Entity::PlayerPtr pSender, Core::Entity::PlayerPtr pRecipient, uint64_t senderId, uint64_t recipientId )
+{
+   assert( pSender != nullptr || senderId != 0 );
+
+   auto packet = Packets::GamePacketNew< Packets::Server::FFXIVIpcSocialRequestResponse, Packets::ServerZoneIpcType >( recipientId, senderId );
+   packet.data().contentId = recipientId;
+   packet.data().category = Common::SocialCategory::Friends;
+
+   return packet;
+}
+
+void Group::sendPacketToMembers( Core::Network::Packets::GamePacketPtr pPacket, bool invitesToo )
+{
+   assert( pPacket );
+   for( const auto& member : m_members )
+   {
+      auto pSession = g_fw.get< ServerZone >()->getSession( member.second.name );
+      if( pSession )
+      {
+         pSession->getPlayer()->queuePacket( pPacket );
+      }
+   }
+}
+
+Core::Network::Packets::Server::PlayerEntry Group::generatePlayerEntry( GroupMember groupMember )
+{
+   Core::Network::Packets::Server::PlayerEntry entry = {};
+
+   memcpy( entry.name, groupMember.name.c_str(), strlen( groupMember.name.c_str() ) );
+   entry.contentId = groupMember.contentId;
+
+   // We check if player is online. If so, we can pull more data - otherwise just name
+   // todo: set as offline in one of the unknown values, if session does not exist
+
+   auto pSession = g_fw.get< ServerZone >()->getSession( groupMember.name ); // todo: aa i don't like this. maybe just store their ID instead of contentID???
+
+   entry.timestamp = 1512799339;
+   entry.status = 2;
+   entry.unknown = 0;
+   //entry.entryIcon = 0xf;  
+   entry.unavailable = 0;    // unavailable (other world)
+   entry.one = 0;
+
+   if( pSession )
+   {
+      auto pPlayer = pSession->getPlayer();
+      entry.contentId = pPlayer->getContentId();
+      //entry.bytes[2] = pPlayer->getCurrentZone()->getId();
+      
+      entry.classJob = pPlayer->getClass();
+      
+      entry.level = pPlayer->getLevel();
+      entry.zoneId = pPlayer->getCurrentZone()->getGuId();
+      entry.grandCompany = pPlayer->getGc();
+      memcpy( &entry.fcTag[0], "Meme", 4 );
+      entry.clientLanguage = 2;
+      entry.knownLanguages = 0x0F;
+      entry.onlineStatusMask = pPlayer->getOnlineStatusMask();
+
+      g_fw.get< Logger >()->debug( std::to_string( pPlayer->getContentId() ) );
+   }
+
+   // TODO: no idea what this does - me neither
+   //listPacket.data().entries[0].one = 1;
+
+   g_fw.get< Logger >()->debug( std::to_string(groupMember.contentId) );
+
+   g_fw.get< Logger >()->debug( std::to_string( entry.contentId ) );
+   
+   return entry;
+}
+
+std::map< uint64_t, GroupMember > Group::getMembers() const
+{
+   return m_members;
+}
+
+uint32_t Group::getCapacity() const
+{
+   return m_maxCapacity;
+}
+
+bool Group::isParty() const
+{
+   return m_type == GroupType::Party;
+}
+
+bool Group::isFriendList() const
+{
+   return m_type == GroupType::FriendList;
+}
+
+bool Group::isFreeCompany() const
+{
+   return m_type == GroupType::FreeCompany;
+}
+
+bool Group::isLinkshell() const
+{
+   return m_type == GroupType::Linkshell;
+}
+
+bool Group::isFreeCompanyPetition() const
+{
+   return m_type == GroupType::FreeCompanyPetition;
+}
+
+bool Group::isBlacklist() const
+{
+   return m_type == GroupType::Blacklist;
+}
+
+bool Group::isContentGroup() const
+{
+   return m_type == GroupType::ContentGroup;
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Social/Group.h b/src/servers/sapphire_zone/Social/Group.h
new file mode 100644
index 00000000..a664fd17
--- /dev/null
+++ b/src/servers/sapphire_zone/Social/Group.h
@@ -0,0 +1,92 @@
+#ifndef _GROUP_H
+#define _GROUP_H
+
+#include <Common.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Forwards.h>
+#include <sapphire_zone/Forwards.h>
+#include <boost/enable_shared_from_this.hpp>
+#include <set>
+#include <cstdint>
+#include <map>
+#include <chrono>
+
+namespace Core {
+namespace Social {
+
+struct GroupMember
+{
+   uint64_t inviterId;
+   uint64_t contentId; // todo: maybe just use id..
+   std::string name;
+   uint32_t role;
+};
+
+enum class GroupType : uint8_t
+{
+   None,
+   Party,
+   FriendList,
+   FreeCompany,
+   Linkshell,
+   FreeCompanyPetition,
+   Blacklist,
+   ContentGroup
+};
+
+class Group
+{
+public:
+   Group( uint64_t id, uint64_t ownerId ) :
+      m_id( id ), m_ownerId( m_ownerId ) {};
+
+   bool isParty() const;
+   bool isFriendList() const;
+   bool isFreeCompany() const;
+   bool isLinkshell() const;
+   bool isFreeCompanyPetition() const;
+   bool isBlacklist() const;
+   bool isContentGroup() const;
+
+   virtual Core::Network::Packets::GamePacketPtr addMember( Entity::PlayerPtr pSender, Entity::PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   
+   virtual Core::Network::Packets::GamePacketPtr inviteMember( Entity::PlayerPtr pSender, Entity::PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   virtual Core::Network::Packets::GamePacketPtr removeMember( Entity::PlayerPtr pSender, Entity::PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   //virtual Core::Network::Packets::GamePacketPtr kickMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   virtual void sendPacketToMembers( Core::Network::Packets::GamePacketPtr pPacket, bool invitesToo = false );
+
+   /*! generates a player entry used for lists (social, etc) */
+   static Core::Network::Packets::Server::PlayerEntry generatePlayerEntry( GroupMember groupMember );
+
+   /*! access GroupMember vector */
+
+   std::map< uint64_t, GroupMember > getMembers() const;
+
+   /*! get container limit */
+   uint32_t getCapacity() const;
+
+protected:
+   GroupType m_type{ GroupType::None };
+   uint64_t m_id{ 0 };
+   uint64_t m_ownerId{ 0 };
+   uint32_t m_maxCapacity{ 250 };
+   uint32_t m_maxRoles{ 50 };
+   std::chrono::steady_clock::time_point m_createTime{ std::chrono::steady_clock::now() };
+   std::map< uint64_t, GroupMember > m_members;
+   std::map< uint64_t, GroupMember > m_invites; // <recipient, groupmember (which contains senderId)>
+
+private:
+   
+
+   /*virtual void load();
+   virtual void update();
+   virtual void disband();*/
+
+};
+
+}
+
+using GroupPtr = boost::shared_ptr< Social::Group >;
+
+};
+#endif // ! _GROUP_H
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Social/Linkshell.cpp b/src/servers/sapphire_zone/Social/Linkshell.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Linkshell.h b/src/servers/sapphire_zone/Social/Linkshell.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.cpp b/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.h b/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.cpp b/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.h b/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.cpp b/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.h b/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/PartyMgr.cpp b/src/servers/sapphire_zone/Social/Manager/PartyMgr.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/PartyMgr.h b/src/servers/sapphire_zone/Social/Manager/PartyMgr.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Manager/SocialMgr.cpp b/src/servers/sapphire_zone/Social/Manager/SocialMgr.cpp
new file mode 100644
index 00000000..83491513
--- /dev/null
+++ b/src/servers/sapphire_zone/Social/Manager/SocialMgr.cpp
@@ -0,0 +1,61 @@
+#include "SocialMgr.h"
+#include "Social/Group.h"
+
+#include <Common.h>
+#include <boost/make_shared.hpp>
+#include "Forwards.h"
+
+
+template< class T >
+Core::Social::SocialMgr< T >::SocialMgr()
+      : m_groupCount( 0 ),
+        m_lastGroupId( 0 ),
+        m_groups{}
+{
+}
+
+template< class T >
+Core::Social::SocialMgr< T >::~SocialMgr()
+{
+   
+}
+
+
+template< class T >
+T Core::Social::SocialMgr< T >::findGroupByInviteIdForPlayer( uint64_t playerId ) const
+{
+   auto it = m_invites.find( playerId );
+   if( it != m_invites.end() )
+   {
+      return findGroupById( it->second );
+   }
+   return nullptr;
+}
+template< class T >
+T Core::Social::SocialMgr< T >::findGroupById( uint64_t groupId ) const
+{
+   auto it = m_groups.find( groupId );
+   if( it != m_groups.end() )
+   {
+      return it->second;
+   }
+   return nullptr;
+}
+
+template< class T >
+uint64_t Core::Social::SocialMgr< T >::generateGroupId()
+{
+   m_lastGroupId++;
+   return m_lastGroupId;
+}
+
+template< class T >
+bool Core::Social::SocialMgr< T >::hasInvite( uint64_t playerId ) const
+{
+   auto it = m_invites.find( playerId );
+   if ( it != m_invites.end() )
+   {
+      return true;
+   }
+   return false;
+}
diff --git a/src/servers/sapphire_zone/Social/Manager/SocialMgr.h b/src/servers/sapphire_zone/Social/Manager/SocialMgr.h
new file mode 100644
index 00000000..a0a0e1df
--- /dev/null
+++ b/src/servers/sapphire_zone/Social/Manager/SocialMgr.h
@@ -0,0 +1,77 @@
+#ifndef _SOCIALMGR_H
+#define _SOCIALMGR_H
+
+#include <Common.h>
+
+#include <map>
+#include <cstdint>
+
+#include <boost/enable_shared_from_this.hpp>
+#include <sapphire_zone/Forwards.h>
+#include <Social/Group.h>
+
+#include "Forwards.h"
+
+namespace Core {
+namespace Social {
+
+template< class T >
+class SocialMgr
+{
+public:
+
+   SocialMgr();
+   ~SocialMgr();
+
+   T findGroupByInviteIdForPlayer( uint64_t playerId ) const;
+   T findGroupById( uint64_t groupId ) const;
+   /*
+
+   T findGroup( uint64_t groupId )
+   {
+      auto it = m_groups.find( groupId );
+      if ( it != m_groups.end() )
+      {
+         return it->second;
+      }
+      return nullptr;
+   }*/
+
+   bool hasInvite( uint64_t playerId ) const;
+
+protected:
+// those would be implemented in T, so you'd have T.m_type and T.m_maxEntries
+//   GroupType m_type{ GroupType::None };
+//   uint32_t m_maxEntries{ 0xFFFFFFFF };
+
+   uint64_t m_groupCount;   
+   std::map< uint64_t, uint64_t > m_invites;
+
+   uint64_t m_lastGroupId;
+
+   // < recipient, groupid >
+   //virtual GroupPtr createGroup( PlayerPtr pOwner ) = 0;
+
+   /*
+   friend virtual Core::Network::Packets::GamePacketPtr Core::Entity::Group::Group::addMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   friend virtual Core::Network::Packets::GamePacketPtr Core::Entity::Group::Group::inviteMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   friend virtual Core::Network::Packets::GamePacketPtr Core::Entity::Group::Group::removeMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   friend virtual Core::Network::Packets::GamePacketPtr Core::Entity::Group::Group::kickMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );
+   friend virtual void sendPacketToMembers( Core::Network::Packets::GamePacketPtr pPacket, bool invitesToo = false );
+
+   friend virtual void load();
+   friend virtual void update();
+   friend virtual void disband();
+   */
+
+   uint64_t generateGroupId();
+   std::map< uint64_t, T > m_groups;
+
+private:
+   
+
+};
+
+}
+};
+#endif /* ! _SOCIALMGR_H  */
diff --git a/src/servers/sapphire_zone/Social/Party.cpp b/src/servers/sapphire_zone/Social/Party.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/Social/Party.h b/src/servers/sapphire_zone/Social/Party.h
new file mode 100644
index 00000000..e69de29b
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
index 0e40cd0f..20b2c544 100644
--- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
+++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
@@ -17,7 +17,7 @@
 #include "StatusEffect.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -33,7 +33,8 @@ Core::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr so
    , m_tickRate( tickRate )
    , m_lastTick( 0 )
 {
-   auto entry = g_framework.getExdDataGen().get< Core::Data::Status >( id );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto entry = pExdData->get< Core::Data::Status >( id );
    m_name = entry->name;
       
    std::replace( m_name.begin(), m_name.end(), ' ', '_' );
@@ -66,8 +67,9 @@ std::pair< uint8_t, uint32_t> Core::StatusEffect::StatusEffect::getTickEffect()
 
 void Core::StatusEffect::StatusEffect::onTick()
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    m_lastTick = Util::getTimeMs();
-   g_framework.getScriptMgr().onStatusTick( m_targetActor, *this );
+   pScriptMgr->onStatusTick( m_targetActor, *this );
 }
 
 uint32_t Core::StatusEffect::StatusEffect::getSrcActorId() const
@@ -88,6 +90,7 @@ uint16_t Core::StatusEffect::StatusEffect::getParam() const
 void Core::StatusEffect::StatusEffect::applyStatus()
 {
    m_startTime = Util::getTimeMs();
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
 
    // this is only right when an action is being used by the player
    // else you probably need to use an actorcontrol
@@ -107,14 +110,13 @@ void Core::StatusEffect::StatusEffect::applyStatus()
    //effectPacket.data().effects[4].unknown_5 = 0x80;
    //m_sourceActor->sendToInRangeSet( effectPacket, true );
 
-   g_framework.getLogger().debug( "StatusEffect applied: " + m_name );
-   g_framework.getScriptMgr().onStatusReceive( m_targetActor, m_id );
+   pScriptMgr->onStatusReceive( m_targetActor, m_id );
 }
 
 void Core::StatusEffect::StatusEffect::removeStatus()
 {
-   g_framework.getLogger().debug( "StatusEffect removed: " + m_name );
-   g_framework.getScriptMgr().onStatusTimeOut( m_targetActor, m_id );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onStatusTimeOut( m_targetActor, m_id );
 }
 
 uint32_t Core::StatusEffect::StatusEffect::getId() const
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 3192f94a..aaac6a62 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -20,7 +20,7 @@
 #include "InstanceContent.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -36,14 +36,16 @@ Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceC
      m_instanceContentInfo( pInstanceContent ),
      m_instanceContentId( instanceContentId ),
      m_state( Created ),
-     m_pEntranceEObj( nullptr )
+     m_pEntranceEObj( nullptr ),
+     m_instanceCommenceTime( 0 )
 {
 
 }
 
 bool Core::InstanceContent::init()
 {
-   g_framework.getScriptMgr().onInstanceInit( getAsInstanceContent() );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onInstanceInit( getAsInstanceContent() );
 
    return true;
 }
@@ -66,7 +68,8 @@ Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInsta
 
 void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 {
-   g_framework.getLogger().debug( "InstanceContent::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|"
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "InstanceContent::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
                                                            + ", Entity#" + std::to_string( player.getId() ) );
 
@@ -82,7 +85,8 @@ void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 
 void Core::InstanceContent::onLeaveTerritory( Entity::Player& player )
 {
-   g_framework.getLogger().debug( "InstanceContent::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|"
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "InstanceContent::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
                                                            + ", Entity#" + std::to_string( player.getId() ) );
    sendDirectorClear( player );
@@ -107,10 +111,19 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
          {
             if( !playerIt.second->isLoadingComplete() ||
                 !playerIt.second->isDirectorInitialized() ||
-                !playerIt.second->isOnEnterEventDone() )
+                !playerIt.second->isOnEnterEventDone() ||
+                playerIt.second->hasStateFlag( PlayerStateFlag::WatchingCutscene ) )
                return;
          }
 
+         if( m_instanceCommenceTime == 0 )
+         {
+            m_instanceCommenceTime = Util::getTimeMs() + instanceStartDelay;
+            return;
+         }
+         else if( Util::getTimeMs() < m_instanceCommenceTime )
+            return;
+
          for( const auto& playerIt : m_playerMap )
          {
             auto pPlayer = playerIt.second;
@@ -119,6 +132,8 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
                                            getDirectorId(), 0x40000001, m_instanceContentInfo->timeLimitmin * 60u ) );
          }
 
+         if( m_pEntranceEObj )
+            m_pEntranceEObj->setState( 7 );
          m_state = DutyInProgress;
          m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceContentInfo->timeLimitmin * 60u );
          break;
@@ -137,8 +152,8 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
       case DutyFinished:
          break;
    }
-
-   g_framework.getScriptMgr().onInstanceUpdate( getAsInstanceContent(), currTime );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onInstanceUpdate( getAsInstanceContent(), currTime );
 
 }
 
@@ -262,28 +277,37 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
       m_eventObjectMap[object->getName()] = object;
    if( object->getObjectId() == 2000182 ) // start
       m_pEntranceEObj = object;
-
-   auto objData = g_framework.getExdDataGen().get< Core::Data::EObj >( object->getObjectId() );
+   
+   auto pLog = g_fw.get< Logger >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto objData = pExdData->get< Core::Data::EObj >( object->getObjectId() );
    if( objData )
       // todo: data should be renamed to eventId
       m_eventIdToObjectMap[objData->data] = object;
    else
-      g_framework.getLogger().error( "InstanceContent::onRegisterEObj Zone " +
+      pLog->error( "InstanceContent::onRegisterEObj Zone " +
                                      m_internalName + ": No EObj data found for EObj with ID: " +
                                      std::to_string( object->getObjectId() ) );
 }
 
 void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player )
 {
-   if( m_pEntranceEObj != nullptr )
+   // if a player has already spawned once inside this instance, don't move them if they happen to zone in again
+   auto it = m_spawnedPlayers.find( player.getId() );
+   if( it == m_spawnedPlayers.end() )
    {
-      player.setRot( PI );
-      player.setPos( m_pEntranceEObj->getPos() );
-   }
-   else
-   {
-      player.setRot( PI );
-      player.setPos( { 0.f, 0.f, 0.f } );
+      if( m_pEntranceEObj != nullptr )
+      {
+         player.setRot( PI );
+         player.setPos( m_pEntranceEObj->getPos() );
+      }
+      else
+      {
+         player.setRot( PI );
+         player.setPos( { 0.f, 0.f, 0.f } );
+      }
+
+      m_spawnedPlayers.insert( player.getId() );
    }
 
    player.resetObjSpawnIndex( );
@@ -315,5 +339,6 @@ void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t event
 
 void Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
 {
-   g_framework.getScriptMgr().onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
 }
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index d487f86f..0dad9d5c 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -52,6 +52,8 @@ public:
 
    Entity::EventObjectPtr getEObjByName( const std::string& name );
 
+   /*! number of milliseconds after all players are ready for the instance to commence (spawn circle removed) */
+   const uint32_t instanceStartDelay = 1250;
 private:
    Event::DirectorPtr m_pDirector;
    boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;
@@ -59,11 +61,13 @@ private:
    InstanceContentState m_state;
 
    int64_t m_instanceExpireTime;
+   int64_t m_instanceCommenceTime;
 
    Entity::EventObjectPtr m_pEntranceEObj;
 
    std::map< std::string, Entity::EventObjectPtr > m_eventObjectMap;
    std::unordered_map< uint32_t, Entity::EventObjectPtr > m_eventIdToObjectMap;
+   std::set< uint32_t > m_spawnedPlayers;
 };
 
 }
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 23b6071b..f9e87ce7 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -12,7 +12,7 @@
 #include "TerritoryMgr.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::TerritoryMgr::TerritoryMgr() :
    m_lastInstanceId( 10000 )
@@ -22,11 +22,12 @@ Core::TerritoryMgr::TerritoryMgr() :
 
 void Core::TerritoryMgr::loadTerritoryTypeDetailCache()
 {
-   auto idList = g_framework.getExdDataGen().getTerritoryTypeIdList();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto idList = pExdData->getTerritoryTypeIdList();
 
    for( auto id : idList )
    {
-      auto teri1 = g_framework.getExdDataGen().get< Core::Data::TerritoryType >( id );
+      auto teri1 = pExdData->get< Core::Data::TerritoryType >( id );
 
       if( !teri1->name.empty() )
          m_territoryTypeDetailCacheMap[id] = teri1;
@@ -97,6 +98,8 @@ bool Core::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const
 
 bool Core::TerritoryMgr::createDefaultTerritories()
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pLog = g_fw.get< Logger >();
    // for each entry in territoryTypeExd, check if it is a normal and if so, add the zone object
    for( const auto& territory : m_territoryTypeDetailCacheMap )
    {
@@ -107,18 +110,18 @@ bool Core::TerritoryMgr::createDefaultTerritories()
       if( territoryInfo->name.empty() )
          continue;
 
-      auto pPlaceName = g_framework.getExdDataGen().get< Core::Data::PlaceName >( territoryInfo->placeName );
+      auto pPlaceName = pExdData->get< Core::Data::PlaceName >( territoryInfo->placeName );
 
       if( !pPlaceName || pPlaceName->name.empty() || !isDefaultTerritory( territoryId ) )
          continue;
 
       uint32_t guid = getNextInstanceId();
-      g_framework.getLogger().info( std::to_string( territoryId ) +
-                                        "\t" + std::to_string( guid ) +
-                                        "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
-                                        "\t" + ( territoryInfo->name.length() <= 4 ? territoryInfo->name + "\t" : territoryInfo->name ) +
-                                        "\t" + ( isPrivateTerritory( territoryId ) ? "PRIVATE" : "PUBLIC" ) +
-                                        "\t" + pPlaceName->name );
+      pLog->info( std::to_string( territoryId ) +
+                                 "\t" + std::to_string( guid ) +
+                                 "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
+                                 "\t" + ( territoryInfo->name.length() <= 4 ? territoryInfo->name + "\t" : territoryInfo->name ) +
+                                 "\t" + ( isPrivateTerritory( territoryId ) ? "PRIVATE" : "PUBLIC" ) +
+                                 "\t" + pPlaceName->name );
 
       auto pZone = make_Zone( territoryId, guid, territoryInfo->name, pPlaceName->name );
       pZone->init();
@@ -142,13 +145,15 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp
    if( isInstanceContentTerritory( territoryTypeId ) )
       return nullptr;
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pLog = g_fw.get< Logger >();
    auto pTeri = getTerritoryDetail( territoryTypeId );
-   auto pPlaceName = g_framework.getExdDataGen().get< Core::Data::PlaceName >( pTeri->placeName );
+   auto pPlaceName = pExdData->get< Core::Data::PlaceName >( pTeri->placeName );
 
    if( !pTeri || !pPlaceName )
       return nullptr;
 
-   g_framework.getLogger().debug( "Starting instance for territory: " + std::to_string( territoryTypeId ) + " (" + pPlaceName->name + ")" );
+   pLog->debug( "Starting instance for territory: " + std::to_string( territoryTypeId ) + " (" + pPlaceName->name + ")" );
 
    auto pZone = make_Zone( territoryTypeId, getNextInstanceId(), pTeri->name, pPlaceName->name );
    pZone->init();
@@ -161,7 +166,8 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp
 
 Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t instanceContentId )
 {
-   auto pInstanceContent = g_framework.getExdDataGen().get< Core::Data::InstanceContent >( instanceContentId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pInstanceContent = pExdData->get< Core::Data::InstanceContent >( instanceContentId );
    if( !pInstanceContent )
       return nullptr;
 
@@ -173,8 +179,9 @@ Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t instanceConten
    if( !pTeri || pInstanceContent->name.empty() )
       return nullptr;
 
-   g_framework.getLogger().debug( "Starting instance for InstanceContent id: " + std::to_string( instanceContentId ) +
-                                                           " (" + pInstanceContent->name + ")" );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "Starting instance for InstanceContent id: " + std::to_string( instanceContentId ) +
+                " (" + pInstanceContent->name + ")" );
 
    auto pZone = make_InstanceContent( pInstanceContent, getNextInstanceId(),
                                       pTeri->name, pInstanceContent->name, instanceContentId );
@@ -221,7 +228,8 @@ Core::ZonePtr Core::TerritoryMgr::getInstanceZonePtr( uint32_t instanceId ) cons
 
 void Core::TerritoryMgr::loadTerritoryPositionMap()
 {
-   auto pQR = g_framework.getCharaDb().query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pQR = pDb->query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" );
 
    while( pQR->next() )
    {
@@ -308,9 +316,10 @@ bool Core::TerritoryMgr::movePlayer( uint32_t territoryId, Core::Entity::PlayerP
 
 bool Core::TerritoryMgr::movePlayer( ZonePtr pZone, Core::Entity::PlayerPtr pPlayer )
 {
+   auto pLog = g_fw.get< Logger >();
    if( !pZone  )
    {
-      g_framework.getLogger().error( "Zone not found on this server." );
+      pLog->error( "Zone not found on this server." );
       return false;
    }
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index b858811e..85c8db59 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -39,7 +39,7 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 
 /**
@@ -60,6 +60,7 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
    m_currentWeather( Weather::FairSkies ),
    m_nextEObjId( 0x400D0000 )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    m_guId = guId;
 
    m_territoryId = territoryId;
@@ -68,7 +69,7 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
    m_lastMobUpdate = 0;
 
    m_weatherOverride = Weather::None;
-   m_territoryTypeInfo = g_framework.getExdDataGen().get< Core::Data::TerritoryType >( territoryId );
+   m_territoryTypeInfo = pExdData->get< Core::Data::TerritoryType >( territoryId );
 
    loadWeatherRates();
 
@@ -78,17 +79,15 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
 void Core::Zone::loadWeatherRates()
 {
    if( !m_territoryTypeInfo )
-   {
-      g_framework.getLogger().error( std::string( __FUNCTION__ ) + " TerritoryTypeInfo not loaded!" );
       return;
-   }
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
 
-   uint8_t weatherRateId = m_territoryTypeInfo->weatherRate > g_framework.getExdDataGen().getWeatherRateIdList().size() ?
+   uint8_t weatherRateId = m_territoryTypeInfo->weatherRate > pExdData->getWeatherRateIdList().size() ?
                            uint8_t{ 0 } : m_territoryTypeInfo->weatherRate;
 
    uint8_t sumPc = 0;
-   auto weatherRateFields = g_framework.getExdDataGen().m_WeatherRateDat.get_row( weatherRateId );
+   auto weatherRateFields = pExdData->m_WeatherRateDat.get_row( weatherRateId );
    for( size_t i = 0; i < 16; )
    {
       int32_t weatherId = boost::get< int32_t >( weatherRateFields[i] );
@@ -108,8 +107,9 @@ Core::Zone::~Zone()
 
 bool Core::Zone::init()
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
 
-   if( g_framework.getScriptMgr().onZoneInit( shared_from_this() ) )
+   if( pScriptMgr->onZoneInit( shared_from_this() ) )
    {
       // all good
    }
@@ -214,7 +214,8 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
    {
       auto pPlayer = pActor->getAsPlayer();
 
-      auto pSession = g_framework.getServerZone().getSession( pPlayer->getId() );
+      auto pServerZone = g_fw.get< ServerZone >();
+      auto pSession = pServerZone->getSession( pPlayer->getId() );
       if( pSession )
          m_sessionSet.insert( pSession );
       m_playerMap[pPlayer->getId()] = pPlayer;
@@ -257,9 +258,11 @@ void Core::Zone::removeActor( Entity::ActorPtr pActor )
 
 void Core::Zone::queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range, GamePacketPtr pPacketEntry )
 {
-   if( g_framework.getTerritoryMgr().isPrivateTerritory( getTerritoryId() ) )
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   if( pTeriMgr->isPrivateTerritory( getTerritoryId() ) )
       return;
 
+   auto pServerZone = g_fw.get< ServerZone >();
    for( auto entry : m_playerMap )
    {
       auto player = entry.second;
@@ -273,7 +276,7 @@ void Core::Zone::queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t
       if( ( distance < range ) && sourcePlayer.getId() != player->getId() )
       {
 
-         auto pSession = g_framework.getServerZone().getSession( player->getId() );
+         auto pSession = pServerZone->getSession( player->getId() );
          pPacketEntry->setValAt< uint32_t >( 0x08, player->getId() );
          if( pSession )
             pSession->getZoneConnection()->queueOutPacket( pPacketEntry );
@@ -313,9 +316,6 @@ bool Core::Zone::checkWeather()
       if( m_weatherOverride != m_currentWeather )
       {
          m_currentWeather = m_weatherOverride;
-         g_framework.getLogger().debug( "[Zone:" + m_internalName + "] overriding weather to : " +
-                                        std::to_string(  static_cast< uint8_t >( m_weatherOverride ) ) );
-
          return true;
       }
    }
@@ -325,9 +325,6 @@ bool Core::Zone::checkWeather()
       if( nextWeather != m_currentWeather )
       {
          m_currentWeather = nextWeather;
-
-         g_framework.getLogger().debug( "[Zone:" + m_internalName + "] changing weather to : " +
-                                        std::to_string( static_cast< uint8_t >( nextWeather ) ) );
          return true;
       }
    }
@@ -588,8 +585,9 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
    if( pCell == nullptr )
       return;
 
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    // TODO: make sure gms can overwrite this. Potentially temporary solution
-   if( g_framework.getTerritoryMgr().isPrivateTerritory( getTerritoryId() ) )
+   if( pTeriMgr->isPrivateTerritory( getTerritoryId() ) )
       return;
 
    auto iter = pCell->m_actors.begin();
@@ -637,13 +635,15 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
 
 void Core::Zone::onPlayerZoneIn( Entity::Player &player )
 {
-   g_framework.getLogger().debug( "Zone::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "Zone::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
                                                 + ", Entity#" + std::to_string( player.getId() ) );
 }
 
 void Core::Zone::onLeaveTerritory( Entity::Player& player )
 {
-   g_framework.getLogger().debug( "Zone::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "Zone::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
                                                 + ", Entity#" + std::to_string( player.getId() ) );
 }
 
@@ -671,7 +671,7 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object )
 {
    if( !object )
       return;
-
+   auto pLog = g_fw.get< Logger >();
    object->setId( getNextEObjId() );
    pushActor( object );
 
@@ -679,7 +679,7 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object )
 
    onRegisterEObj( object );
 
-   g_framework.getLogger().debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
+   pLog->debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
 }
 
 Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId )
diff --git a/src/servers/sapphire_zone/mainGameServer.cpp b/src/servers/sapphire_zone/mainGameServer.cpp
index 131cc3cf..8000b3f6 100644
--- a/src/servers/sapphire_zone/mainGameServer.cpp
+++ b/src/servers/sapphire_zone/mainGameServer.cpp
@@ -2,13 +2,62 @@
 
 #include "ServerZone.h"
 #include <boost/algorithm/string.hpp>
+#include <Framework.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
+#include <Exd/ExdDataGenerated.h>
+#include "Script/ScriptMgr.h"
+#include <Database/CharaDbConnection.h>
+#include <Database/DbWorkerPool.h>
+#include "Linkshell/LinkshellMgr.h"
+#include "Zone/TerritoryMgr.h"
+#include "DebugCommand/DebugCommandHandler.h"
+#include "Social/Manager/SocialMgr.h"
+#include "Social/FriendList.h"
 
-#include "Framework.h"
+Core::Framework g_fw;
 
-extern Core::Framework g_framework;
+using namespace Core;
+
+bool setupFramework()
+{
+   auto pServer = boost::make_shared< ServerZone >( "config/settings_zone.xml" );
+   auto pLogger = boost::make_shared< Logger >();
+   auto pConfig = boost::make_shared< XMLConfig >();
+   auto pExdData = boost::make_shared< Data::ExdDataGenerated >();
+   auto pScript = boost::make_shared< Scripting::ScriptMgr >();
+   auto pDb = boost::make_shared< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pLsMgr = boost::make_shared< LinkshellMgr >();
+   auto pTeriMgr = boost::make_shared< TerritoryMgr >();
+   auto pDebugCom = boost::make_shared< DebugCommandHandler >();
+
+   auto pFriendsListMgr = boost::make_shared< Social::SocialMgr< Social::FriendList > >();
+
+   pLogger->setLogPath( "log/SapphireZone_" );
+   pLogger->init();
+
+   g_fw.set< ServerZone >( pServer );
+   g_fw.set< Logger >( pLogger );
+   g_fw.set< XMLConfig >( pConfig );
+   g_fw.set< Data::ExdDataGenerated >( pExdData );
+   g_fw.set< Scripting::ScriptMgr >( pScript );
+   g_fw.set< Db::DbWorkerPool< Db::CharaDbConnection > >( pDb );
+   g_fw.set< LinkshellMgr >( pLsMgr );
+   g_fw.set< TerritoryMgr >( pTeriMgr );
+   g_fw.set< DebugCommandHandler >( pDebugCom );
+
+   g_fw.set< Social::SocialMgr< Social::FriendList > >( pFriendsListMgr );
+
+   // actuall catch errors here...
+   return true;
+}
 
 int main( int32_t argc, char* argv[] )
 {
-   g_framework.getServerZone().run( argc, argv );
+
+   if( !setupFramework() )
+      return 0; // too fucking bad...
+
+   g_fw.get< ServerZone >()->run( argc, argv );
    return 0;
-}
\ No newline at end of file
+}