From 33d83fa1e4bbfc17dbff99361cf5d29e92b1f866 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 00:34:07 +1000
Subject: [PATCH 01/10] move the actionlut data to its own isolated cpp file

---
 ...ionLut.cpp.tmpl => ActionLutData.cpp.tmpl} |    0
 src/world/Action/ActionLut.cpp                | 1125 +----------------
 src/world/Action/ActionLut.h                  |    2 +
 src/world/Action/ActionLutData.cpp            | 1120 ++++++++++++++++
 4 files changed, 1133 insertions(+), 1114 deletions(-)
 rename src/tools/action_parse/{ActionLut.cpp.tmpl => ActionLutData.cpp.tmpl} (100%)
 create mode 100644 src/world/Action/ActionLutData.cpp

diff --git a/src/tools/action_parse/ActionLut.cpp.tmpl b/src/tools/action_parse/ActionLutData.cpp.tmpl
similarity index 100%
rename from src/tools/action_parse/ActionLut.cpp.tmpl
rename to src/tools/action_parse/ActionLutData.cpp.tmpl
diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp
index 1e9c1f97..9c33bb96 100644
--- a/src/world/Action/ActionLut.cpp
+++ b/src/world/Action/ActionLut.cpp
@@ -2,1119 +2,16 @@
 
 using namespace Sapphire::World::Action;
 
-ActionLut::Lut ActionLut::m_actionLut =
+bool ActionLut::validEntryExists( uint16_t actionId )
 {
-  // attack
-  { 7, { 0, 0, 0, 0, 0 } },
-  // Shot
-  { 8, { 0, 0, 0, 0, 0 } },
-  // Fast Blade
-  { 9, { 160, 0, 0, 0, 0 } },
-  // Savage Blade
-  { 11, { 100, 0, 0, 0, 0 } },
-  // Flash
-  { 14, { 0, 0, 0, 0, 0 } },
-  // Riot Blade
-  { 15, { 100, 0, 0, 0, 0 } },
-  // Shield Bash
-  { 16, { 110, 0, 0, 0, 0 } },
-  // Sentinel
-  { 17, { 0, 0, 0, 0, 0 } },
-  // Tempered Will
-  { 19, { 0, 0, 0, 0, 0 } },
-  // Fight or Flight
-  { 20, { 0, 0, 0, 0, 0 } },
-  // Rage of Halone
-  { 21, { 100, 0, 0, 0, 0 } },
-  // Bulwark
-  { 22, { 0, 0, 0, 0, 0 } },
-  // Circle of Scorn
-  { 23, { 100, 0, 0, 0, 0 } },
-  // Shield Lob
-  { 24, { 120, 0, 0, 0, 0 } },
-  // Shield Swipe
-  { 25, { 100, 0, 0, 0, 0 } },
-  // Sword Oath
-  { 26, { 75, 0, 0, 0, 0 } },
-  // Cover
-  { 27, { 0, 0, 0, 0, 0 } },
-  // Shield Oath
-  { 28, { 0, 0, 0, 0, 0 } },
-  // Spirits Within
-  { 29, { 300, 0, 0, 0, 0 } },
-  // Hallowed Ground
-  { 30, { 0, 0, 0, 0, 0 } },
-  // Heavy Swing
-  { 31, { 160, 0, 0, 0, 0 } },
-  // Skull Sunder
-  { 35, { 100, 0, 0, 0, 0 } },
-  // Maim
-  { 37, { 100, 0, 0, 0, 0 } },
-  // Berserk
-  { 38, { 0, 0, 0, 0, 0 } },
-  // Thrill of Battle
-  { 40, { 0, 0, 0, 0, 0 } },
-  // Overpower
-  { 41, { 130, 0, 0, 0, 0 } },
-  // Storm's Path
-  { 42, { 100, 0, 0, 0, 0 } },
-  // Holmgang
-  { 43, { 0, 0, 0, 0, 0 } },
-  // Vengeance
-  { 44, { 55, 0, 0, 0, 0 } },
-  // Storm's Eye
-  { 45, { 100, 0, 0, 0, 0 } },
-  // Tomahawk
-  { 46, { 140, 0, 0, 0, 0 } },
-  // Butcher's Block
-  { 47, { 100, 0, 0, 0, 0 } },
-  // Defiance
-  { 48, { 0, 0, 0, 0, 0 } },
-  // Inner Beast
-  { 49, { 350, 0, 0, 0, 0 } },
-  // Unchained
-  { 50, { 0, 0, 0, 0, 0 } },
-  // Steel Cyclone
-  { 51, { 200, 0, 0, 0, 0 } },
-  // Infuriate
-  { 52, { 0, 0, 0, 0, 0 } },
-  // Bootshine
-  { 53, { 140, 0, 0, 0, 0 } },
-  // True Strike
-  { 54, { 160, 0, 0, 180, 0 } },
-  // Snap Punch
-  { 56, { 150, 170, 0, 0, 0 } },
-  // Internal Release
-  { 59, { 0, 0, 0, 0, 0 } },
-  // Fists of Earth
-  { 60, { 0, 0, 0, 0, 0 } },
-  // Twin Snakes
-  { 61, { 110, 130, 0, 0, 0 } },
-  // Arm of the Destroyer
-  { 62, { 50, 0, 0, 0, 0 } },
-  // Fists of Fire
-  { 63, { 0, 0, 0, 0, 0 } },
-  // Steel Peak
-  { 64, { 150, 0, 0, 0, 0 } },
-  // Mantra
-  { 65, { 0, 0, 0, 0, 0 } },
-  // Demolish
-  { 66, { 50, 0, 0, 70, 0 } },
-  // Howling Fist
-  { 67, { 210, 0, 0, 0, 0 } },
-  // Perfect Balance
-  { 69, { 0, 0, 0, 0, 0 } },
-  // Rockbreaker
-  { 70, { 130, 0, 0, 0, 0 } },
-  // Shoulder Tackle
-  { 71, { 100, 0, 0, 0, 0 } },
-  // One Ilm Punch
-  { 72, { 120, 0, 0, 0, 0 } },
-  // Fists of Wind
-  { 73, { 0, 0, 0, 0, 0 } },
-  // Dragon Kick
-  { 74, { 120, 140, 0, 0, 0 } },
-  // True Thrust
-  { 75, { 160, 0, 0, 0, 0 } },
-  // Vorpal Thrust
-  { 78, { 100, 0, 0, 0, 0 } },
-  // Heavy Thrust
-  { 79, { 150, 190, 0, 0, 0 } },
-  // Impulse Drive
-  { 81, { 200, 0, 0, 0, 0 } },
-  // Life Surge
-  { 83, { 0, 0, 0, 0, 0 } },
-  // Full Thrust
-  { 84, { 100, 0, 0, 0, 0 } },
-  // Blood for Blood
-  { 85, { 0, 0, 0, 0, 0 } },
-  // Doom Spike
-  { 86, { 140, 0, 0, 0, 0 } },
-  // Disembowel
-  { 87, { 100, 0, 0, 0, 0 } },
-  // Chaos Thrust
-  { 88, { 100, 0, 0, 140, 0 } },
-  // Piercing Talon
-  { 90, { 120, 0, 0, 0, 0 } },
-  // Jump
-  { 92, { 260, 0, 0, 0, 0 } },
-  // Elusive Jump
-  { 94, { 0, 0, 0, 0, 0 } },
-  // Spineshatter Dive
-  { 95, { 210, 0, 0, 0, 0 } },
-  // Dragonfire Dive
-  { 96, { 320, 0, 0, 0, 0 } },
-  // Heavy Shot
-  { 97, { 150, 0, 0, 0, 0 } },
-  // Straight Shot
-  { 98, { 140, 0, 0, 0, 0 } },
-  // Venomous Bite
-  { 100, { 100, 0, 0, 0, 0 } },
-  // Raging Strikes
-  { 101, { 0, 0, 0, 0, 0 } },
-  // Misery's End
-  { 103, { 190, 0, 0, 0, 0 } },
-  // Quick Nock
-  { 106, { 110, 0, 0, 0, 0 } },
-  // Barrage
-  { 107, { 0, 0, 0, 0, 0 } },
-  // Bloodletter
-  { 110, { 130, 0, 0, 0, 0 } },
-  // Repelling Shot
-  { 112, { 0, 0, 0, 0, 0 } },
-  // Windbite
-  { 113, { 60, 0, 0, 0, 0 } },
-  // Mage's Ballad
-  { 114, { 100, 0, 0, 0, 0 } },
-  // Foe Requiem
-  { 115, { 0, 0, 0, 0, 0 } },
-  // Army's Paeon
-  { 116, { 100, 0, 0, 0, 0 } },
-  // Rain of Death
-  { 117, { 100, 0, 0, 0, 0 } },
-  // Battle Voice
-  { 118, { 0, 0, 0, 0, 0 } },
-  // Stone
-  { 119, { 140, 0, 0, 0, 0 } },
-  // Cure
-  { 120, { 0, 0, 0, 0, 450 } },
-  // Aero
-  { 121, { 50, 0, 0, 0, 0 } },
-  // Medica
-  { 124, { 0, 0, 0, 0, 300 } },
-  // Raise
-  { 125, { 0, 0, 0, 0, 0 } },
-  // Stone II
-  { 127, { 200, 0, 0, 0, 0 } },
-  // Repose
-  { 128, { 0, 0, 0, 0, 0 } },
-  // Cure III
-  { 131, { 0, 0, 0, 0, 550 } },
-  // Aero II
-  { 132, { 50, 0, 0, 0, 0 } },
-  // Medica II
-  { 133, { 0, 0, 0, 0, 200 } },
-  // Fluid Aura
-  { 134, { 0, 0, 0, 0, 0 } },
-  // Cure II
-  { 135, { 0, 0, 0, 0, 700 } },
-  // Presence of Mind
-  { 136, { 0, 0, 0, 0, 0 } },
-  // Regen
-  { 137, { 0, 0, 0, 0, 150 } },
-  // Holy
-  { 139, { 200, 0, 0, 0, 0 } },
-  // Benediction
-  { 140, { 0, 0, 0, 0, 0 } },
-  // Fire
-  { 141, { 180, 0, 0, 0, 0 } },
-  // Blizzard
-  { 142, { 180, 0, 0, 0, 0 } },
-  // Thunder
-  { 144, { 30, 0, 0, 0, 0 } },
-  // Sleep
-  { 145, { 0, 0, 0, 0, 0 } },
-  // Blizzard II
-  { 146, { 50, 0, 0, 0, 0 } },
-  // Fire II
-  { 147, { 80, 0, 0, 0, 0 } },
-  // Transpose
-  { 149, { 0, 0, 0, 0, 0 } },
-  // Fire III
-  { 152, { 240, 0, 0, 0, 0 } },
-  // Thunder III
-  { 153, { 70, 0, 0, 0, 0 } },
-  // Blizzard III
-  { 154, { 240, 0, 0, 0, 0 } },
-  // Aetherial Manipulation
-  { 155, { 0, 0, 0, 0, 0 } },
-  // Scathe
-  { 156, { 100, 0, 0, 0, 0 } },
-  // Manaward
-  { 157, { 0, 0, 0, 0, 0 } },
-  // Convert
-  { 158, { 0, 0, 0, 0, 0 } },
-  // Freeze
-  { 159, { 100, 0, 0, 0, 0 } },
-  // Flare
-  { 162, { 260, 0, 0, 0, 0 } },
-  // Ruin
-  { 163, { 100, 0, 0, 0, 0 } },
-  // Bio
-  { 164, { 0, 0, 0, 0, 0 } },
-  // Summon
-  { 165, { 0, 0, 0, 0, 0 } },
-  // Aetherflow
-  { 166, { 0, 0, 0, 0, 0 } },
-  // Energy Drain
-  { 167, { 150, 0, 0, 0, 0 } },
-  // Miasma
-  { 168, { 20, 0, 0, 0, 0 } },
-  // Summon II
-  { 170, { 0, 0, 0, 0, 0 } },
-  // Sustain
-  { 171, { 0, 0, 0, 0, 0 } },
-  // Ruin II
-  { 172, { 100, 0, 0, 0, 0 } },
-  // Resurrection
-  { 173, { 0, 0, 0, 0, 0 } },
-  // Bane
-  { 174, { 0, 0, 0, 0, 0 } },
-  // Rouse
-  { 176, { 0, 0, 0, 0, 0 } },
-  // Miasma II
-  { 177, { 100, 0, 0, 0, 0 } },
-  // Bio II
-  { 178, { 0, 0, 0, 0, 0 } },
-  // Shadow Flare
-  { 179, { 50, 0, 0, 0, 0 } },
-  // Summon III
-  { 180, { 0, 0, 0, 0, 0 } },
-  // Fester
-  { 181, { 150, 0, 0, 0, 0 } },
-  // Tri-bind
-  { 182, { 30, 0, 0, 0, 0 } },
-  // Enkindle
-  { 184, { 0, 0, 0, 0, 0 } },
-  // Adloquium
-  { 185, { 0, 0, 0, 0, 300 } },
-  // Succor
-  { 186, { 0, 0, 0, 0, 150 } },
-  // Sacred Soil
-  { 188, { 0, 0, 0, 0, 0 } },
-  // Lustrate
-  { 189, { 0, 0, 0, 0, 600 } },
-  // Physick
-  { 190, { 0, 0, 0, 0, 400 } },
-  // Shield Wall
-  { 197, { 0, 0, 0, 0, 0 } },
-  // Stronghold
-  { 198, { 0, 0, 0, 0, 0 } },
-  // Last Bastion
-  { 199, { 0, 0, 0, 0, 0 } },
-  // Braver
-  { 200, { 2400, 0, 0, 0, 0 } },
-  // Bladedance
-  { 201, { 5250, 0, 0, 0, 0 } },
-  // Final Heaven
-  { 202, { 9000, 0, 0, 0, 0 } },
-  // Skyshard
-  { 203, { 1650, 0, 0, 0, 0 } },
-  // Starstorm
-  { 204, { 3600, 0, 0, 0, 0 } },
-  // Meteor
-  { 205, { 6150, 0, 0, 0, 0 } },
-  // Healing Wind
-  { 206, { 0, 0, 0, 0, 0 } },
-  // Breath of the Earth
-  { 207, { 0, 0, 0, 0, 0 } },
-  // Pulse of Life
-  { 208, { 0, 0, 0, 0, 0 } },
-  // Magitek Cannon
-  { 1128, { 0, 0, 0, 0, 0 } },
-  // Photon Stream
-  { 1129, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 1533, { 0, 0, 0, 0, 0 } },
-  // Spinning Edge
-  { 2240, { 150, 0, 0, 0, 0 } },
-  // Shade Shift
-  { 2241, { 0, 0, 0, 0, 0 } },
-  // Gust Slash
-  { 2242, { 100, 0, 0, 0, 0 } },
-  // Hide
-  { 2245, { 0, 0, 0, 0, 0 } },
-  // Assassinate
-  { 2246, { 200, 0, 0, 0, 0 } },
-  // Throwing Dagger
-  { 2247, { 120, 0, 0, 0, 0 } },
-  // Mug
-  { 2248, { 140, 0, 0, 0, 0 } },
-  // Hide
-  { 2253, { 0, 0, 0, 0, 0 } },
-  // Death Blossom
-  { 2254, { 110, 0, 0, 0, 0 } },
-  // Aeolian Edge
-  { 2255, { 100, 0, 0, 160, 0 } },
-  // Jugulate
-  { 2256, { 80, 0, 0, 0, 0 } },
-  // Shadow Fang
-  { 2257, { 100, 0, 0, 0, 0 } },
-  // Trick Attack
-  { 2258, { 240, 0, 0, 400, 0 } },
-  // Ten
-  { 2259, { 0, 0, 0, 0, 0 } },
-  // Ninjutsu
-  { 2260, { 0, 0, 0, 0, 0 } },
-  // Chi
-  { 2261, { 0, 0, 0, 0, 0 } },
-  // Shukuchi
-  { 2262, { 0, 0, 0, 0, 0 } },
-  // Jin
-  { 2263, { 0, 0, 0, 0, 0 } },
-  // Kassatsu
-  { 2264, { 0, 0, 0, 0, 0 } },
-  // Fuma Shuriken
-  { 2265, { 240, 0, 0, 0, 0 } },
-  // Katon
-  { 2266, { 250, 0, 0, 0, 0 } },
-  // Raiton
-  { 2267, { 360, 0, 0, 0, 0 } },
-  // Hyoton
-  { 2268, { 140, 0, 0, 0, 0 } },
-  // Huton
-  { 2269, { 0, 0, 0, 0, 0 } },
-  // Doton
-  { 2270, { 45, 0, 0, 0, 0 } },
-  // Suiton
-  { 2271, { 180, 0, 0, 0, 0 } },
-  // Rabbit Medium
-  { 2272, { 0, 0, 0, 0, 0 } },
-  // Rook Autoturret
-  { 2864, { 80, 0, 0, 0, 0 } },
-  // Bishop Autoturret
-  { 2865, { 60, 0, 0, 0, 0 } },
-  // Split Shot
-  { 2866, { 160, 0, 0, 0, 0 } },
-  // Reload
-  { 2867, { 0, 0, 0, 0, 0 } },
-  // Slug Shot
-  { 2868, { 100, 0, 0, 0, 0 } },
-  // Spread Shot
-  { 2870, { 80, 0, 0, 0, 0 } },
-  // Hot Shot
-  { 2872, { 120, 0, 0, 0, 0 } },
-  // Clean Shot
-  { 2873, { 100, 0, 0, 0, 0 } },
-  // Gauss Round
-  { 2874, { 210, 0, 0, 0, 0 } },
-  // Heartbreak
-  { 2875, { 240, 0, 0, 0, 0 } },
-  // Reassemble
-  { 2876, { 0, 0, 0, 0, 0 } },
-  // Wildfire
-  { 2878, { 0, 0, 0, 0, 0 } },
-  // Quick Reload
-  { 2879, { 0, 0, 0, 0, 0 } },
-  // Gauss Barrel
-  { 2880, { 0, 0, 0, 0, 0 } },
-  // Rapid Fire
-  { 2881, { 0, 0, 0, 0, 0 } },
-  // Hypercharge
-  { 2885, { 0, 0, 0, 0, 0 } },
-  // Dismantle
-  { 2887, { 0, 0, 0, 0, 0 } },
-  // Blank
-  { 2888, { 0, 0, 0, 0, 0 } },
-  // Ricochet
-  { 2890, { 320, 0, 0, 0, 0 } },
-  // Raiton
-  { 3203, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 3204, { 0, 0, 0, 0, 0 } },
-  // Kanashibari
-  { 3207, { 0, 0, 0, 0, 0 } },
-  // Turret Retrieval
-  { 3487, { 0, 0, 0, 0, 0 } },
-  // Goring Blade
-  { 3538, { 100, 0, 0, 0, 0 } },
-  // Royal Authority
-  { 3539, { 100, 0, 0, 0, 0 } },
-  // Divine Veil
-  { 3540, { 0, 0, 0, 0, 0 } },
-  // Clemency
-  { 3541, { 0, 0, 0, 0, 1200 } },
-  // Sheltron
-  { 3542, { 0, 0, 0, 0, 0 } },
-  // Tornado Kick
-  { 3543, { 330, 0, 0, 0, 0 } },
-  // Purification
-  { 3544, { 0, 0, 0, 0, 0 } },
-  // Elixir Field
-  { 3545, { 220, 0, 0, 0, 0 } },
-  // Meditation
-  { 3546, { 0, 0, 0, 0, 0 } },
-  // the Forbidden Chakra
-  { 3547, { 250, 0, 0, 0, 0 } },
-  // Deliverance
-  { 3548, { 0, 0, 0, 0, 0 } },
-  // Fell Cleave
-  { 3549, { 520, 0, 0, 0, 0 } },
-  // Decimate
-  { 3550, { 280, 0, 0, 0, 0 } },
-  // Raw Intuition
-  { 3551, { 0, 0, 0, 0, 0 } },
-  // Equilibrium
-  { 3552, { 0, 0, 0, 0, 1200 } },
-  // Blood of the Dragon
-  { 3553, { 0, 0, 0, 0, 0 } },
-  // Fang and Claw
-  { 3554, { 260, 300, 0, 0, 0 } },
-  // Geirskogul
-  { 3555, { 230, 0, 0, 0, 0 } },
-  // Wheeling Thrust
-  { 3556, { 260, 0, 0, 300, 0 } },
-  // Battle Litany
-  { 3557, { 0, 0, 0, 0, 0 } },
-  // Empyreal Arrow
-  { 3558, { 230, 0, 0, 0, 0 } },
-  // the Wanderer's Minuet
-  { 3559, { 100, 0, 0, 0, 0 } },
-  // Iron Jaws
-  { 3560, { 100, 0, 0, 0, 0 } },
-  // the Warden's Paean
-  { 3561, { 0, 0, 0, 0, 0 } },
-  // Sidewinder
-  { 3562, { 100, 0, 0, 0, 0 } },
-  // Armor Crush
-  { 3563, { 100, 160, 0, 0, 0 } },
-  // Shadewalker
-  { 3564, { 0, 0, 0, 0, 0 } },
-  // Smoke Screen
-  { 3565, { 0, 0, 0, 0, 0 } },
-  // Dream Within a Dream
-  { 3566, { 150, 0, 0, 0, 0 } },
-  // Duality
-  { 3567, { 0, 0, 0, 0, 0 } },
-  // Stone III
-  { 3568, { 210, 0, 0, 0, 0 } },
-  // Asylum
-  { 3569, { 0, 0, 0, 0, 100 } },
-  // Tetragrammaton
-  { 3570, { 0, 0, 0, 0, 700 } },
-  // Assize
-  { 3571, { 400, 0, 0, 0, 400 } },
-  // Aero III
-  { 3572, { 50, 0, 0, 0, 0 } },
-  // Ley Lines
-  { 3573, { 0, 0, 0, 0, 0 } },
-  // Sharpcast
-  { 3574, { 0, 0, 0, 0, 0 } },
-  // Enochian
-  { 3575, { 0, 0, 0, 0, 0 } },
-  // Blizzard IV
-  { 3576, { 260, 0, 0, 0, 0 } },
-  // Fire IV
-  { 3577, { 300, 0, 0, 0, 0 } },
-  // Painflare
-  { 3578, { 180, 0, 0, 0, 0 } },
-  // Ruin III
-  { 3579, { 120, 0, 0, 0, 0 } },
-  // Tri-disaster
-  { 3580, { 0, 0, 0, 0, 0 } },
-  // Dreadwyrm Trance
-  { 3581, { 0, 0, 0, 0, 0 } },
-  // Deathflare
-  { 3582, { 400, 0, 0, 0, 0 } },
-  // Indomitability
-  { 3583, { 0, 0, 0, 0, 500 } },
-  // Broil
-  { 3584, { 190, 0, 0, 0, 0 } },
-  // Deployment Tactics
-  { 3585, { 0, 0, 0, 0, 0 } },
-  // Emergency Tactics
-  { 3586, { 0, 0, 0, 0, 0 } },
-  // Dissipation
-  { 3587, { 0, 0, 0, 0, 0 } },
-  // Draw
-  { 3590, { 0, 0, 0, 0, 0 } },
-  // Royal Road
-  { 3591, { 0, 0, 0, 0, 0 } },
-  // Spread
-  { 3592, { 0, 0, 0, 0, 0 } },
-  // Redraw
-  { 3593, { 0, 0, 0, 0, 0 } },
-  // Benefic
-  { 3594, { 0, 0, 0, 0, 400 } },
-  // Aspected Benefic
-  { 3595, { 0, 0, 0, 0, 200 } },
-  // Malefic
-  { 3596, { 150, 0, 0, 0, 0 } },
-  // Malefic II
-  { 3598, { 180, 0, 0, 0, 0 } },
-  // Combust
-  { 3599, { 0, 0, 0, 0, 0 } },
-  // Helios
-  { 3600, { 0, 0, 0, 0, 300 } },
-  // Aspected Helios
-  { 3601, { 0, 0, 0, 0, 200 } },
-  // Ascend
-  { 3603, { 0, 0, 0, 0, 0 } },
-  // Diurnal Sect
-  { 3604, { 0, 0, 0, 0, 0 } },
-  // Nocturnal Sect
-  { 3605, { 0, 0, 0, 0, 0 } },
-  // Lightspeed
-  { 3606, { 0, 0, 0, 0, 0 } },
-  // Combust II
-  { 3608, { 0, 0, 0, 0, 0 } },
-  // Benefic II
-  { 3610, { 0, 0, 0, 0, 650 } },
-  // Time Dilation
-  { 3611, { 0, 0, 0, 0, 0 } },
-  // Synastry
-  { 3612, { 0, 0, 0, 0, 0 } },
-  // Collective Unconscious
-  { 3613, { 0, 0, 0, 0, 150 } },
-  // Essential Dignity
-  { 3614, { 0, 0, 0, 0, 400 } },
-  // Gravity
-  { 3615, { 200, 0, 0, 0, 0 } },
-  // Celestial Opposition
-  { 3616, { 0, 0, 0, 0, 0 } },
-  // Hard Slash
-  { 3617, { 150, 0, 0, 0, 0 } },
-  // Spinning Slash
-  { 3619, { 100, 0, 0, 0, 0 } },
-  // Unleash
-  { 3621, { 50, 0, 0, 0, 0 } },
-  // Syphon Strike
-  { 3623, { 100, 0, 0, 0, 0 } },
-  // Unmend
-  { 3624, { 150, 0, 0, 0, 0 } },
-  // Blood Weapon
-  { 3625, { 0, 0, 0, 0, 0 } },
-  // Power Slash
-  { 3627, { 100, 0, 0, 0, 0 } },
-  // Darkside
-  { 3628, { 0, 0, 0, 0, 0 } },
-  // Grit
-  { 3629, { 0, 0, 0, 0, 0 } },
-  // Blood Price
-  { 3631, { 0, 0, 0, 0, 0 } },
-  // Souleater
-  { 3632, { 100, 0, 0, 0, 0 } },
-  // Dark Passenger
-  { 3633, { 140, 0, 0, 0, 0 } },
-  // Dark Mind
-  { 3634, { 0, 0, 0, 0, 0 } },
-  // Dark Arts
-  { 3635, { 0, 0, 0, 0, 0 } },
-  // Shadow Wall
-  { 3636, { 0, 0, 0, 0, 0 } },
-  // Living Dead
-  { 3638, { 0, 0, 0, 0, 0 } },
-  // Salted Earth
-  { 3639, { 75, 0, 0, 0, 0 } },
-  // Plunge
-  { 3640, { 200, 0, 0, 0, 0 } },
-  // Abyssal Drain
-  { 3641, { 120, 0, 0, 0, 0 } },
-  // Sole Survivor
-  { 3642, { 0, 0, 0, 0, 0 } },
-  // Carve and Spit
-  { 3643, { 100, 0, 0, 0, 0 } },
-  // Big Shot
-  { 4238, { 0, 0, 0, 0, 0 } },
-  // Desperado
-  { 4239, { 0, 0, 0, 0, 0 } },
-  // Land Waker
-  { 4240, { 0, 0, 0, 0, 0 } },
-  // Dark Force
-  { 4241, { 0, 0, 0, 0, 0 } },
-  // Dragonsong Dive
-  { 4242, { 0, 0, 0, 0, 0 } },
-  // Chimatsuri
-  { 4243, { 0, 0, 0, 0, 0 } },
-  // Sagittarius Arrow
-  { 4244, { 0, 0, 0, 0, 0 } },
-  // Satellite Beam
-  { 4245, { 0, 0, 0, 0, 0 } },
-  // Teraflare
-  { 4246, { 0, 0, 0, 0, 0 } },
-  // Angel Feathers
-  { 4247, { 0, 0, 0, 0, 0 } },
-  // Astral Stasis
-  { 4248, { 0, 0, 0, 0, 0 } },
-  // Form Shift
-  { 4262, { 0, 0, 0, 0, 0 } },
-  // Cannonfire
-  { 4271, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4401, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4402, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4403, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4404, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4405, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4406, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4407, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4408, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4409, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4410, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4411, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4412, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4413, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4414, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4415, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4416, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4417, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4418, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4419, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4420, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4421, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4422, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4423, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4424, { 0, 0, 0, 0, 0 } },
-  // Empty Road
-  { 4645, { 0, 0, 0, 0, 0 } },
-  // Undraw Spread
-  { 4646, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 4977, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 5069, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 5199, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 5846, { 0, 0, 0, 0, 0 } },
-  // Stickyloom
-  { 5874, { 0, 0, 0, 0, 0 } },
-  // Void Fire II
-  { 6274, { 0, 0, 0, 0, 0 } },
-  // Total Eclipse
-  { 7381, { 110, 0, 0, 0, 0 } },
-  // Intervention
-  { 7382, { 0, 0, 0, 0, 0 } },
-  // Requiescat
-  { 7383, { 350, 0, 0, 0, 0 } },
-  // Holy Spirit
-  { 7384, { 380, 0, 0, 0, 0 } },
-  // Passage of Arms
-  { 7385, { 0, 0, 0, 0, 0 } },
-  // Onslaught
-  { 7386, { 100, 0, 0, 0, 0 } },
-  // Upheaval
-  { 7387, { 300, 0, 0, 0, 0 } },
-  // Shake It Off
-  { 7388, { 0, 0, 0, 0, 0 } },
-  // Inner Release
-  { 7389, { 0, 0, 0, 0, 0 } },
-  // Delirium
-  { 7390, { 0, 0, 0, 0, 0 } },
-  // Quietus
-  { 7391, { 160, 0, 0, 0, 0 } },
-  // Bloodspiller
-  { 7392, { 400, 0, 0, 0, 0 } },
-  // The Blackest Night
-  { 7393, { 0, 0, 0, 0, 0 } },
-  // Riddle of Earth
-  { 7394, { 0, 0, 0, 0, 0 } },
-  // Riddle of Fire
-  { 7395, { 0, 0, 0, 0, 0 } },
-  // Brotherhood
-  { 7396, { 0, 0, 0, 0, 0 } },
-  // Sonic Thrust
-  { 7397, { 100, 0, 0, 0, 0 } },
-  // Dragon Sight
-  { 7398, { 0, 0, 0, 0, 0 } },
-  // Mirage Dive
-  { 7399, { 210, 0, 0, 0, 0 } },
-  // Nastrond
-  { 7400, { 330, 0, 0, 0, 0 } },
-  // Hellfrog Medium
-  { 7401, { 400, 0, 0, 0, 0 } },
-  // Bhavacakra
-  { 7402, { 600, 0, 0, 0, 0 } },
-  // Ten Chi Jin
-  { 7403, { 0, 0, 0, 0, 0 } },
-  // Pitch Perfect
-  { 7404, { 100, 0, 0, 0, 0 } },
-  // Troubadour
-  { 7405, { 0, 0, 0, 0, 0 } },
-  // Caustic Bite
-  { 7406, { 120, 0, 0, 0, 0 } },
-  // Stormbite
-  { 7407, { 120, 0, 0, 0, 0 } },
-  // Nature's Minne
-  { 7408, { 0, 0, 0, 0, 0 } },
-  // Refulgent Arrow
-  { 7409, { 300, 0, 0, 0, 0 } },
-  // Cooldown
-  { 7410, { 150, 0, 0, 0, 0 } },
-  // Heated Split Shot
-  { 7411, { 190, 0, 0, 0, 0 } },
-  // Heated Slug Shot
-  { 7412, { 100, 0, 0, 0, 0 } },
-  // Heated Clean Shot
-  { 7413, { 100, 0, 0, 0, 0 } },
-  // Barrel Stabilizer
-  { 7414, { 0, 0, 0, 0, 0 } },
-  // Rook Overdrive
-  { 7415, { 0, 0, 0, 0, 0 } },
-  // Flamethrower
-  { 7418, { 0, 0, 0, 0, 0 } },
-  // Between the Lines
-  { 7419, { 0, 0, 0, 0, 0 } },
-  // Thunder IV
-  { 7420, { 50, 0, 0, 0, 0 } },
-  // Triplecast
-  { 7421, { 0, 0, 0, 0, 0 } },
-  // Foul
-  { 7422, { 650, 0, 0, 0, 0 } },
-  // Aetherpact
-  { 7423, { 0, 0, 0, 0, 0 } },
-  // Bio III
-  { 7424, { 0, 0, 0, 0, 0 } },
-  // Miasma III
-  { 7425, { 50, 0, 0, 0, 0 } },
-  // Ruin IV
-  { 7426, { 200, 0, 0, 0, 0 } },
-  // Summon Bahamut
-  { 7427, { 0, 0, 0, 0, 0 } },
-  // Enkindle Bahamut
-  { 7429, { 0, 0, 0, 0, 0 } },
-  // Thin Air
-  { 7430, { 0, 0, 0, 0, 0 } },
-  // Stone IV
-  { 7431, { 250, 0, 0, 0, 0 } },
-  // Divine Benison
-  { 7432, { 0, 0, 0, 0, 0 } },
-  // Plenary Indulgence
-  { 7433, { 0, 0, 0, 0, 0 } },
-  // Excogitation
-  { 7434, { 0, 0, 0, 0, 800 } },
-  // Broil II
-  { 7435, { 230, 0, 0, 0, 0 } },
-  // Chain Stratagem
-  { 7436, { 0, 0, 0, 0, 0 } },
-  // Aetherpact
-  { 7437, { 0, 0, 0, 0, 0 } },
-  // Earthly Star
-  { 7439, { 150, 0, 0, 0, 540 } },
-  // Malefic III
-  { 7442, { 220, 0, 0, 0, 0 } },
-  // Minor Arcana
-  { 7443, { 0, 0, 0, 0, 0 } },
-  // Lord of Crowns
-  { 7444, { 300, 0, 0, 0, 0 } },
-  // Lady of Crowns
-  { 7445, { 0, 0, 0, 0, 500 } },
-  // Thunder II
-  { 7447, { 30, 0, 0, 0, 0 } },
-  // Sleeve Draw
-  { 7448, { 0, 0, 0, 0, 0 } },
-  // Hakaze
-  { 7477, { 150, 0, 0, 0, 0 } },
-  // Jinpu
-  { 7478, { 100, 0, 0, 0, 0 } },
-  // Shifu
-  { 7479, { 100, 0, 0, 0, 0 } },
-  // Yukikaze
-  { 7480, { 100, 0, 0, 0, 0 } },
-  // Gekko
-  { 7481, { 100, 0, 0, 0, 0 } },
-  // Kasha
-  { 7482, { 100, 0, 0, 0, 0 } },
-  // Fuga
-  { 7483, { 100, 0, 0, 0, 0 } },
-  // Mangetsu
-  { 7484, { 100, 0, 0, 0, 0 } },
-  // Oka
-  { 7485, { 100, 0, 0, 0, 0 } },
-  // Enpi
-  { 7486, { 100, 0, 0, 0, 0 } },
-  // Midare Setsugekka
-  { 7487, { 720, 0, 0, 0, 0 } },
-  // Tenka Goken
-  { 7488, { 360, 0, 0, 0, 0 } },
-  // Higanbana
-  { 7489, { 240, 0, 0, 0, 0 } },
-  // Hissatsu: Shinten
-  { 7490, { 300, 0, 0, 0, 0 } },
-  // Hissatsu: Kyuten
-  { 7491, { 150, 0, 0, 0, 0 } },
-  // Hissatsu: Gyoten
-  { 7492, { 100, 0, 0, 0, 0 } },
-  // Hissatsu: Yaten
-  { 7493, { 100, 0, 0, 0, 0 } },
-  // Hissatsu: Kaiten
-  { 7494, { 0, 0, 0, 0, 0 } },
-  // Hagakure
-  { 7495, { 0, 0, 0, 0, 0 } },
-  // Hissatsu: Guren
-  { 7496, { 800, 0, 0, 0, 0 } },
-  // Meditate
-  { 7497, { 0, 0, 0, 0, 0 } },
-  // Third Eye
-  { 7498, { 0, 0, 0, 0, 0 } },
-  // Meikyo Shisui
-  { 7499, { 0, 0, 0, 0, 0 } },
-  // Ageha
-  { 7500, { 250, 0, 0, 0, 0 } },
-  // Hissatsu: Seigan
-  { 7501, { 200, 0, 0, 0, 0 } },
-  // Merciful Eyes
-  { 7502, { 0, 0, 0, 0, 200 } },
-  // Jolt
-  { 7503, { 180, 0, 0, 0, 0 } },
-  // Riposte
-  { 7504, { 130, 0, 0, 0, 0 } },
-  // Verthunder
-  { 7505, { 310, 0, 0, 0, 0 } },
-  // Corps-a-corps
-  { 7506, { 130, 0, 0, 0, 0 } },
-  // Veraero
-  { 7507, { 310, 0, 0, 0, 0 } },
-  // Tether
-  { 7508, { 0, 0, 0, 0, 0 } },
-  // Scatter
-  { 7509, { 100, 0, 0, 0, 0 } },
-  // Verfire
-  { 7510, { 270, 0, 0, 0, 0 } },
-  // Verstone
-  { 7511, { 270, 0, 0, 0, 0 } },
-  // Zwerchhau
-  { 7512, { 100, 0, 0, 0, 0 } },
-  // Moulinet
-  { 7513, { 60, 0, 0, 0, 0 } },
-  // Vercure
-  { 7514, { 0, 0, 0, 0, 350 } },
-  // Displacement
-  { 7515, { 130, 0, 0, 0, 0 } },
-  // Redoublement
-  { 7516, { 100, 0, 0, 0, 0 } },
-  // Fleche
-  { 7517, { 420, 0, 0, 0, 0 } },
-  // Acceleration
-  { 7518, { 0, 0, 0, 0, 0 } },
-  // Contre Sixte
-  { 7519, { 350, 0, 0, 0, 0 } },
-  // Embolden
-  { 7520, { 0, 0, 0, 0, 0 } },
-  // Manafication
-  { 7521, { 0, 0, 0, 0, 0 } },
-  // Impact
-  { 7522, { 270, 0, 0, 0, 0 } },
-  // Verraise
-  { 7523, { 0, 0, 0, 0, 0 } },
-  // Jolt II
-  { 7524, { 240, 0, 0, 0, 0 } },
-  // Verflare
-  { 7525, { 600, 0, 0, 0, 0 } },
-  // Verholy
-  { 7526, { 600, 0, 0, 0, 0 } },
-  // Enchanted Riposte
-  { 7527, { 210, 0, 0, 0, 0 } },
-  // Enchanted Zwerchhau
-  { 7528, { 100, 0, 0, 0, 0 } },
-  // Enchanted Redoublement
-  { 7529, { 100, 0, 0, 0, 0 } },
-  // Enchanted Moulinet
-  { 7530, { 200, 0, 0, 0, 0 } },
-  // Magitek Cannon
-  { 7619, { 0, 0, 0, 0, 0 } },
-  // Photon Stream
-  { 7620, { 0, 0, 0, 0, 0 } },
-  // Diffractive Magitek Cannon
-  { 7621, { 0, 0, 0, 0, 0 } },
-  // High-powered Magitek Cannon
-  { 7622, { 0, 0, 0, 0, 0 } },
-  // Doom of the Living
-  { 7861, { 0, 0, 0, 0, 0 } },
-  // Vermillion Scourge
-  { 7862, { 0, 0, 0, 0, 0 } },
-  // Earth Tackle
-  { 7864, { 100, 0, 0, 0, 0 } },
-  // Wind Tackle
-  { 7865, { 65, 0, 0, 0, 0 } },
-  // Fire Tackle
-  { 7866, { 130, 0, 0, 0, 0 } },
-  // Iaijutsu
-  { 7867, { 0, 0, 0, 0, 0 } },
-  // Riddle of Wind
-  { 7868, { 65, 0, 0, 0, 0 } },
-  // Dissolve Union
-  { 7869, { 0, 0, 0, 0, 0 } },
-  // Stellar Detonation
-  { 8324, { 150, 0, 0, 0, 540 } },
-  // Broken Ridge
-  { 8395, { 0, 0, 0, 0, 0 } },
-  // Magitek Pulse
-  { 8624, { 0, 0, 0, 0, 0 } },
-  // Magitek Thunder
-  { 8625, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 8687, { 0, 0, 0, 0, 0 } },
-  // Katon
-  { 9012, { 0, 0, 0, 0, 0 } },
-  // Remove Barrel
-  { 9015, { 0, 0, 0, 0, 0 } },
-  // Tenka Goken
-  { 9143, { 0, 0, 0, 0, 0 } },
-  // Thunderous Force
-  { 9294, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 9301, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 9302, { 0, 0, 0, 0, 0 } },
-  // Bishop Overdrive
-  { 9372, { 0, 0, 0, 0, 0 } },
-  // Undraw
-  { 9629, { 0, 0, 0, 0, 0 } },
-  // Self-detonate
-  { 9775, { 0, 0, 0, 0, 0 } },
-  // Shatterstone
-  { 9823, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 9996, { 0, 0, 0, 0, 0 } },
-  // Ungarmax
-  { 10001, { 0, 0, 0, 0, 0 } },
-  // Starstorm
-  { 10894, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 10946, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 10947, { 0, 0, 0, 0, 0 } },
-  // Ruin III
-  { 11191, { 200, 0, 0, 0, 0 } },
-  // Physick
-  { 11192, { 0, 0, 0, 0, 400 } },
-  // Starstorm
-  { 11193, { 3600, 0, 0, 0, 0 } },
-  // Snort
-  { 11383, { 0, 0, 0, 0, 0 } },
-  // 4-tonze Weight
-  { 11384, { 110, 0, 0, 0, 0 } },
-  // Water Cannon
-  { 11385, { 120, 0, 0, 0, 0 } },
-  // Song of Torment
-  { 11386, { 50, 0, 0, 0, 0 } },
-  // High Voltage
-  { 11387, { 90, 0, 0, 0, 0 } },
-  // Bad Breath
-  { 11388, { 0, 0, 0, 0, 0 } },
-  // Flying Frenzy
-  { 11389, { 80, 0, 0, 0, 0 } },
-  // Aqua Breath
-  { 11390, { 90, 0, 0, 0, 0 } },
-  // Plaincracker
-  { 11391, { 130, 0, 0, 0, 0 } },
-  // Acorn Bomb
-  { 11392, { 0, 0, 0, 0, 0 } },
-  // Bristle
-  { 11393, { 0, 0, 0, 0, 0 } },
-  // Mind Blast
-  { 11394, { 100, 0, 0, 0, 0 } },
-  // Blood Drain
-  { 11395, { 20, 0, 0, 0, 0 } },
-  // Bomb Toss
-  { 11396, { 110, 0, 0, 0, 0 } },
-  // 1000 Needles
-  { 11397, { 0, 0, 0, 0, 0 } },
-  // Drill Cannons
-  { 11398, { 120, 0, 0, 0, 0 } },
-  // the Look
-  { 11399, { 130, 0, 0, 0, 0 } },
-  // Sharpened Knife
-  { 11400, { 120, 0, 0, 0, 0 } },
-  // Loom
-  { 11401, { 0, 0, 0, 0, 0 } },
-  // Flame Thrower
-  { 11402, { 130, 0, 0, 0, 0 } },
-  // Faze
-  { 11403, { 0, 0, 0, 0, 0 } },
-  // Glower
-  { 11404, { 130, 0, 0, 0, 0 } },
-  // Missile
-  { 11405, { 0, 0, 0, 0, 0 } },
-  // White Wind
-  { 11406, { 0, 0, 0, 0, 0 } },
-  // Final Sting
-  { 11407, { 1500, 0, 0, 0, 0 } },
-  // Self-destruct
-  { 11408, { 900, 0, 0, 0, 0 } },
-  // Transfusion
-  { 11409, { 0, 0, 0, 0, 0 } },
-  // Toad Oil
-  { 11410, { 0, 0, 0, 0, 0 } },
-  // Off-guard
-  { 11411, { 0, 0, 0, 0, 0 } },
-  // Sticky Tongue
-  { 11412, { 0, 0, 0, 0, 0 } },
-  // Tail Screw
-  { 11413, { 0, 0, 0, 0, 0 } },
-  // Level 5 Petrify
-  { 11414, { 0, 0, 0, 0, 0 } },
-  // Moon Flute
-  { 11415, { 0, 0, 0, 0, 0 } },
-  // Doom
-  { 11416, { 0, 0, 0, 0, 0 } },
-  // Mighty Guard
-  { 11417, { 0, 0, 0, 0, 0 } },
-  // Ice Spikes
-  { 11418, { 0, 0, 0, 0, 0 } },
-  // the Ram's Voice
-  { 11419, { 130, 0, 0, 0, 0 } },
-  // the Dragon's Voice
-  { 11420, { 110, 0, 0, 0, 0 } },
-  // Peculiar Light
-  { 11421, { 0, 0, 0, 0, 0 } },
-  // Ink Jet
-  { 11422, { 120, 0, 0, 0, 0 } },
-  // Flying Sardine
-  { 11423, { 10, 0, 0, 0, 0 } },
-  // Diamondback
-  { 11424, { 0, 0, 0, 0, 0 } },
-  // Fire Angon
-  { 11425, { 100, 0, 0, 0, 0 } },
-  // Feather Rain
-  { 11426, { 180, 0, 0, 0, 0 } },
-  // Eruption
-  { 11427, { 220, 0, 0, 0, 0 } },
-  // Mountain Buster
-  { 11428, { 310, 0, 0, 0, 0 } },
-  // Shock Strike
-  { 11429, { 310, 0, 0, 0, 0 } },
-  // Glass Dance
-  { 11430, { 290, 0, 0, 0, 0 } },
-  // Veil of the Whorl
-  { 11431, { 0, 0, 0, 0, 0 } },
-  // Tri-shackle
-  { 11482, { 30, 0, 0, 0, 0 } },
-  // attack
-  { 11784, { 0, 0, 0, 0, 0 } },
-  // Stone of the Seventh Dawn
-  { 13423, { 140, 0, 0, 0, 0 } },
-  // Aero of the Seventh Dawn
-  { 13424, { 50, 0, 0, 0, 0 } },
-  // Cure of the Seventh Dawn
-  { 13425, { 0, 0, 0, 0, 700 } },
-  // Aetherwell
-  { 13426, { 0, 0, 0, 0, 0 } },
-  // Thunderous Force
-  { 14587, { 0, 0, 0, 0, 0 } },
-  // Kyokufu
-  { 14840, { 180, 0, 0, 0, 0 } },
-  // Ajisai
-  { 14841, { 100, 0, 0, 0, 0 } },
-  // Hissatsu: Gyoten
-  { 14842, { 100, 0, 0, 0, 0 } },
-  // 冥界恐叫打
-  { 14843, { 0, 0, 0, 0, 0 } },
-  // Second Wind
-  { 15375, { 0, 0, 0, 0, 500 } },
+  auto it = m_actionLut.find( actionId );
 
-};
\ No newline at end of file
+  if( it == m_actionLut.end() )
+    return false;
+
+  const auto& entry = it->second;
+
+  // if all of the fields are 0, it's not 'valid' due to parse error or no useful data in the tooltip
+  return entry.potency != 0 || entry.comboPotency != 0 || entry.flankPotency != 0 || entry.frontPotency != 0 ||
+         entry.rearPotency != 0 || entry.curePotency != 0;
+}
\ No newline at end of file
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index df2e5332..36949eb5 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -21,6 +21,8 @@ namespace Sapphire::World::Action
   public:
     using Lut = std::unordered_map< uint16_t, ActionEntry >;
 
+    static bool validEntryExists( uint16_t actionId );
+
     static Lut m_actionLut;
   };
 }
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
new file mode 100644
index 00000000..1e9c1f97
--- /dev/null
+++ b/src/world/Action/ActionLutData.cpp
@@ -0,0 +1,1120 @@
+#include "ActionLut.h"
+
+using namespace Sapphire::World::Action;
+
+ActionLut::Lut ActionLut::m_actionLut =
+{
+  // attack
+  { 7, { 0, 0, 0, 0, 0 } },
+  // Shot
+  { 8, { 0, 0, 0, 0, 0 } },
+  // Fast Blade
+  { 9, { 160, 0, 0, 0, 0 } },
+  // Savage Blade
+  { 11, { 100, 0, 0, 0, 0 } },
+  // Flash
+  { 14, { 0, 0, 0, 0, 0 } },
+  // Riot Blade
+  { 15, { 100, 0, 0, 0, 0 } },
+  // Shield Bash
+  { 16, { 110, 0, 0, 0, 0 } },
+  // Sentinel
+  { 17, { 0, 0, 0, 0, 0 } },
+  // Tempered Will
+  { 19, { 0, 0, 0, 0, 0 } },
+  // Fight or Flight
+  { 20, { 0, 0, 0, 0, 0 } },
+  // Rage of Halone
+  { 21, { 100, 0, 0, 0, 0 } },
+  // Bulwark
+  { 22, { 0, 0, 0, 0, 0 } },
+  // Circle of Scorn
+  { 23, { 100, 0, 0, 0, 0 } },
+  // Shield Lob
+  { 24, { 120, 0, 0, 0, 0 } },
+  // Shield Swipe
+  { 25, { 100, 0, 0, 0, 0 } },
+  // Sword Oath
+  { 26, { 75, 0, 0, 0, 0 } },
+  // Cover
+  { 27, { 0, 0, 0, 0, 0 } },
+  // Shield Oath
+  { 28, { 0, 0, 0, 0, 0 } },
+  // Spirits Within
+  { 29, { 300, 0, 0, 0, 0 } },
+  // Hallowed Ground
+  { 30, { 0, 0, 0, 0, 0 } },
+  // Heavy Swing
+  { 31, { 160, 0, 0, 0, 0 } },
+  // Skull Sunder
+  { 35, { 100, 0, 0, 0, 0 } },
+  // Maim
+  { 37, { 100, 0, 0, 0, 0 } },
+  // Berserk
+  { 38, { 0, 0, 0, 0, 0 } },
+  // Thrill of Battle
+  { 40, { 0, 0, 0, 0, 0 } },
+  // Overpower
+  { 41, { 130, 0, 0, 0, 0 } },
+  // Storm's Path
+  { 42, { 100, 0, 0, 0, 0 } },
+  // Holmgang
+  { 43, { 0, 0, 0, 0, 0 } },
+  // Vengeance
+  { 44, { 55, 0, 0, 0, 0 } },
+  // Storm's Eye
+  { 45, { 100, 0, 0, 0, 0 } },
+  // Tomahawk
+  { 46, { 140, 0, 0, 0, 0 } },
+  // Butcher's Block
+  { 47, { 100, 0, 0, 0, 0 } },
+  // Defiance
+  { 48, { 0, 0, 0, 0, 0 } },
+  // Inner Beast
+  { 49, { 350, 0, 0, 0, 0 } },
+  // Unchained
+  { 50, { 0, 0, 0, 0, 0 } },
+  // Steel Cyclone
+  { 51, { 200, 0, 0, 0, 0 } },
+  // Infuriate
+  { 52, { 0, 0, 0, 0, 0 } },
+  // Bootshine
+  { 53, { 140, 0, 0, 0, 0 } },
+  // True Strike
+  { 54, { 160, 0, 0, 180, 0 } },
+  // Snap Punch
+  { 56, { 150, 170, 0, 0, 0 } },
+  // Internal Release
+  { 59, { 0, 0, 0, 0, 0 } },
+  // Fists of Earth
+  { 60, { 0, 0, 0, 0, 0 } },
+  // Twin Snakes
+  { 61, { 110, 130, 0, 0, 0 } },
+  // Arm of the Destroyer
+  { 62, { 50, 0, 0, 0, 0 } },
+  // Fists of Fire
+  { 63, { 0, 0, 0, 0, 0 } },
+  // Steel Peak
+  { 64, { 150, 0, 0, 0, 0 } },
+  // Mantra
+  { 65, { 0, 0, 0, 0, 0 } },
+  // Demolish
+  { 66, { 50, 0, 0, 70, 0 } },
+  // Howling Fist
+  { 67, { 210, 0, 0, 0, 0 } },
+  // Perfect Balance
+  { 69, { 0, 0, 0, 0, 0 } },
+  // Rockbreaker
+  { 70, { 130, 0, 0, 0, 0 } },
+  // Shoulder Tackle
+  { 71, { 100, 0, 0, 0, 0 } },
+  // One Ilm Punch
+  { 72, { 120, 0, 0, 0, 0 } },
+  // Fists of Wind
+  { 73, { 0, 0, 0, 0, 0 } },
+  // Dragon Kick
+  { 74, { 120, 140, 0, 0, 0 } },
+  // True Thrust
+  { 75, { 160, 0, 0, 0, 0 } },
+  // Vorpal Thrust
+  { 78, { 100, 0, 0, 0, 0 } },
+  // Heavy Thrust
+  { 79, { 150, 190, 0, 0, 0 } },
+  // Impulse Drive
+  { 81, { 200, 0, 0, 0, 0 } },
+  // Life Surge
+  { 83, { 0, 0, 0, 0, 0 } },
+  // Full Thrust
+  { 84, { 100, 0, 0, 0, 0 } },
+  // Blood for Blood
+  { 85, { 0, 0, 0, 0, 0 } },
+  // Doom Spike
+  { 86, { 140, 0, 0, 0, 0 } },
+  // Disembowel
+  { 87, { 100, 0, 0, 0, 0 } },
+  // Chaos Thrust
+  { 88, { 100, 0, 0, 140, 0 } },
+  // Piercing Talon
+  { 90, { 120, 0, 0, 0, 0 } },
+  // Jump
+  { 92, { 260, 0, 0, 0, 0 } },
+  // Elusive Jump
+  { 94, { 0, 0, 0, 0, 0 } },
+  // Spineshatter Dive
+  { 95, { 210, 0, 0, 0, 0 } },
+  // Dragonfire Dive
+  { 96, { 320, 0, 0, 0, 0 } },
+  // Heavy Shot
+  { 97, { 150, 0, 0, 0, 0 } },
+  // Straight Shot
+  { 98, { 140, 0, 0, 0, 0 } },
+  // Venomous Bite
+  { 100, { 100, 0, 0, 0, 0 } },
+  // Raging Strikes
+  { 101, { 0, 0, 0, 0, 0 } },
+  // Misery's End
+  { 103, { 190, 0, 0, 0, 0 } },
+  // Quick Nock
+  { 106, { 110, 0, 0, 0, 0 } },
+  // Barrage
+  { 107, { 0, 0, 0, 0, 0 } },
+  // Bloodletter
+  { 110, { 130, 0, 0, 0, 0 } },
+  // Repelling Shot
+  { 112, { 0, 0, 0, 0, 0 } },
+  // Windbite
+  { 113, { 60, 0, 0, 0, 0 } },
+  // Mage's Ballad
+  { 114, { 100, 0, 0, 0, 0 } },
+  // Foe Requiem
+  { 115, { 0, 0, 0, 0, 0 } },
+  // Army's Paeon
+  { 116, { 100, 0, 0, 0, 0 } },
+  // Rain of Death
+  { 117, { 100, 0, 0, 0, 0 } },
+  // Battle Voice
+  { 118, { 0, 0, 0, 0, 0 } },
+  // Stone
+  { 119, { 140, 0, 0, 0, 0 } },
+  // Cure
+  { 120, { 0, 0, 0, 0, 450 } },
+  // Aero
+  { 121, { 50, 0, 0, 0, 0 } },
+  // Medica
+  { 124, { 0, 0, 0, 0, 300 } },
+  // Raise
+  { 125, { 0, 0, 0, 0, 0 } },
+  // Stone II
+  { 127, { 200, 0, 0, 0, 0 } },
+  // Repose
+  { 128, { 0, 0, 0, 0, 0 } },
+  // Cure III
+  { 131, { 0, 0, 0, 0, 550 } },
+  // Aero II
+  { 132, { 50, 0, 0, 0, 0 } },
+  // Medica II
+  { 133, { 0, 0, 0, 0, 200 } },
+  // Fluid Aura
+  { 134, { 0, 0, 0, 0, 0 } },
+  // Cure II
+  { 135, { 0, 0, 0, 0, 700 } },
+  // Presence of Mind
+  { 136, { 0, 0, 0, 0, 0 } },
+  // Regen
+  { 137, { 0, 0, 0, 0, 150 } },
+  // Holy
+  { 139, { 200, 0, 0, 0, 0 } },
+  // Benediction
+  { 140, { 0, 0, 0, 0, 0 } },
+  // Fire
+  { 141, { 180, 0, 0, 0, 0 } },
+  // Blizzard
+  { 142, { 180, 0, 0, 0, 0 } },
+  // Thunder
+  { 144, { 30, 0, 0, 0, 0 } },
+  // Sleep
+  { 145, { 0, 0, 0, 0, 0 } },
+  // Blizzard II
+  { 146, { 50, 0, 0, 0, 0 } },
+  // Fire II
+  { 147, { 80, 0, 0, 0, 0 } },
+  // Transpose
+  { 149, { 0, 0, 0, 0, 0 } },
+  // Fire III
+  { 152, { 240, 0, 0, 0, 0 } },
+  // Thunder III
+  { 153, { 70, 0, 0, 0, 0 } },
+  // Blizzard III
+  { 154, { 240, 0, 0, 0, 0 } },
+  // Aetherial Manipulation
+  { 155, { 0, 0, 0, 0, 0 } },
+  // Scathe
+  { 156, { 100, 0, 0, 0, 0 } },
+  // Manaward
+  { 157, { 0, 0, 0, 0, 0 } },
+  // Convert
+  { 158, { 0, 0, 0, 0, 0 } },
+  // Freeze
+  { 159, { 100, 0, 0, 0, 0 } },
+  // Flare
+  { 162, { 260, 0, 0, 0, 0 } },
+  // Ruin
+  { 163, { 100, 0, 0, 0, 0 } },
+  // Bio
+  { 164, { 0, 0, 0, 0, 0 } },
+  // Summon
+  { 165, { 0, 0, 0, 0, 0 } },
+  // Aetherflow
+  { 166, { 0, 0, 0, 0, 0 } },
+  // Energy Drain
+  { 167, { 150, 0, 0, 0, 0 } },
+  // Miasma
+  { 168, { 20, 0, 0, 0, 0 } },
+  // Summon II
+  { 170, { 0, 0, 0, 0, 0 } },
+  // Sustain
+  { 171, { 0, 0, 0, 0, 0 } },
+  // Ruin II
+  { 172, { 100, 0, 0, 0, 0 } },
+  // Resurrection
+  { 173, { 0, 0, 0, 0, 0 } },
+  // Bane
+  { 174, { 0, 0, 0, 0, 0 } },
+  // Rouse
+  { 176, { 0, 0, 0, 0, 0 } },
+  // Miasma II
+  { 177, { 100, 0, 0, 0, 0 } },
+  // Bio II
+  { 178, { 0, 0, 0, 0, 0 } },
+  // Shadow Flare
+  { 179, { 50, 0, 0, 0, 0 } },
+  // Summon III
+  { 180, { 0, 0, 0, 0, 0 } },
+  // Fester
+  { 181, { 150, 0, 0, 0, 0 } },
+  // Tri-bind
+  { 182, { 30, 0, 0, 0, 0 } },
+  // Enkindle
+  { 184, { 0, 0, 0, 0, 0 } },
+  // Adloquium
+  { 185, { 0, 0, 0, 0, 300 } },
+  // Succor
+  { 186, { 0, 0, 0, 0, 150 } },
+  // Sacred Soil
+  { 188, { 0, 0, 0, 0, 0 } },
+  // Lustrate
+  { 189, { 0, 0, 0, 0, 600 } },
+  // Physick
+  { 190, { 0, 0, 0, 0, 400 } },
+  // Shield Wall
+  { 197, { 0, 0, 0, 0, 0 } },
+  // Stronghold
+  { 198, { 0, 0, 0, 0, 0 } },
+  // Last Bastion
+  { 199, { 0, 0, 0, 0, 0 } },
+  // Braver
+  { 200, { 2400, 0, 0, 0, 0 } },
+  // Bladedance
+  { 201, { 5250, 0, 0, 0, 0 } },
+  // Final Heaven
+  { 202, { 9000, 0, 0, 0, 0 } },
+  // Skyshard
+  { 203, { 1650, 0, 0, 0, 0 } },
+  // Starstorm
+  { 204, { 3600, 0, 0, 0, 0 } },
+  // Meteor
+  { 205, { 6150, 0, 0, 0, 0 } },
+  // Healing Wind
+  { 206, { 0, 0, 0, 0, 0 } },
+  // Breath of the Earth
+  { 207, { 0, 0, 0, 0, 0 } },
+  // Pulse of Life
+  { 208, { 0, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 1128, { 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 1129, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 1533, { 0, 0, 0, 0, 0 } },
+  // Spinning Edge
+  { 2240, { 150, 0, 0, 0, 0 } },
+  // Shade Shift
+  { 2241, { 0, 0, 0, 0, 0 } },
+  // Gust Slash
+  { 2242, { 100, 0, 0, 0, 0 } },
+  // Hide
+  { 2245, { 0, 0, 0, 0, 0 } },
+  // Assassinate
+  { 2246, { 200, 0, 0, 0, 0 } },
+  // Throwing Dagger
+  { 2247, { 120, 0, 0, 0, 0 } },
+  // Mug
+  { 2248, { 140, 0, 0, 0, 0 } },
+  // Hide
+  { 2253, { 0, 0, 0, 0, 0 } },
+  // Death Blossom
+  { 2254, { 110, 0, 0, 0, 0 } },
+  // Aeolian Edge
+  { 2255, { 100, 0, 0, 160, 0 } },
+  // Jugulate
+  { 2256, { 80, 0, 0, 0, 0 } },
+  // Shadow Fang
+  { 2257, { 100, 0, 0, 0, 0 } },
+  // Trick Attack
+  { 2258, { 240, 0, 0, 400, 0 } },
+  // Ten
+  { 2259, { 0, 0, 0, 0, 0 } },
+  // Ninjutsu
+  { 2260, { 0, 0, 0, 0, 0 } },
+  // Chi
+  { 2261, { 0, 0, 0, 0, 0 } },
+  // Shukuchi
+  { 2262, { 0, 0, 0, 0, 0 } },
+  // Jin
+  { 2263, { 0, 0, 0, 0, 0 } },
+  // Kassatsu
+  { 2264, { 0, 0, 0, 0, 0 } },
+  // Fuma Shuriken
+  { 2265, { 240, 0, 0, 0, 0 } },
+  // Katon
+  { 2266, { 250, 0, 0, 0, 0 } },
+  // Raiton
+  { 2267, { 360, 0, 0, 0, 0 } },
+  // Hyoton
+  { 2268, { 140, 0, 0, 0, 0 } },
+  // Huton
+  { 2269, { 0, 0, 0, 0, 0 } },
+  // Doton
+  { 2270, { 45, 0, 0, 0, 0 } },
+  // Suiton
+  { 2271, { 180, 0, 0, 0, 0 } },
+  // Rabbit Medium
+  { 2272, { 0, 0, 0, 0, 0 } },
+  // Rook Autoturret
+  { 2864, { 80, 0, 0, 0, 0 } },
+  // Bishop Autoturret
+  { 2865, { 60, 0, 0, 0, 0 } },
+  // Split Shot
+  { 2866, { 160, 0, 0, 0, 0 } },
+  // Reload
+  { 2867, { 0, 0, 0, 0, 0 } },
+  // Slug Shot
+  { 2868, { 100, 0, 0, 0, 0 } },
+  // Spread Shot
+  { 2870, { 80, 0, 0, 0, 0 } },
+  // Hot Shot
+  { 2872, { 120, 0, 0, 0, 0 } },
+  // Clean Shot
+  { 2873, { 100, 0, 0, 0, 0 } },
+  // Gauss Round
+  { 2874, { 210, 0, 0, 0, 0 } },
+  // Heartbreak
+  { 2875, { 240, 0, 0, 0, 0 } },
+  // Reassemble
+  { 2876, { 0, 0, 0, 0, 0 } },
+  // Wildfire
+  { 2878, { 0, 0, 0, 0, 0 } },
+  // Quick Reload
+  { 2879, { 0, 0, 0, 0, 0 } },
+  // Gauss Barrel
+  { 2880, { 0, 0, 0, 0, 0 } },
+  // Rapid Fire
+  { 2881, { 0, 0, 0, 0, 0 } },
+  // Hypercharge
+  { 2885, { 0, 0, 0, 0, 0 } },
+  // Dismantle
+  { 2887, { 0, 0, 0, 0, 0 } },
+  // Blank
+  { 2888, { 0, 0, 0, 0, 0 } },
+  // Ricochet
+  { 2890, { 320, 0, 0, 0, 0 } },
+  // Raiton
+  { 3203, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 3204, { 0, 0, 0, 0, 0 } },
+  // Kanashibari
+  { 3207, { 0, 0, 0, 0, 0 } },
+  // Turret Retrieval
+  { 3487, { 0, 0, 0, 0, 0 } },
+  // Goring Blade
+  { 3538, { 100, 0, 0, 0, 0 } },
+  // Royal Authority
+  { 3539, { 100, 0, 0, 0, 0 } },
+  // Divine Veil
+  { 3540, { 0, 0, 0, 0, 0 } },
+  // Clemency
+  { 3541, { 0, 0, 0, 0, 1200 } },
+  // Sheltron
+  { 3542, { 0, 0, 0, 0, 0 } },
+  // Tornado Kick
+  { 3543, { 330, 0, 0, 0, 0 } },
+  // Purification
+  { 3544, { 0, 0, 0, 0, 0 } },
+  // Elixir Field
+  { 3545, { 220, 0, 0, 0, 0 } },
+  // Meditation
+  { 3546, { 0, 0, 0, 0, 0 } },
+  // the Forbidden Chakra
+  { 3547, { 250, 0, 0, 0, 0 } },
+  // Deliverance
+  { 3548, { 0, 0, 0, 0, 0 } },
+  // Fell Cleave
+  { 3549, { 520, 0, 0, 0, 0 } },
+  // Decimate
+  { 3550, { 280, 0, 0, 0, 0 } },
+  // Raw Intuition
+  { 3551, { 0, 0, 0, 0, 0 } },
+  // Equilibrium
+  { 3552, { 0, 0, 0, 0, 1200 } },
+  // Blood of the Dragon
+  { 3553, { 0, 0, 0, 0, 0 } },
+  // Fang and Claw
+  { 3554, { 260, 300, 0, 0, 0 } },
+  // Geirskogul
+  { 3555, { 230, 0, 0, 0, 0 } },
+  // Wheeling Thrust
+  { 3556, { 260, 0, 0, 300, 0 } },
+  // Battle Litany
+  { 3557, { 0, 0, 0, 0, 0 } },
+  // Empyreal Arrow
+  { 3558, { 230, 0, 0, 0, 0 } },
+  // the Wanderer's Minuet
+  { 3559, { 100, 0, 0, 0, 0 } },
+  // Iron Jaws
+  { 3560, { 100, 0, 0, 0, 0 } },
+  // the Warden's Paean
+  { 3561, { 0, 0, 0, 0, 0 } },
+  // Sidewinder
+  { 3562, { 100, 0, 0, 0, 0 } },
+  // Armor Crush
+  { 3563, { 100, 160, 0, 0, 0 } },
+  // Shadewalker
+  { 3564, { 0, 0, 0, 0, 0 } },
+  // Smoke Screen
+  { 3565, { 0, 0, 0, 0, 0 } },
+  // Dream Within a Dream
+  { 3566, { 150, 0, 0, 0, 0 } },
+  // Duality
+  { 3567, { 0, 0, 0, 0, 0 } },
+  // Stone III
+  { 3568, { 210, 0, 0, 0, 0 } },
+  // Asylum
+  { 3569, { 0, 0, 0, 0, 100 } },
+  // Tetragrammaton
+  { 3570, { 0, 0, 0, 0, 700 } },
+  // Assize
+  { 3571, { 400, 0, 0, 0, 400 } },
+  // Aero III
+  { 3572, { 50, 0, 0, 0, 0 } },
+  // Ley Lines
+  { 3573, { 0, 0, 0, 0, 0 } },
+  // Sharpcast
+  { 3574, { 0, 0, 0, 0, 0 } },
+  // Enochian
+  { 3575, { 0, 0, 0, 0, 0 } },
+  // Blizzard IV
+  { 3576, { 260, 0, 0, 0, 0 } },
+  // Fire IV
+  { 3577, { 300, 0, 0, 0, 0 } },
+  // Painflare
+  { 3578, { 180, 0, 0, 0, 0 } },
+  // Ruin III
+  { 3579, { 120, 0, 0, 0, 0 } },
+  // Tri-disaster
+  { 3580, { 0, 0, 0, 0, 0 } },
+  // Dreadwyrm Trance
+  { 3581, { 0, 0, 0, 0, 0 } },
+  // Deathflare
+  { 3582, { 400, 0, 0, 0, 0 } },
+  // Indomitability
+  { 3583, { 0, 0, 0, 0, 500 } },
+  // Broil
+  { 3584, { 190, 0, 0, 0, 0 } },
+  // Deployment Tactics
+  { 3585, { 0, 0, 0, 0, 0 } },
+  // Emergency Tactics
+  { 3586, { 0, 0, 0, 0, 0 } },
+  // Dissipation
+  { 3587, { 0, 0, 0, 0, 0 } },
+  // Draw
+  { 3590, { 0, 0, 0, 0, 0 } },
+  // Royal Road
+  { 3591, { 0, 0, 0, 0, 0 } },
+  // Spread
+  { 3592, { 0, 0, 0, 0, 0 } },
+  // Redraw
+  { 3593, { 0, 0, 0, 0, 0 } },
+  // Benefic
+  { 3594, { 0, 0, 0, 0, 400 } },
+  // Aspected Benefic
+  { 3595, { 0, 0, 0, 0, 200 } },
+  // Malefic
+  { 3596, { 150, 0, 0, 0, 0 } },
+  // Malefic II
+  { 3598, { 180, 0, 0, 0, 0 } },
+  // Combust
+  { 3599, { 0, 0, 0, 0, 0 } },
+  // Helios
+  { 3600, { 0, 0, 0, 0, 300 } },
+  // Aspected Helios
+  { 3601, { 0, 0, 0, 0, 200 } },
+  // Ascend
+  { 3603, { 0, 0, 0, 0, 0 } },
+  // Diurnal Sect
+  { 3604, { 0, 0, 0, 0, 0 } },
+  // Nocturnal Sect
+  { 3605, { 0, 0, 0, 0, 0 } },
+  // Lightspeed
+  { 3606, { 0, 0, 0, 0, 0 } },
+  // Combust II
+  { 3608, { 0, 0, 0, 0, 0 } },
+  // Benefic II
+  { 3610, { 0, 0, 0, 0, 650 } },
+  // Time Dilation
+  { 3611, { 0, 0, 0, 0, 0 } },
+  // Synastry
+  { 3612, { 0, 0, 0, 0, 0 } },
+  // Collective Unconscious
+  { 3613, { 0, 0, 0, 0, 150 } },
+  // Essential Dignity
+  { 3614, { 0, 0, 0, 0, 400 } },
+  // Gravity
+  { 3615, { 200, 0, 0, 0, 0 } },
+  // Celestial Opposition
+  { 3616, { 0, 0, 0, 0, 0 } },
+  // Hard Slash
+  { 3617, { 150, 0, 0, 0, 0 } },
+  // Spinning Slash
+  { 3619, { 100, 0, 0, 0, 0 } },
+  // Unleash
+  { 3621, { 50, 0, 0, 0, 0 } },
+  // Syphon Strike
+  { 3623, { 100, 0, 0, 0, 0 } },
+  // Unmend
+  { 3624, { 150, 0, 0, 0, 0 } },
+  // Blood Weapon
+  { 3625, { 0, 0, 0, 0, 0 } },
+  // Power Slash
+  { 3627, { 100, 0, 0, 0, 0 } },
+  // Darkside
+  { 3628, { 0, 0, 0, 0, 0 } },
+  // Grit
+  { 3629, { 0, 0, 0, 0, 0 } },
+  // Blood Price
+  { 3631, { 0, 0, 0, 0, 0 } },
+  // Souleater
+  { 3632, { 100, 0, 0, 0, 0 } },
+  // Dark Passenger
+  { 3633, { 140, 0, 0, 0, 0 } },
+  // Dark Mind
+  { 3634, { 0, 0, 0, 0, 0 } },
+  // Dark Arts
+  { 3635, { 0, 0, 0, 0, 0 } },
+  // Shadow Wall
+  { 3636, { 0, 0, 0, 0, 0 } },
+  // Living Dead
+  { 3638, { 0, 0, 0, 0, 0 } },
+  // Salted Earth
+  { 3639, { 75, 0, 0, 0, 0 } },
+  // Plunge
+  { 3640, { 200, 0, 0, 0, 0 } },
+  // Abyssal Drain
+  { 3641, { 120, 0, 0, 0, 0 } },
+  // Sole Survivor
+  { 3642, { 0, 0, 0, 0, 0 } },
+  // Carve and Spit
+  { 3643, { 100, 0, 0, 0, 0 } },
+  // Big Shot
+  { 4238, { 0, 0, 0, 0, 0 } },
+  // Desperado
+  { 4239, { 0, 0, 0, 0, 0 } },
+  // Land Waker
+  { 4240, { 0, 0, 0, 0, 0 } },
+  // Dark Force
+  { 4241, { 0, 0, 0, 0, 0 } },
+  // Dragonsong Dive
+  { 4242, { 0, 0, 0, 0, 0 } },
+  // Chimatsuri
+  { 4243, { 0, 0, 0, 0, 0 } },
+  // Sagittarius Arrow
+  { 4244, { 0, 0, 0, 0, 0 } },
+  // Satellite Beam
+  { 4245, { 0, 0, 0, 0, 0 } },
+  // Teraflare
+  { 4246, { 0, 0, 0, 0, 0 } },
+  // Angel Feathers
+  { 4247, { 0, 0, 0, 0, 0 } },
+  // Astral Stasis
+  { 4248, { 0, 0, 0, 0, 0 } },
+  // Form Shift
+  { 4262, { 0, 0, 0, 0, 0 } },
+  // Cannonfire
+  { 4271, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4401, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4402, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4403, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4404, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4405, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4406, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4407, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4408, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4409, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4410, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4411, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4412, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4413, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4414, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4415, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4416, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4417, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4418, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4419, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4420, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4421, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4422, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4423, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4424, { 0, 0, 0, 0, 0 } },
+  // Empty Road
+  { 4645, { 0, 0, 0, 0, 0 } },
+  // Undraw Spread
+  { 4646, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 4977, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 5069, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 5199, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 5846, { 0, 0, 0, 0, 0 } },
+  // Stickyloom
+  { 5874, { 0, 0, 0, 0, 0 } },
+  // Void Fire II
+  { 6274, { 0, 0, 0, 0, 0 } },
+  // Total Eclipse
+  { 7381, { 110, 0, 0, 0, 0 } },
+  // Intervention
+  { 7382, { 0, 0, 0, 0, 0 } },
+  // Requiescat
+  { 7383, { 350, 0, 0, 0, 0 } },
+  // Holy Spirit
+  { 7384, { 380, 0, 0, 0, 0 } },
+  // Passage of Arms
+  { 7385, { 0, 0, 0, 0, 0 } },
+  // Onslaught
+  { 7386, { 100, 0, 0, 0, 0 } },
+  // Upheaval
+  { 7387, { 300, 0, 0, 0, 0 } },
+  // Shake It Off
+  { 7388, { 0, 0, 0, 0, 0 } },
+  // Inner Release
+  { 7389, { 0, 0, 0, 0, 0 } },
+  // Delirium
+  { 7390, { 0, 0, 0, 0, 0 } },
+  // Quietus
+  { 7391, { 160, 0, 0, 0, 0 } },
+  // Bloodspiller
+  { 7392, { 400, 0, 0, 0, 0 } },
+  // The Blackest Night
+  { 7393, { 0, 0, 0, 0, 0 } },
+  // Riddle of Earth
+  { 7394, { 0, 0, 0, 0, 0 } },
+  // Riddle of Fire
+  { 7395, { 0, 0, 0, 0, 0 } },
+  // Brotherhood
+  { 7396, { 0, 0, 0, 0, 0 } },
+  // Sonic Thrust
+  { 7397, { 100, 0, 0, 0, 0 } },
+  // Dragon Sight
+  { 7398, { 0, 0, 0, 0, 0 } },
+  // Mirage Dive
+  { 7399, { 210, 0, 0, 0, 0 } },
+  // Nastrond
+  { 7400, { 330, 0, 0, 0, 0 } },
+  // Hellfrog Medium
+  { 7401, { 400, 0, 0, 0, 0 } },
+  // Bhavacakra
+  { 7402, { 600, 0, 0, 0, 0 } },
+  // Ten Chi Jin
+  { 7403, { 0, 0, 0, 0, 0 } },
+  // Pitch Perfect
+  { 7404, { 100, 0, 0, 0, 0 } },
+  // Troubadour
+  { 7405, { 0, 0, 0, 0, 0 } },
+  // Caustic Bite
+  { 7406, { 120, 0, 0, 0, 0 } },
+  // Stormbite
+  { 7407, { 120, 0, 0, 0, 0 } },
+  // Nature's Minne
+  { 7408, { 0, 0, 0, 0, 0 } },
+  // Refulgent Arrow
+  { 7409, { 300, 0, 0, 0, 0 } },
+  // Cooldown
+  { 7410, { 150, 0, 0, 0, 0 } },
+  // Heated Split Shot
+  { 7411, { 190, 0, 0, 0, 0 } },
+  // Heated Slug Shot
+  { 7412, { 100, 0, 0, 0, 0 } },
+  // Heated Clean Shot
+  { 7413, { 100, 0, 0, 0, 0 } },
+  // Barrel Stabilizer
+  { 7414, { 0, 0, 0, 0, 0 } },
+  // Rook Overdrive
+  { 7415, { 0, 0, 0, 0, 0 } },
+  // Flamethrower
+  { 7418, { 0, 0, 0, 0, 0 } },
+  // Between the Lines
+  { 7419, { 0, 0, 0, 0, 0 } },
+  // Thunder IV
+  { 7420, { 50, 0, 0, 0, 0 } },
+  // Triplecast
+  { 7421, { 0, 0, 0, 0, 0 } },
+  // Foul
+  { 7422, { 650, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7423, { 0, 0, 0, 0, 0 } },
+  // Bio III
+  { 7424, { 0, 0, 0, 0, 0 } },
+  // Miasma III
+  { 7425, { 50, 0, 0, 0, 0 } },
+  // Ruin IV
+  { 7426, { 200, 0, 0, 0, 0 } },
+  // Summon Bahamut
+  { 7427, { 0, 0, 0, 0, 0 } },
+  // Enkindle Bahamut
+  { 7429, { 0, 0, 0, 0, 0 } },
+  // Thin Air
+  { 7430, { 0, 0, 0, 0, 0 } },
+  // Stone IV
+  { 7431, { 250, 0, 0, 0, 0 } },
+  // Divine Benison
+  { 7432, { 0, 0, 0, 0, 0 } },
+  // Plenary Indulgence
+  { 7433, { 0, 0, 0, 0, 0 } },
+  // Excogitation
+  { 7434, { 0, 0, 0, 0, 800 } },
+  // Broil II
+  { 7435, { 230, 0, 0, 0, 0 } },
+  // Chain Stratagem
+  { 7436, { 0, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7437, { 0, 0, 0, 0, 0 } },
+  // Earthly Star
+  { 7439, { 150, 0, 0, 0, 540 } },
+  // Malefic III
+  { 7442, { 220, 0, 0, 0, 0 } },
+  // Minor Arcana
+  { 7443, { 0, 0, 0, 0, 0 } },
+  // Lord of Crowns
+  { 7444, { 300, 0, 0, 0, 0 } },
+  // Lady of Crowns
+  { 7445, { 0, 0, 0, 0, 500 } },
+  // Thunder II
+  { 7447, { 30, 0, 0, 0, 0 } },
+  // Sleeve Draw
+  { 7448, { 0, 0, 0, 0, 0 } },
+  // Hakaze
+  { 7477, { 150, 0, 0, 0, 0 } },
+  // Jinpu
+  { 7478, { 100, 0, 0, 0, 0 } },
+  // Shifu
+  { 7479, { 100, 0, 0, 0, 0 } },
+  // Yukikaze
+  { 7480, { 100, 0, 0, 0, 0 } },
+  // Gekko
+  { 7481, { 100, 0, 0, 0, 0 } },
+  // Kasha
+  { 7482, { 100, 0, 0, 0, 0 } },
+  // Fuga
+  { 7483, { 100, 0, 0, 0, 0 } },
+  // Mangetsu
+  { 7484, { 100, 0, 0, 0, 0 } },
+  // Oka
+  { 7485, { 100, 0, 0, 0, 0 } },
+  // Enpi
+  { 7486, { 100, 0, 0, 0, 0 } },
+  // Midare Setsugekka
+  { 7487, { 720, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 7488, { 360, 0, 0, 0, 0 } },
+  // Higanbana
+  { 7489, { 240, 0, 0, 0, 0 } },
+  // Hissatsu: Shinten
+  { 7490, { 300, 0, 0, 0, 0 } },
+  // Hissatsu: Kyuten
+  { 7491, { 150, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 7492, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Yaten
+  { 7493, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Kaiten
+  { 7494, { 0, 0, 0, 0, 0 } },
+  // Hagakure
+  { 7495, { 0, 0, 0, 0, 0 } },
+  // Hissatsu: Guren
+  { 7496, { 800, 0, 0, 0, 0 } },
+  // Meditate
+  { 7497, { 0, 0, 0, 0, 0 } },
+  // Third Eye
+  { 7498, { 0, 0, 0, 0, 0 } },
+  // Meikyo Shisui
+  { 7499, { 0, 0, 0, 0, 0 } },
+  // Ageha
+  { 7500, { 250, 0, 0, 0, 0 } },
+  // Hissatsu: Seigan
+  { 7501, { 200, 0, 0, 0, 0 } },
+  // Merciful Eyes
+  { 7502, { 0, 0, 0, 0, 200 } },
+  // Jolt
+  { 7503, { 180, 0, 0, 0, 0 } },
+  // Riposte
+  { 7504, { 130, 0, 0, 0, 0 } },
+  // Verthunder
+  { 7505, { 310, 0, 0, 0, 0 } },
+  // Corps-a-corps
+  { 7506, { 130, 0, 0, 0, 0 } },
+  // Veraero
+  { 7507, { 310, 0, 0, 0, 0 } },
+  // Tether
+  { 7508, { 0, 0, 0, 0, 0 } },
+  // Scatter
+  { 7509, { 100, 0, 0, 0, 0 } },
+  // Verfire
+  { 7510, { 270, 0, 0, 0, 0 } },
+  // Verstone
+  { 7511, { 270, 0, 0, 0, 0 } },
+  // Zwerchhau
+  { 7512, { 100, 0, 0, 0, 0 } },
+  // Moulinet
+  { 7513, { 60, 0, 0, 0, 0 } },
+  // Vercure
+  { 7514, { 0, 0, 0, 0, 350 } },
+  // Displacement
+  { 7515, { 130, 0, 0, 0, 0 } },
+  // Redoublement
+  { 7516, { 100, 0, 0, 0, 0 } },
+  // Fleche
+  { 7517, { 420, 0, 0, 0, 0 } },
+  // Acceleration
+  { 7518, { 0, 0, 0, 0, 0 } },
+  // Contre Sixte
+  { 7519, { 350, 0, 0, 0, 0 } },
+  // Embolden
+  { 7520, { 0, 0, 0, 0, 0 } },
+  // Manafication
+  { 7521, { 0, 0, 0, 0, 0 } },
+  // Impact
+  { 7522, { 270, 0, 0, 0, 0 } },
+  // Verraise
+  { 7523, { 0, 0, 0, 0, 0 } },
+  // Jolt II
+  { 7524, { 240, 0, 0, 0, 0 } },
+  // Verflare
+  { 7525, { 600, 0, 0, 0, 0 } },
+  // Verholy
+  { 7526, { 600, 0, 0, 0, 0 } },
+  // Enchanted Riposte
+  { 7527, { 210, 0, 0, 0, 0 } },
+  // Enchanted Zwerchhau
+  { 7528, { 100, 0, 0, 0, 0 } },
+  // Enchanted Redoublement
+  { 7529, { 100, 0, 0, 0, 0 } },
+  // Enchanted Moulinet
+  { 7530, { 200, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 7619, { 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 7620, { 0, 0, 0, 0, 0 } },
+  // Diffractive Magitek Cannon
+  { 7621, { 0, 0, 0, 0, 0 } },
+  // High-powered Magitek Cannon
+  { 7622, { 0, 0, 0, 0, 0 } },
+  // Doom of the Living
+  { 7861, { 0, 0, 0, 0, 0 } },
+  // Vermillion Scourge
+  { 7862, { 0, 0, 0, 0, 0 } },
+  // Earth Tackle
+  { 7864, { 100, 0, 0, 0, 0 } },
+  // Wind Tackle
+  { 7865, { 65, 0, 0, 0, 0 } },
+  // Fire Tackle
+  { 7866, { 130, 0, 0, 0, 0 } },
+  // Iaijutsu
+  { 7867, { 0, 0, 0, 0, 0 } },
+  // Riddle of Wind
+  { 7868, { 65, 0, 0, 0, 0 } },
+  // Dissolve Union
+  { 7869, { 0, 0, 0, 0, 0 } },
+  // Stellar Detonation
+  { 8324, { 150, 0, 0, 0, 540 } },
+  // Broken Ridge
+  { 8395, { 0, 0, 0, 0, 0 } },
+  // Magitek Pulse
+  { 8624, { 0, 0, 0, 0, 0 } },
+  // Magitek Thunder
+  { 8625, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 8687, { 0, 0, 0, 0, 0 } },
+  // Katon
+  { 9012, { 0, 0, 0, 0, 0 } },
+  // Remove Barrel
+  { 9015, { 0, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 9143, { 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 9294, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9301, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9302, { 0, 0, 0, 0, 0 } },
+  // Bishop Overdrive
+  { 9372, { 0, 0, 0, 0, 0 } },
+  // Undraw
+  { 9629, { 0, 0, 0, 0, 0 } },
+  // Self-detonate
+  { 9775, { 0, 0, 0, 0, 0 } },
+  // Shatterstone
+  { 9823, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 9996, { 0, 0, 0, 0, 0 } },
+  // Ungarmax
+  { 10001, { 0, 0, 0, 0, 0 } },
+  // Starstorm
+  { 10894, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 10946, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 10947, { 0, 0, 0, 0, 0 } },
+  // Ruin III
+  { 11191, { 200, 0, 0, 0, 0 } },
+  // Physick
+  { 11192, { 0, 0, 0, 0, 400 } },
+  // Starstorm
+  { 11193, { 3600, 0, 0, 0, 0 } },
+  // Snort
+  { 11383, { 0, 0, 0, 0, 0 } },
+  // 4-tonze Weight
+  { 11384, { 110, 0, 0, 0, 0 } },
+  // Water Cannon
+  { 11385, { 120, 0, 0, 0, 0 } },
+  // Song of Torment
+  { 11386, { 50, 0, 0, 0, 0 } },
+  // High Voltage
+  { 11387, { 90, 0, 0, 0, 0 } },
+  // Bad Breath
+  { 11388, { 0, 0, 0, 0, 0 } },
+  // Flying Frenzy
+  { 11389, { 80, 0, 0, 0, 0 } },
+  // Aqua Breath
+  { 11390, { 90, 0, 0, 0, 0 } },
+  // Plaincracker
+  { 11391, { 130, 0, 0, 0, 0 } },
+  // Acorn Bomb
+  { 11392, { 0, 0, 0, 0, 0 } },
+  // Bristle
+  { 11393, { 0, 0, 0, 0, 0 } },
+  // Mind Blast
+  { 11394, { 100, 0, 0, 0, 0 } },
+  // Blood Drain
+  { 11395, { 20, 0, 0, 0, 0 } },
+  // Bomb Toss
+  { 11396, { 110, 0, 0, 0, 0 } },
+  // 1000 Needles
+  { 11397, { 0, 0, 0, 0, 0 } },
+  // Drill Cannons
+  { 11398, { 120, 0, 0, 0, 0 } },
+  // the Look
+  { 11399, { 130, 0, 0, 0, 0 } },
+  // Sharpened Knife
+  { 11400, { 120, 0, 0, 0, 0 } },
+  // Loom
+  { 11401, { 0, 0, 0, 0, 0 } },
+  // Flame Thrower
+  { 11402, { 130, 0, 0, 0, 0 } },
+  // Faze
+  { 11403, { 0, 0, 0, 0, 0 } },
+  // Glower
+  { 11404, { 130, 0, 0, 0, 0 } },
+  // Missile
+  { 11405, { 0, 0, 0, 0, 0 } },
+  // White Wind
+  { 11406, { 0, 0, 0, 0, 0 } },
+  // Final Sting
+  { 11407, { 1500, 0, 0, 0, 0 } },
+  // Self-destruct
+  { 11408, { 900, 0, 0, 0, 0 } },
+  // Transfusion
+  { 11409, { 0, 0, 0, 0, 0 } },
+  // Toad Oil
+  { 11410, { 0, 0, 0, 0, 0 } },
+  // Off-guard
+  { 11411, { 0, 0, 0, 0, 0 } },
+  // Sticky Tongue
+  { 11412, { 0, 0, 0, 0, 0 } },
+  // Tail Screw
+  { 11413, { 0, 0, 0, 0, 0 } },
+  // Level 5 Petrify
+  { 11414, { 0, 0, 0, 0, 0 } },
+  // Moon Flute
+  { 11415, { 0, 0, 0, 0, 0 } },
+  // Doom
+  { 11416, { 0, 0, 0, 0, 0 } },
+  // Mighty Guard
+  { 11417, { 0, 0, 0, 0, 0 } },
+  // Ice Spikes
+  { 11418, { 0, 0, 0, 0, 0 } },
+  // the Ram's Voice
+  { 11419, { 130, 0, 0, 0, 0 } },
+  // the Dragon's Voice
+  { 11420, { 110, 0, 0, 0, 0 } },
+  // Peculiar Light
+  { 11421, { 0, 0, 0, 0, 0 } },
+  // Ink Jet
+  { 11422, { 120, 0, 0, 0, 0 } },
+  // Flying Sardine
+  { 11423, { 10, 0, 0, 0, 0 } },
+  // Diamondback
+  { 11424, { 0, 0, 0, 0, 0 } },
+  // Fire Angon
+  { 11425, { 100, 0, 0, 0, 0 } },
+  // Feather Rain
+  { 11426, { 180, 0, 0, 0, 0 } },
+  // Eruption
+  { 11427, { 220, 0, 0, 0, 0 } },
+  // Mountain Buster
+  { 11428, { 310, 0, 0, 0, 0 } },
+  // Shock Strike
+  { 11429, { 310, 0, 0, 0, 0 } },
+  // Glass Dance
+  { 11430, { 290, 0, 0, 0, 0 } },
+  // Veil of the Whorl
+  { 11431, { 0, 0, 0, 0, 0 } },
+  // Tri-shackle
+  { 11482, { 30, 0, 0, 0, 0 } },
+  // attack
+  { 11784, { 0, 0, 0, 0, 0 } },
+  // Stone of the Seventh Dawn
+  { 13423, { 140, 0, 0, 0, 0 } },
+  // Aero of the Seventh Dawn
+  { 13424, { 50, 0, 0, 0, 0 } },
+  // Cure of the Seventh Dawn
+  { 13425, { 0, 0, 0, 0, 700 } },
+  // Aetherwell
+  { 13426, { 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 14587, { 0, 0, 0, 0, 0 } },
+  // Kyokufu
+  { 14840, { 180, 0, 0, 0, 0 } },
+  // Ajisai
+  { 14841, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 14842, { 100, 0, 0, 0, 0 } },
+  // 冥界恐叫打
+  { 14843, { 0, 0, 0, 0, 0 } },
+  // Second Wind
+  { 15375, { 0, 0, 0, 0, 500 } },
+
+};
\ No newline at end of file

From f892257aa5dd4634fde8bd02cea06e25f7ca3d0f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 00:34:22 +1000
Subject: [PATCH 02/10] refactor Util -> Common::Util & Action to World::Action

---
 src/api/main.cpp                              |  2 +-
 src/api/server_http.hpp                       |  6 +-
 src/common/Database/DbConnection.cpp          |  2 +-
 src/common/Database/DbConnection.h            |  4 +-
 src/common/Database/DbWorker.cpp              |  4 +-
 src/common/Database/DbWorker.h                |  4 +-
 src/common/Database/DbWorkerPool.cpp          |  2 +-
 src/common/Database/DbWorkerPool.h            |  2 +-
 src/common/Database/ZoneDbConnection.cpp      |  2 +-
 src/common/Database/ZoneDbConnection.h        |  2 +-
 src/common/Network/GamePacket.h               |  2 +-
 src/common/Network/PacketContainer.cpp        |  2 +-
 src/common/Util/LockedQueue.h                 |  2 +-
 src/common/Util/LockedWaitQueue.h             |  2 +-
 src/common/Util/SpawnIndexAllocator.h         |  2 +-
 src/common/Util/Util.cpp                      | 22 ++---
 src/common/Util/Util.h                        |  2 +-
 src/common/Util/UtilMath.cpp                  | 22 ++---
 src/common/Util/UtilMath.h                    |  2 +-
 src/lobby/GameConnection.h                    |  4 +-
 src/lobby/LobbyPacketContainer.cpp            |  2 +-
 src/lobby/client_http.hpp                     |  6 +-
 src/scripts/action/common/ActionReturn6.cpp   |  2 +-
 src/scripts/action/common/ActionSprint3.cpp   |  2 +-
 src/scripts/action/common/ActionTeleport5.cpp |  2 +-
 .../archer/ActionHeavyShot97.cpp              |  2 +-
 .../playeractions/conjurer/ActionCure120.cpp  |  2 +-
 .../darkknight/ActionAbyssalDrain3641.cpp     |  2 +-
 .../darkknight/ActionHardSlash3617.cpp        |  2 +-
 .../darkknight/ActionPowerSlash3627.cpp       |  2 +-
 .../darkknight/ActionSpinningSlash3619.cpp    |  2 +-
 .../darkknight/ActionSyphonStrike3623.cpp     |  2 +-
 .../darkknight/ActionUnleash3621.cpp          |  2 +-
 .../whitemage/ActionAsylum3569.cpp            |  2 +-
 src/tools/action_parse/main.cpp               |  4 +-
 src/tools/discovery_parser/main.cpp           |  6 +-
 src/tools/event_object_parser/main.cpp        | 10 +--
 src/tools/exd_common_gen/main.cpp             |  2 +-
 src/tools/mob_parse/main.cpp                  |  2 +-
 src/tools/nav_export/main.cpp                 |  4 +-
 src/tools/pcb_reader/main.cpp                 |  4 +-
 src/world/Action/Action.cpp                   | 82 ++++++++++---------
 src/world/Action/Action.h                     |  2 +-
 src/world/Action/EventAction.cpp              | 17 ++--
 src/world/Action/EventAction.h                |  2 +-
 src/world/Actor/Chara.cpp                     |  4 +-
 src/world/Actor/Chara.h                       |  6 +-
 src/world/Actor/Player.cpp                    |  4 +-
 src/world/Actor/Player.h                      | 12 +--
 src/world/Actor/PlayerEvent.cpp               | 10 +--
 src/world/ForwardsZone.h                      |  2 +-
 src/world/Manager/DebugCommandMgr.cpp         |  2 +-
 src/world/Manager/MarketMgr.cpp               |  2 +-
 src/world/Network/GameConnection.cpp          |  2 +-
 src/world/Network/GameConnection.h            |  4 +-
 src/world/Network/Handlers/PacketHandlers.cpp |  2 +-
 .../Network/PacketWrappers/MoveActorPacket.h  |  8 +-
 .../Network/PacketWrappers/NpcSpawnPacket.h   |  4 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |  4 +-
 src/world/Script/NativeScriptApi.cpp          | 10 +--
 src/world/Script/NativeScriptApi.h            |  8 +-
 src/world/Script/ScriptLoader.cpp             |  2 +-
 src/world/Script/ScriptMgr.cpp                |  6 +-
 src/world/Script/ScriptMgr.h                  |  6 +-
 src/world/ServerMgr.cpp                       |  4 +-
 src/world/Session.cpp                         | 16 ++--
 src/world/Territory/Zone.cpp                  |  2 +-
 src/world/Util/ActorFilter.cpp                |  2 +-
 68 files changed, 200 insertions(+), 181 deletions(-)

diff --git a/src/api/main.cpp b/src/api/main.cpp
index fd68af4f..3ea413f3 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -106,7 +106,7 @@ bool loadSettings( int32_t argc, char* argv[] )
 
     try
     {
-      arg = Sapphire::Util::toLowerCopy( std::string( args[ i ] ) );
+      arg = Common::Util::toLowerCopy( std::string( args[ i ] ) );
       val = std::string( args[ i + 1 ] );
 
       // trim '-' from start of arg
diff --git a/src/api/server_http.hpp b/src/api/server_http.hpp
index 7c831e69..8a6d2226 100644
--- a/src/api/server_http.hpp
+++ b/src/api/server_http.hpp
@@ -18,7 +18,7 @@
 class case_insensitive_equals {
 public:
   bool operator()(const std::string &key1, const std::string &key2) const {
-    return Sapphire::Util::toLowerCopy( key1 ) == Sapphire::Util::toLowerCopy( key2 );
+    return Sapphire::Common::Util::toLowerCopy( key1 ) == Sapphire::Common::Util::toLowerCopy( key2 );
   }
 };
 class case_insensitive_hash {
@@ -27,7 +27,7 @@ public:
   {
     std::size_t seed=0;
     for( auto &c : key )
-      Sapphire::Util::hashCombine< char >( seed, std::tolower( c ) );
+      Sapphire::Common::Util::hashCombine< char >( seed, std::tolower( c ) );
     return seed;
   }
 };
@@ -388,7 +388,7 @@ namespace SimpleWeb {
                         
                         auto range=request->header.equal_range("Connection");
                         for(auto it=range.first;it!=range.second;it++) {
-                            if( Sapphire::Util::toLowerCopy( it->second ) == "close" )
+                            if( Sapphire::Common::Util::toLowerCopy( it->second ) == "close" )
                                 return;
                         }
                         if(http_version>1.05)
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index 133baa56..f03b7f9e 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -17,7 +17,7 @@ Sapphire::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) :
 
 }
 
-Sapphire::Db::DbConnection::DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue,
+Sapphire::Db::DbConnection::DbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* queue,
                                           Sapphire::Db::ConnectionInfo& connInfo ) :
   m_reconnecting( false ),
   m_prepareError( false ),
diff --git a/src/common/Database/DbConnection.h b/src/common/Database/DbConnection.h
index a31a531d..fc84b74f 100644
--- a/src/common/Database/DbConnection.h
+++ b/src/common/Database/DbConnection.h
@@ -42,7 +42,7 @@ namespace Sapphire::Db
     DbConnection( ConnectionInfo& connInfo );
 
     // Constructor for asynchronous connections.
-    DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo );
+    DbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo );
 
     virtual ~DbConnection();
 
@@ -92,7 +92,7 @@ namespace Sapphire::Db
     bool m_prepareError;
 
   private:
-    LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
+    Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
     std::shared_ptr< DbWorker > m_worker;
     std::shared_ptr< Mysql::Connection > m_pConnection;
     ConnectionInfo& m_connectionInfo;
diff --git a/src/common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp
index 74ee0378..d08f251f 100644
--- a/src/common/Database/DbWorker.cpp
+++ b/src/common/Database/DbWorker.cpp
@@ -2,7 +2,9 @@
 #include "Operation.h"
 #include "Util/LockedWaitQueue.h"
 
-Sapphire::Db::DbWorker::DbWorker( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue,
+using namespace Sapphire::Common;
+
+Sapphire::Db::DbWorker::DbWorker( Util::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue,
                                   DbConnection* pConn )
 {
   m_pConn = pConn;
diff --git a/src/common/Database/DbWorker.h b/src/common/Database/DbWorker.h
index 13250c19..655ef13f 100644
--- a/src/common/Database/DbWorker.h
+++ b/src/common/Database/DbWorker.h
@@ -14,12 +14,12 @@ namespace Sapphire::Db
   class DbWorker
   {
   public:
-    DbWorker( LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* connection );
+    DbWorker( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* connection );
 
     ~DbWorker();
 
   private:
-    LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
+    Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
     DbConnection* m_pConn;
 
     void workerThread();
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index c9ef3b51..81b9d96d 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -21,7 +21,7 @@ class PingOperation : public Sapphire::Db::Operation
 
 template< class T >
 Sapphire::Db::DbWorkerPool< T >::DbWorkerPool() :
-  m_queue( new Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >() ),
+  m_queue( new Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >() ),
   m_asyncThreads( 0 ),
   m_synchThreads( 0 )
 {
diff --git a/src/common/Database/DbWorkerPool.h b/src/common/Database/DbWorkerPool.h
index a29bd3f1..bbc02e46 100644
--- a/src/common/Database/DbWorkerPool.h
+++ b/src/common/Database/DbWorkerPool.h
@@ -83,7 +83,7 @@ namespace Sapphire::Db
 
     const std::string& getDatabaseName() const;
 
-    std::unique_ptr< Sapphire::LockedWaitQueue< std::shared_ptr< Operation > > > m_queue;
+    std::unique_ptr< Common::Util::LockedWaitQueue< std::shared_ptr< Operation > > > m_queue;
     std::array< std::vector< std::shared_ptr< T > >, IDX_SIZE > m_connections;
     ConnectionInfo m_connectionInfo;
     uint8_t m_asyncThreads;
diff --git a/src/common/Database/ZoneDbConnection.cpp b/src/common/Database/ZoneDbConnection.cpp
index cceea22f..1c4c5a82 100644
--- a/src/common/Database/ZoneDbConnection.cpp
+++ b/src/common/Database/ZoneDbConnection.cpp
@@ -6,7 +6,7 @@ Sapphire::Db::ZoneDbConnection::ZoneDbConnection( ConnectionInfo& connInfo ) :
 {
 }
 
-Sapphire::Db::ZoneDbConnection::ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q,
+Sapphire::Db::ZoneDbConnection::ZoneDbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* q,
                                                   ConnectionInfo& connInfo ) :
   DbConnection( q, connInfo )
 {
diff --git a/src/common/Database/ZoneDbConnection.h b/src/common/Database/ZoneDbConnection.h
index 93bacc23..8c74bf19 100644
--- a/src/common/Database/ZoneDbConnection.h
+++ b/src/common/Database/ZoneDbConnection.h
@@ -112,7 +112,7 @@ namespace Sapphire::Db
 
     ZoneDbConnection( ConnectionInfo& connInfo );
 
-    ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo );
+    ZoneDbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo );
 
     ~ZoneDbConnection();
 
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index f62c08ef..c1c06b76 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -257,7 +257,7 @@ namespace Sapphire::Network::Packets
 
       // The IPC type itself.
       m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
-      m_ipcHdr.timestamp = Util::getTimeSeconds();
+      m_ipcHdr.timestamp = Common::Util::getTimeSeconds();
       m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
     };
 
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index a61c38c0..d89c8df4 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -76,7 +76,7 @@ std::string Sapphire::Network::Packets::PacketContainer::toString()
   std::string str = "\n";
   for( uint32_t i = 0; i < m_ipcHdr.size; i++ )
   {
-    str += Util::intToHexString( static_cast< int32_t >( tmpBuffer[ i ] & 0xFF ) ) + " ";
+    str += Common::Util::intToHexString( static_cast< int32_t >( tmpBuffer[ i ] & 0xFF ) ) + " ";
 
     if( ( i + 1 ) % 16 == 0 )
       str += "\n";
diff --git a/src/common/Util/LockedQueue.h b/src/common/Util/LockedQueue.h
index 1e73f4ce..57397b59 100644
--- a/src/common/Util/LockedQueue.h
+++ b/src/common/Util/LockedQueue.h
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace Sapphire
+namespace Sapphire::Common::Util
 {
 
   template< class T >
diff --git a/src/common/Util/LockedWaitQueue.h b/src/common/Util/LockedWaitQueue.h
index 122cfd1c..1a1ffdc3 100644
--- a/src/common/Util/LockedWaitQueue.h
+++ b/src/common/Util/LockedWaitQueue.h
@@ -8,7 +8,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace Sapphire
+namespace Sapphire::Common::Util
 {
 
   template< typename T >
diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h
index f03951a3..27003e8f 100644
--- a/src/common/Util/SpawnIndexAllocator.h
+++ b/src/common/Util/SpawnIndexAllocator.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <type_traits>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
 
   template< typename T, typename ActorIdType = uint32_t >
diff --git a/src/common/Util/Util.cpp b/src/common/Util/Util.cpp
index f443ddf8..d653e29c 100644
--- a/src/common/Util/Util.cpp
+++ b/src/common/Util/Util.cpp
@@ -5,7 +5,9 @@
 #include <algorithm>
 #include <string>
 
-std::string Sapphire::Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
+using namespace Sapphire::Common;
+
+std::string Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
 {
   std::string outStr;
 
@@ -17,26 +19,26 @@ std::string Sapphire::Util::binaryToHexString( uint8_t* pBinData, uint16_t size
   return outStr;
 
 }
-std::string Sapphire::Util::toLowerCopy( const std::string& inStr )
+std::string Util::toLowerCopy( const std::string& inStr )
 {
   std::string out = inStr;
   std::transform( inStr.begin(), inStr.end(), out.begin(), [](unsigned char c) -> unsigned char { return ::tolower(c); });
   return out;
 }
 
-void Sapphire::Util::eraseAll( std::string& inOutStr, char remove )
+void Util::eraseAll( std::string& inOutStr, char remove )
 {
   inOutStr.erase( std::remove( inOutStr.begin(), inOutStr.end(), remove ), inOutStr.end() );
 }
 
-void Sapphire::Util::eraseAllIn( std::string& inOutStr, std::string& remove )
+void Util::eraseAllIn( std::string& inOutStr, std::string& remove )
 {
   for( auto rem : remove )
     inOutStr.erase( std::remove( inOutStr.begin(), inOutStr.end(), rem ), inOutStr.end() );
 }
 
 
-std::string Sapphire::Util::intToHexString( uint64_t intValue, uint8_t width )
+std::string Util::intToHexString( uint64_t intValue, uint8_t width )
 {
     std::string hexStr;
 
@@ -51,7 +53,7 @@ std::string Sapphire::Util::intToHexString( uint64_t intValue, uint8_t width )
     return hexStr;
 }
 
-std::string Sapphire::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
+std::string Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
 {
   int bytesPerLine = 16;
   constexpr char hexChars[] = "0123456789ABCDEF";
@@ -112,25 +114,25 @@ std::string Sapphire::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
 
 }
 
-uint64_t Sapphire::Util::getTimeMs()
+uint64_t Util::getTimeMs()
 {
   std::chrono::milliseconds epoch = std::chrono::duration_cast< std::chrono::milliseconds >
     ( std::chrono::system_clock::now().time_since_epoch() );
   return epoch.count();
 }
 
-uint32_t Sapphire::Util::getTimeSeconds()
+uint32_t Util::getTimeSeconds()
 {
   auto currClock = std::chrono::system_clock::now();
   return std::chrono::time_point_cast< std::chrono::seconds >( currClock ).time_since_epoch().count();
 }
 
-uint64_t Sapphire::Util::getEorzeanTimeStamp()
+uint64_t Util::getEorzeanTimeStamp()
 {
   return static_cast< uint64_t >( getTimeSeconds() * 20.571428571428573f );
 }
 
-void Sapphire::Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex )
+void Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex )
 {
   uint32_t id = inVal;
   outIndex = id / 8;
diff --git a/src/common/Util/Util.h b/src/common/Util/Util.h
index 4c4a5a32..e42dd7ee 100644
--- a/src/common/Util/Util.h
+++ b/src/common/Util/Util.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <functional>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
 
   std::string binaryToHexString( uint8_t* pBinData, uint16_t size );
diff --git a/src/common/Util/UtilMath.cpp b/src/common/Util/UtilMath.cpp
index f2e8cc2c..a1e1a01e 100644
--- a/src/common/Util/UtilMath.cpp
+++ b/src/common/Util/UtilMath.cpp
@@ -1,7 +1,9 @@
 #include <cmath>
 #include "UtilMath.h"
 
-float Sapphire::Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 )
+using namespace Sapphire::Common;
+
+float Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 )
 {
   float deltaX = x - x1;
   float deltaY = y - y1;
@@ -10,29 +12,29 @@ float Sapphire::Util::distanceSq( float x, float y, float z, float x1, float y1,
   return ( deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ );
 }
 
-float Sapphire::Util::distance( float x, float y, float z, float x1, float y1, float z1 )
+float Util::distance( float x, float y, float z, float x1, float y1, float z1 )
 {
   return sqrtf( distanceSq( x, y, z, x1, y1, z1 ) );
 }
 
-float Sapphire::Util::distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 )
+float Util::distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 )
 {
   return sqrtf( distanceSq( pos1.x, pos1.y, pos1.z, pos2.x, pos2.y, pos2.z ) );
 }
 
-float Sapphire::Util::distance2DSq( float x, float y, float x1, float y1 )
+float Util::distance2DSq( float x, float y, float x1, float y1 )
 {
   float deltaX = x - x1;
   float deltaY = y - y1;
   return ( deltaX * deltaX + deltaY * deltaY );
 }
 
-float Sapphire::Util::distance2D( float x, float y, float x1, float y1 )
+float Util::distance2D( float x, float y, float x1, float y1 )
 {
   return sqrtf( distance2DSq( x, y, x1, y1 ) );
 }
 
-float Sapphire::Util::calcAngTo( float x, float y, float x1, float y1 )
+float Util::calcAngTo( float x, float y, float x1, float y1 )
 {
   float dx = x - x1;
   float dy = y - y1;
@@ -46,7 +48,7 @@ float Sapphire::Util::calcAngTo( float x, float y, float x1, float y1 )
   }
 }
 
-float Sapphire::Util::calcAngFrom( float x, float y, float x1, float y1 )
+float Util::calcAngFrom( float x, float y, float x1, float y1 )
 {
   float dx = x - x1;
   float dy = y - y1;
@@ -60,17 +62,17 @@ float Sapphire::Util::calcAngFrom( float x, float y, float x1, float y1 )
   }
 }
 
-uint16_t Sapphire::Util::floatToUInt16( float val )
+uint16_t Util::floatToUInt16( float val )
 {
   return static_cast< uint16_t >( 0x8000 + val * 32.767f );
 }
 
-uint16_t Sapphire::Util::floatToUInt16Rot( float val )
+uint16_t Util::floatToUInt16Rot( float val )
 {
   return static_cast< uint16_t >( 0x8000 * ( ( val + PI ) ) / PI );
 }
 
-uint8_t Sapphire::Util::floatToUInt8Rot( float val )
+uint8_t Util::floatToUInt8Rot( float val )
 {
   return static_cast< uint8_t >( 0x80 * ( ( val + PI ) ) / PI );
 }
\ No newline at end of file
diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h
index 5d34ee92..c35ef6be 100644
--- a/src/common/Util/UtilMath.h
+++ b/src/common/Util/UtilMath.h
@@ -5,7 +5,7 @@
 
 #define PI 3.14159265358979323846f
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
 
   float distanceSq( float x, float y, float z, float x1, float y1, float z1 );
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index 6bcb7122..42f0a3a2 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -36,8 +36,8 @@ namespace Sapphire::Network
 
     LobbySessionPtr m_pSession;
 
-    LockedQueue< Packets::GamePacketPtr > m_inQueue;
-    LockedQueue< Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index 2d217436..c1c7366c 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -48,7 +48,7 @@ uint8_t* Sapphire::Network::Packets::LobbyPacketContainer::getRawData( bool adds
   if( addstuff )
   {
     m_header.unknown_0 = 0xff41a05252;
-    m_header.timestamp = Sapphire::Util::getTimeMs();
+    m_header.timestamp = Common::Util::getTimeMs();
   }
   memcpy( m_dataBuf, &m_header, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   return m_dataBuf;
diff --git a/src/lobby/client_http.hpp b/src/lobby/client_http.hpp
index fc30d950..f22cb8d2 100644
--- a/src/lobby/client_http.hpp
+++ b/src/lobby/client_http.hpp
@@ -17,16 +17,16 @@
 class case_insensitive_equals {
 public:
   bool operator()(const std::string &key1, const std::string &key2) const {
-    return Sapphire::Util::toLowerCopy( key1 ) == Sapphire::Util::toLowerCopy( key2 );
+    return Sapphire::Common::Util::toLowerCopy( key1 ) == Sapphire::Common::Util::toLowerCopy( key2 );
   }
 };
 class case_insensitive_hash {
 public:
-  size_t operator()( const std::string &key ) const 
+  size_t operator()( const std::string &key ) const
   {
     std::size_t seed=0;
     for( auto &c : key )
-      Sapphire::Util::hashCombine< char >( seed, std::tolower( c ) );
+      Sapphire::Common::Util::hashCombine< char >( seed, std::tolower( c ) );
     return seed;
   }
 };
diff --git a/src/scripts/action/common/ActionReturn6.cpp b/src/scripts/action/common/ActionReturn6.cpp
index 9831c7e3..aedb0a38 100644
--- a/src/scripts/action/common/ActionReturn6.cpp
+++ b/src/scripts/action/common/ActionReturn6.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     if( !action.getSourceChara()->isPlayer() )
       return;
diff --git a/src/scripts/action/common/ActionSprint3.cpp b/src/scripts/action/common/ActionSprint3.cpp
index 0067dcac..133cbb2e 100644
--- a/src/scripts/action/common/ActionSprint3.cpp
+++ b/src/scripts/action/common/ActionSprint3.cpp
@@ -11,7 +11,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto sourceChara = action.getSourceChara();
 
diff --git a/src/scripts/action/common/ActionTeleport5.cpp b/src/scripts/action/common/ActionTeleport5.cpp
index e08afda6..1a2fcd77 100644
--- a/src/scripts/action/common/ActionTeleport5.cpp
+++ b/src/scripts/action/common/ActionTeleport5.cpp
@@ -14,7 +14,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto player = action.getSourceChara()->getAsPlayer();
 
diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
index 882d4549..3c3ef16f 100644
--- a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
+++ b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     if( auto player = action.getSourceChara()->getAsPlayer() )
       player->sendDebug( "Imagine you just hit an enemy for 150 potency. Incredible, right?" );
diff --git a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
index 9d6bc8a7..66284ecb 100644
--- a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
+++ b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
index 4d302333..3c369d1c 100644
--- a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     for( auto& chara : action.getHitCharas() )
     {
diff --git a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
index 6d76fdb0..1143c0f7 100644
--- a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto chara = action.getHitChara();
     chara->takeDamage( chara->getMaxHp() * 0.34f );
diff --git a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
index 6775947d..74cd54a0 100644
--- a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
index 3eb592df..1074da11 100644
--- a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
index e765f8d1..a1d18a74 100644
--- a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
index 2e735af6..5af2e472 100644
--- a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     for( auto& chara : action.getHitCharas() )
     {
diff --git a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
index 1e71dd2e..6ac1c92c 100644
--- a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
+++ b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index c48194d3..3adce507 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -257,14 +257,14 @@ int main()
 //    Logger::info( out );
   }
 
-  std::ifstream ifs( "ActionLut.cpp.tmpl" );
+  std::ifstream ifs( "ActionLutData.cpp.tmpl" );
 
   std::string actionTmpl( ( std::istreambuf_iterator< char >( ifs ) ),
                             std::istreambuf_iterator< char >() );
 
   auto result = std::regex_replace( actionTmpl, std::regex( "%INSERT_GARBAGE%" ), output );
 
-  std::ofstream outH( "ActionLut.cpp" );
+  std::ofstream outH( "ActionLutData.cpp" );
   outH << result;
   outH.close();
 
diff --git a/src/tools/discovery_parser/main.cpp b/src/tools/discovery_parser/main.cpp
index 41c833b6..0ded1f58 100644
--- a/src/tools/discovery_parser/main.cpp
+++ b/src/tools/discovery_parser/main.cpp
@@ -26,6 +26,8 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
+using namespace Sapphire;
+
 // garbage to ignore models
 bool ignoreModels = false;
 
@@ -165,7 +167,7 @@ std::string zoneNameToPath( const std::string& name )
       info.name = teriName;
       zoneInfoMap[ row.first ] = info;
 
-      if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) )
+      if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
       {
         found = true;
         path = teriPath;
@@ -177,7 +179,7 @@ std::string zoneNameToPath( const std::string& name )
   {
     for( const auto& entry : zoneInfoMap )
     {
-      if( found = Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( entry.second.name ) )
+      if( found = Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( entry.second.name ) )
       {
         path = entry.second.path;
         zoneId = entry.second.id;
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index 16ab9ab6..a4d451a9 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -62,7 +62,7 @@ std::string zoneNameToPath( const std::string& name )
 {
   std::string path;
 
-  auto it = g_nameMap.find( Sapphire::Util::toLowerCopy( name ) );
+  auto it = g_nameMap.find( Common::Util::toLowerCopy( name ) );
   if( it != g_nameMap.end() )
     return it->second;
 
@@ -79,7 +79,7 @@ std::string zoneNameToPath( const std::string& name )
     if( teriName.empty() )
       continue;
     
-    if( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) )
+    if( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) )
     {
       path = teriPath;
       break;
@@ -90,7 +90,7 @@ std::string zoneNameToPath( const std::string& name )
   {
     path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) );
     Logger::debug( "Found path for {0}: {1}", name, path );
-    g_nameMap[ Sapphire::Util::toLowerCopy( name ) ] = path; 
+    g_nameMap[ Common::Util::toLowerCopy( name ) ] = path;
   }
   else
   {
@@ -161,7 +161,7 @@ void loadAllInstanceContentEntries()
       name = name.replace( name.begin() + i, name.begin() + i + 1, { '_' } );
     
     std::string remove = ",★_ '()[]-\xae\x1a\x1\x2\x1f\x1\x3.:";
-    Sapphire::Util::eraseAllIn( name, remove );
+    Common::Util::eraseAllIn( name, remove );
     name[ 0 ] = toupper( name[ 0 ] );
     contentList.push_back( { contentId, name, tt->name, type } );
   }
@@ -332,7 +332,7 @@ int main( int argc, char* argv[] )
               {
                 name = eobjNameMap[ id ];
                 std::string remove = ",★_ '()[]-\xae\x1a\x1\x2\x1f\x1\x3.:";
-                Sapphire::Util::eraseAllIn( name, remove );
+                Common::Util::eraseAllIn( name, remove );
                 name[ 0 ] = toupper( name[ 0 ] );
               }
               if( name.empty() )
diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp
index a6c7fb60..43a27473 100644
--- a/src/tools/exd_common_gen/main.cpp
+++ b/src/tools/exd_common_gen/main.cpp
@@ -55,7 +55,7 @@ std::string generateEnum( const std::string& exd, int8_t nameIndex, const std::s
     }
 
     std::string remove = ",_-':!(){} \x02\x1f\x01\x03";
-    Sapphire::Util::eraseAllIn( value, remove );
+    Common::Util::eraseAllIn( value, remove );
 
     value[ 0 ] = std::toupper( value[ 0 ] );
 
diff --git a/src/tools/mob_parse/main.cpp b/src/tools/mob_parse/main.cpp
index 838ee51e..e8598da0 100644
--- a/src/tools/mob_parse/main.cpp
+++ b/src/tools/mob_parse/main.cpp
@@ -121,7 +121,7 @@ std::string binaryToHexString( uint8_t* pBinData, uint16_t size )
 
   for( uint32_t i = 0; i < size; i++ )
   {
-    outStr += Sapphire::Util::intToHexString( pBinData[ i ] & 0xFF );
+    outStr += Common::Util::intToHexString( pBinData[ i ] & 0xFF );
   }
 
   return outStr;
diff --git a/src/tools/nav_export/main.cpp b/src/tools/nav_export/main.cpp
index 043410a7..12e1c840 100644
--- a/src/tools/nav_export/main.cpp
+++ b/src/tools/nav_export/main.cpp
@@ -29,6 +29,8 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
+using namespace Sapphire;
+
 // garbage to ignore models
 bool noObj = false;
 
@@ -121,7 +123,7 @@ std::string zoneNameToPath( const std::string& name )
     if( teriName.empty() )
       continue;
     auto teriPath = std::get< std::string >( fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Path ) ) );
-    if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) )
+    if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
     {
       path = teriPath;
       found = true;
diff --git a/src/tools/pcb_reader/main.cpp b/src/tools/pcb_reader/main.cpp
index 7c922a12..f4d29d2a 100644
--- a/src/tools/pcb_reader/main.cpp
+++ b/src/tools/pcb_reader/main.cpp
@@ -29,6 +29,8 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
+using namespace Sapphire;
+
 // garbage to ignore models
 bool noObj = false;
 
@@ -123,7 +125,7 @@ std::string zoneNameToPath( const std::string& name )
     if( teriName.empty() )
       continue;
     auto teriPath = std::get< std::string >( fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Path ) ) );
-    if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) )
+    if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
     {
       path = teriPath;
       found = true;
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 7f04a63f..3c6da8c5 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -1,4 +1,5 @@
 #include "Action.h"
+#include "ActionLut.h"
 
 #include <Exd/ExdDataGenerated.h>
 #include <Util/Util.h>
@@ -26,16 +27,18 @@ using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
+using namespace Sapphire::World::Action;
 
-Sapphire::Action::Action::Action() = default;
-Sapphire::Action::Action::~Action() = default;
 
-Sapphire::Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
+Action::Action() = default;
+Action::~Action() = default;
+
+Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
                                   Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
 {
 }
 
-Sapphire::Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId,
+Action::Action( Entity::CharaPtr caster, uint32_t actionId,
                                   Data::ActionPtr actionData, FrameworkPtr fw ) :
                                   m_pSource( std::move( caster ) ),
                                   m_pFw( std::move( fw ) ),
@@ -47,12 +50,12 @@ Sapphire::Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId,
 {
 }
 
-uint32_t Sapphire::Action::Action::getId() const
+uint32_t Action::getId() const
 {
   return m_id;
 }
 
-bool Sapphire::Action::Action::init()
+bool Action::init()
 {
   if( !m_actionData )
   {
@@ -121,62 +124,62 @@ bool Sapphire::Action::Action::init()
   return true;
 }
 
-void Sapphire::Action::Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
+void Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
 {
   m_pos = pos;
 }
 
-Sapphire::Common::FFXIVARR_POSITION3 Sapphire::Action::Action::getPos() const
+Sapphire::Common::FFXIVARR_POSITION3 Action::getPos() const
 {
   return m_pos;
 }
 
-void Sapphire::Action::Action::setTargetId( uint64_t targetId )
+void Action::setTargetId( uint64_t targetId )
 {
   m_targetId = targetId;
 }
 
-uint64_t Sapphire::Action::Action::getTargetId() const
+uint64_t Action::getTargetId() const
 {
   return m_targetId;
 }
 
-bool Sapphire::Action::Action::hasClientsideTarget() const
+bool Action::hasClientsideTarget() const
 {
   return m_targetId > 0xFFFFFFFF;
 }
 
-bool Sapphire::Action::Action::isInterrupted() const
+bool Action::isInterrupted() const
 {
   return m_interruptType != Common::ActionInterruptType::None;
 }
 
-void Sapphire::Action::Action::setInterrupted( Common::ActionInterruptType type )
+void Action::setInterrupted( Common::ActionInterruptType type )
 {
   m_interruptType = type;
 }
 
-uint32_t Sapphire::Action::Action::getCastTime() const
+uint32_t Action::getCastTime() const
 {
   return m_castTimeMs;
 }
 
-void Sapphire::Action::Action::setCastTime( uint32_t castTime )
+void Action::setCastTime( uint32_t castTime )
 {
   m_castTimeMs = castTime;
 }
 
-bool Sapphire::Action::Action::hasCastTime() const
+bool Action::hasCastTime() const
 {
   return m_castTimeMs > 0;
 }
 
-Sapphire::Entity::CharaPtr Sapphire::Action::Action::getSourceChara() const
+Sapphire::Entity::CharaPtr Action::getSourceChara() const
 {
   return m_pSource;
 }
 
-bool Sapphire::Action::Action::update()
+bool Action::update()
 {
   // action has not been started yet
   if( m_startTime == 0 )
@@ -193,7 +196,7 @@ bool Sapphire::Action::Action::update()
     // todo: check if the target is still in range
   }
 
-  uint64_t tickCount = Util::getTimeMs();
+  uint64_t tickCount = Common::Util::getTimeMs();
 
   if( !hasCastTime() || std::difftime( tickCount, m_startTime ) > m_castTimeMs )
   {
@@ -204,11 +207,11 @@ bool Sapphire::Action::Action::update()
   return false;
 }
 
-void Sapphire::Action::Action::start()
+void Action::start()
 {
   assert( m_pSource );
 
-  m_startTime = Util::getTimeMs();
+  m_startTime = Common::Util::getTimeMs();
 
   auto player = m_pSource->getAsPlayer();
 
@@ -238,6 +241,9 @@ void Sapphire::Action::Action::start()
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   if( !pScriptMgr->onStart( *this ) )
   {
+    // check the lut initially and see if we have something usable, otherwise cancel the cast
+//    Sapphire::World::Action::ActionLut::validEntryExists( getId() );
+
     // script not implemented
     interrupt();
 
@@ -255,7 +261,7 @@ void Sapphire::Action::Action::start()
     execute();
 }
 
-void Sapphire::Action::Action::interrupt()
+void Action::interrupt()
 {
   assert( m_pSource );
 
@@ -289,7 +295,7 @@ void Sapphire::Action::Action::interrupt()
   pScriptMgr->onInterrupt( *this );
 }
 
-void Sapphire::Action::Action::execute()
+void Action::execute()
 {
   assert( m_pSource );
 
@@ -346,7 +352,7 @@ void Sapphire::Action::Action::execute()
   }
 }
 
-bool Sapphire::Action::Action::precheck()
+bool Action::precheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
   {
@@ -357,7 +363,7 @@ bool Sapphire::Action::Action::precheck()
   return true;
 }
 
-bool Sapphire::Action::Action::playerPrecheck( Entity::Player& player )
+bool Action::playerPrecheck( Entity::Player& player )
 {
   // lol
   if( !player.isAlive() )
@@ -408,17 +414,17 @@ bool Sapphire::Action::Action::playerPrecheck( Entity::Player& player )
   return true;
 }
 
-uint32_t Sapphire::Action::Action::getAdditionalData() const
+uint32_t Action::getAdditionalData() const
 {
   return m_additionalData;
 }
 
-void Sapphire::Action::Action::setAdditionalData( uint32_t data )
+void Action::setAdditionalData( uint32_t data )
 {
   m_additionalData = data;
 }
 
-bool Sapphire::Action::Action::isComboAction() const
+bool Action::isComboAction() const
 {
   auto lastActionId = m_pSource->getLastComboActionId();
 
@@ -430,7 +436,7 @@ bool Sapphire::Action::Action::isComboAction() const
   return m_actionData->actionCombo == lastActionId;
 }
 
-bool Sapphire::Action::Action::primaryCostCheck( bool subtractCosts )
+bool Action::primaryCostCheck( bool subtractCosts )
 {
   switch( m_primaryCostType )
   {
@@ -473,23 +479,23 @@ bool Sapphire::Action::Action::primaryCostCheck( bool subtractCosts )
   }
 }
 
-bool Sapphire::Action::Action::secondaryCostCheck( bool subtractCosts )
+bool Action::secondaryCostCheck( bool subtractCosts )
 {
   // todo: these need to be mapped
   return true;
 }
 
-bool Sapphire::Action::Action::hasResources()
+bool Action::hasResources()
 {
   return primaryCostCheck( false ) && secondaryCostCheck( false );
 }
 
-bool Sapphire::Action::Action::consumeResources()
+bool Action::consumeResources()
 {
   return primaryCostCheck( true ) && secondaryCostCheck( true );
 }
 
-bool Sapphire::Action::Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
+bool Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
 {
   for( const auto& actor : m_pSource->getInRangeActors( true ) )
   {
@@ -519,12 +525,12 @@ bool Sapphire::Action::Action::snapshotAffectedActors( std::vector< Entity::Char
   return !actors.empty();
 }
 
-void Sapphire::Action::Action::addActorFilter( World::Util::ActorFilterPtr filter )
+void Action::addActorFilter( World::Util::ActorFilterPtr filter )
 {
   m_actorFilters.push_back( std::move( filter ) );
 }
 
-void Sapphire::Action::Action::addDefaultActorFilters()
+void Action::addDefaultActorFilters()
 {
   switch( m_castType )
   {
@@ -561,7 +567,7 @@ void Sapphire::Action::Action::addDefaultActorFilters()
   }
 }
 
-bool Sapphire::Action::Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
+bool Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
 {
   auto kind = actor.getObjKind();
 
@@ -574,12 +580,12 @@ bool Sapphire::Action::Action::preFilterActor( Sapphire::Entity::Actor& actor )
   return true;
 }
 
-std::vector< Sapphire::Entity::CharaPtr >& Sapphire::Action::Action::getHitCharas()
+std::vector< Sapphire::Entity::CharaPtr >& Action::getHitCharas()
 {
   return m_hitActors;
 }
 
-Sapphire::Entity::CharaPtr Sapphire::Action::Action::getHitChara()
+Sapphire::Entity::CharaPtr Action::getHitChara()
 {
   if( !m_hitActors.empty() )
   {
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index e1c57d2d..b4b12363 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -11,7 +11,7 @@ namespace Sapphire::Data
   using ActionPtr = std::shared_ptr< Action >;
 }
 
-namespace Sapphire::Action
+namespace Sapphire::World::Action
 {
 
   class Action
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index 349e9040..18c8d993 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -11,15 +11,16 @@
 #include "EventAction.h"
 #include "Framework.h"
 
+using namespace Sapphire::World;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
-Sapphire::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
-                                            ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional,
-                                            FrameworkPtr pFw )
+Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
+                                  ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional,
+                                  FrameworkPtr pFw )
 {
   m_additional = additional;
   m_eventId = eventId;
@@ -33,14 +34,14 @@ Sapphire::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t ev
   m_interruptType = Common::ActionInterruptType::None;
 }
 
-Sapphire::Action::EventAction::~EventAction() = default;
+Action::EventAction::~EventAction() = default;
 
-void Sapphire::Action::EventAction::start()
+void Action::EventAction::start()
 {
   if( !m_pSource )
     return;
 
-  m_startTime = Util::getTimeMs();
+  m_startTime = Common::Util::getTimeMs();
 
   auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastStart, 1, m_id, 0x4000004E );
 
@@ -54,7 +55,7 @@ void Sapphire::Action::EventAction::start()
     m_pSource->sendToInRangeSet( control );
 }
 
-void Sapphire::Action::EventAction::execute()
+void Action::EventAction::execute()
 {
   if( !m_pSource )
     return;
@@ -90,7 +91,7 @@ void Sapphire::Action::EventAction::execute()
 
 }
 
-void Sapphire::Action::EventAction::interrupt()
+void Action::EventAction::interrupt()
 {
   if( !m_pSource )
     return;
diff --git a/src/world/Action/EventAction.h b/src/world/Action/EventAction.h
index 37987634..4a9bb50a 100644
--- a/src/world/Action/EventAction.h
+++ b/src/world/Action/EventAction.h
@@ -6,7 +6,7 @@
 #include "ForwardsZone.h"
 #include "Action.h"
 
-namespace Sapphire::Action
+namespace Sapphire::World::Action
 {
 
 class EventAction : public Action
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index d2eac841..3942f112 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -391,13 +391,13 @@ void Sapphire::Entity::Chara::sendStatusUpdate()
 }
 
 /*! \return ActionPtr of the currently registered action, or nullptr */
-Sapphire::Action::ActionPtr Sapphire::Entity::Chara::getCurrentAction() const
+Sapphire::World::Action::ActionPtr Sapphire::Entity::Chara::getCurrentAction() const
 {
   return m_pCurrentAction;
 }
 
 /*! \param ActionPtr of the action to be registered */
-void Sapphire::Entity::Chara::setCurrentAction( Sapphire::Action::ActionPtr pAction )
+void Sapphire::Entity::Chara::setCurrentAction( Sapphire::World::Action::ActionPtr pAction )
 {
   m_pCurrentAction = std::move( pAction );
 }
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 5679b2cb..83d14fb6 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -102,7 +102,7 @@ namespace Sapphire::Entity
     /*! Id of the currently selected target actor */
     uint64_t m_targetId;
     /*! Ptr to a queued action */
-    Action::ActionPtr m_pCurrentAction;
+    World::Action::ActionPtr m_pCurrentAction;
     /*! id of the director this chara is assigned to */
     uint32_t m_directorId;
 
@@ -265,9 +265,9 @@ namespace Sapphire::Entity
 
     virtual void update( uint64_t tickCount );
 
-    Action::ActionPtr getCurrentAction() const;
+    World::Action::ActionPtr getCurrentAction() const;
 
-    void setCurrentAction( Action::ActionPtr pAction );
+    void setCurrentAction( World::Action::ActionPtr pAction );
 
     uint32_t getLastComboActionId() const;
     void setLastComboActionId( uint32_t actionId );
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 362dfa0e..f4abe67c 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1621,7 +1621,7 @@ void Sapphire::Entity::Player::setCFPenaltyTimestamp( uint32_t timestamp )
 
 uint32_t Sapphire::Entity::Player::getCFPenaltyMinutes() const
 {
-  auto currentTimestamp = Sapphire::Util::getTimeSeconds();
+  auto currentTimestamp = Common::Util::getTimeSeconds();
   auto endTimestamp = getCFPenaltyTimestamp();
 
   // check if penalty timestamp already passed current time
@@ -1634,7 +1634,7 @@ uint32_t Sapphire::Entity::Player::getCFPenaltyMinutes() const
 
 void Sapphire::Entity::Player::setCFPenaltyMinutes( uint32_t minutes )
 {
-  auto currentTimestamp = Sapphire::Util::getTimeSeconds();
+  auto currentTimestamp = Common::Util::getTimeSeconds();
   setCFPenaltyTimestamp( currentTimestamp + minutes * 60 );
 }
 
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 3fbf9f88..e277738a 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -53,12 +53,12 @@ namespace Sapphire::Entity
     // EventHandlers
     //////////////////////////////////////////////////////////////////////////////////////////////////////
     /*! start an event action */
-    void eventActionStart( uint32_t eventId, uint32_t action, Action::ActionCallback finishCallback,
-                           Action::ActionCallback interruptCallback, uint64_t additional );
+    void eventActionStart( uint32_t eventId, uint32_t action, World::Action::ActionCallback finishCallback,
+                           World::Action::ActionCallback interruptCallback, uint64_t additional );
 
     /*! start an event item action */
-    void eventItemActionStart( uint32_t eventId, uint32_t action, Action::ActionCallback finishCallback,
-                               Action::ActionCallback interruptCallback, uint64_t additional );
+    void eventItemActionStart( uint32_t eventId, uint32_t action, World::Action::ActionCallback finishCallback,
+                               World::Action::ActionCallback interruptCallback, uint64_t additional );
 
     /*! start/register a normal event */
     void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1,
@@ -1107,8 +1107,8 @@ namespace Sapphire::Entity
 
     Common::PlayerTeleportQuery m_teleportQuery;
 
-    Util::SpawnIndexAllocator< uint8_t > m_objSpawnIndexAllocator;
-    Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
+    Common::Util::SpawnIndexAllocator< uint8_t > m_objSpawnIndexAllocator;
+    Common::Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
 
     std::array< Common::HuntingLogEntry, 12 > m_huntingLogEntries;
 
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index f264d180..91c9060f 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -278,11 +278,11 @@ void Sapphire::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlaye
 
 void Sapphire::Entity::Player::eventActionStart( uint32_t eventId,
                                                  uint32_t action,
-                                                 Action::ActionCallback finishCallback,
-                                                 Action::ActionCallback interruptCallback,
+                                                 World::Action::ActionCallback finishCallback,
+                                                 World::Action::ActionCallback interruptCallback,
                                                  uint64_t additional )
 {
-  auto pEventAction = Action::make_EventAction( getAsChara(), eventId, action,
+  auto pEventAction = World::Action::make_EventAction( getAsChara(), eventId, action,
                                                 finishCallback, interruptCallback, additional, m_pFw );
 
   auto pEvent = getEvent( eventId );
@@ -309,8 +309,8 @@ void Sapphire::Entity::Player::eventActionStart( uint32_t eventId,
 
 void Sapphire::Entity::Player::eventItemActionStart( uint32_t eventId,
                                                      uint32_t action,
-                                                     Action::ActionCallback finishCallback,
-                                                     Action::ActionCallback interruptCallback,
+                                                     World::Action::ActionCallback finishCallback,
+                                                     World::Action::ActionCallback interruptCallback,
                                                      uint64_t additional )
 {
 //  Action::ActionPtr pEventItemAction = Action::make_EventItemAction( getAsChara(), eventId, action,
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index a432cac1..08de6d59 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -82,7 +82,7 @@ TYPE_FORWARD( Director );
 TYPE_FORWARD( EventHandler );
 }
 
-namespace Action
+namespace World::Action
 {
 TYPE_FORWARD( Action );
 TYPE_FORWARD( EventAction );
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index f414c1bd..933b7d94 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -683,7 +683,7 @@ void Sapphire::World::Manager::DebugCommandMgr::nudge( char* data, Entity::Playe
     setActorPosPacket->data().x = player.getPos().x;
     setActorPosPacket->data().y = player.getPos().y;
     setActorPosPacket->data().z = player.getPos().z;
-    setActorPosPacket->data().r16 = Util::floatToUInt16Rot( player.getRot() );
+    setActorPosPacket->data().r16 = Common::Util::floatToUInt16Rot( player.getRot() );
     player.queuePacket( setActorPosPacket );
   }
 }
diff --git a/src/world/Manager/MarketMgr.cpp b/src/world/Manager/MarketMgr.cpp
index 9b62e534..1ad81cf9 100644
--- a/src/world/Manager/MarketMgr.cpp
+++ b/src/world/Manager/MarketMgr.cpp
@@ -83,7 +83,7 @@ void Sapphire::World::Manager::MarketMgr::requestItemListingInfo( Sapphire::Enti
 
     listing.itemCatalogId = catalogId;
     listing.quantity = i + 1;
-    listing.purchaseTime = Sapphire::Util::getTimeSeconds();
+    listing.purchaseTime = Common::Util::getTimeSeconds();
     listing.salePrice = 69420420;
     listing.isHq = 1;
     listing.onMannequin = 1;
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 799835bb..7109b2ba 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -424,7 +424,7 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
 
         auto pe = std::make_shared< FFXIVRawPacket >( 0x07, 0x18, 0, 0 );
         *( unsigned int* ) ( &pe->data()[ 0 ] ) = 0xE0037603;
-        *( unsigned int* ) ( &pe->data()[ 4 ] ) = Sapphire::Util::getTimeSeconds();
+        *( unsigned int* ) ( &pe->data()[ 4 ] ) = Common::Util::getTimeSeconds();
         sendSinglePacket( pe );
 
         // main connection, assinging it to the session
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 61be56c5..56a8fc5d 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -51,8 +51,8 @@ namespace Sapphire::Network
 
     World::SessionPtr m_pSession;
 
-    LockedQueue< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
-    LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
+    Common::Util::LockedQueue< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
+    Common::Util::LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index afb97b0b..ba97168b 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -393,7 +393,7 @@ void Sapphire::Network::GameConnection::pingHandler( FrameworkPtr pFw,
 
   queueOutPacket( std::make_shared< Server::PingPacket >( player, packet.data().timestamp ) );
 
-  player.setLastPing( Sapphire::Util::getTimeSeconds() );
+  player.setLastPing( Common::Util::getTimeSeconds() );
 }
 
 
diff --git a/src/world/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h
index 78718b41..9cf724fc 100644
--- a/src/world/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/world/Network/PacketWrappers/MoveActorPacket.h
@@ -28,15 +28,15 @@ namespace Sapphire::Network::Packets::Server
     void initialize( Entity::Chara& actor, uint8_t headRotation, uint8_t animationType, uint8_t state, uint16_t animationSpeed, uint8_t unknownRotation )
     {
 
-      m_data.rotation = Util::floatToUInt8Rot( actor.getRot() );
+      m_data.rotation = Common::Util::floatToUInt8Rot( actor.getRot() );
       m_data.headRotation = headRotation;
       m_data.animationType = animationType;
       m_data.animationState = state;
       m_data.animationSpeed = animationSpeed;
       m_data.unknownRotation = unknownRotation;
-      m_data.posX = Util::floatToUInt16( actor.getPos().x );
-      m_data.posY = Util::floatToUInt16( actor.getPos().y );
-      m_data.posZ = Util::floatToUInt16( actor.getPos().z );
+      m_data.posX = Common::Util::floatToUInt16( actor.getPos().x );
+      m_data.posY = Common::Util::floatToUInt16( actor.getPos().y );
+      m_data.posZ = Common::Util::floatToUInt16( actor.getPos().z );
 
     };
   };
diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
index 8f952c77..3cc99f89 100644
--- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
@@ -49,7 +49,7 @@ namespace Sapphire::Network::Packets::Server
       m_data.pos.x = bnpc.getPos().x;
       m_data.pos.y = bnpc.getPos().y;
       m_data.pos.z = bnpc.getPos().z;
-      m_data.rotation = Util::floatToUInt16Rot( bnpc.getRot() );
+      m_data.rotation = Common::Util::floatToUInt16Rot( bnpc.getRot() );
       m_data.levelId = bnpc.getLevelId();
 
       m_data.enemyType = bnpc.getEnemyType();
@@ -87,7 +87,7 @@ namespace Sapphire::Network::Packets::Server
 
       m_data.targetId = static_cast< uint64_t >( bnpc.getTargetId() );
 
-      uint64_t currentTimeMs = Sapphire::Util::getTimeMs();
+      uint64_t currentTimeMs = Common::Util::getTimeMs();
 
       for( auto const& effect : bnpc.getStatusEffectMap() )
       {
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index 14e16754..4f384356 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -69,7 +69,7 @@ namespace Sapphire::Network::Packets::Server
       m_data.pos.x = player.getPos().x;
       m_data.pos.y = player.getPos().y;
       m_data.pos.z = player.getPos().z;
-      m_data.rotation = Util::floatToUInt16Rot( player.getRot() );
+      m_data.rotation = Common::Util::floatToUInt16Rot( player.getRot() );
 
 
       m_data.title = player.getTitle();
@@ -133,7 +133,7 @@ namespace Sapphire::Network::Packets::Server
       //m_data.unknown_60 = 3;
       //m_data.unknown_61 = 7;
 
-      uint64_t currentTimeMs = Sapphire::Util::getTimeMs();
+      uint64_t currentTimeMs = Common::Util::getTimeMs();
 
       for( auto const& effect : player.getStatusEffectMap() )
       {
diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
index 75d63621..d6dce0f6 100644
--- a/src/world/Script/NativeScriptApi.cpp
+++ b/src/world/Script/NativeScriptApi.cpp
@@ -83,20 +83,20 @@ namespace Sapphire::ScriptAPI
 
   ///////////////////////////////////////////////////////////////////
 
-  ActionScript::ActionScript( uint32_t abilityId ) :
-    ScriptObject( abilityId, typeid( ActionScript ).hash_code() )
+  ActionScript::ActionScript( uint32_t actionId ) :
+    ScriptObject( actionId, typeid( ActionScript ).hash_code() )
   {
   }
 
-  void ActionScript::onStart( Sapphire::Action::Action& action )
+  void ActionScript::onStart( Sapphire::World::Action::Action& action )
   {
   }
 
-  void ActionScript::onExecute( Sapphire::Action::Action& action )
+  void ActionScript::onExecute( Sapphire::World::Action::Action& action )
   {
   }
 
-  void ActionScript::onInterrupt( Sapphire::Action::Action& action )
+  void ActionScript::onInterrupt( Sapphire::World::Action::Action& action )
   {
   }
 
diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
index 4d31b5df..d7b33d00 100644
--- a/src/world/Script/NativeScriptApi.h
+++ b/src/world/Script/NativeScriptApi.h
@@ -138,13 +138,13 @@ namespace Sapphire::ScriptAPI
   class ActionScript :  public ScriptObject
   {
   public:
-    explicit ActionScript( uint32_t abilityId );
+    explicit ActionScript( uint32_t actionId );
 
-    virtual void onStart( Sapphire::Action::Action& action );
+    virtual void onStart( Sapphire::World::Action::Action& action );
 
-    virtual void onExecute( Sapphire::Action::Action& action );
+    virtual void onExecute( Sapphire::World::Action::Action& action );
 
-    virtual void onInterrupt( Sapphire::Action::Action& action );
+    virtual void onInterrupt( Sapphire::World::Action::Action& action );
   };
 
   /*!
diff --git a/src/world/Script/ScriptLoader.cpp b/src/world/Script/ScriptLoader.cpp
index f670c05c..ab72f61f 100644
--- a/src/world/Script/ScriptLoader.cpp
+++ b/src/world/Script/ScriptLoader.cpp
@@ -154,7 +154,7 @@ bool Sapphire::Scripting::ScriptLoader::isModuleLoaded( std::string name )
   for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it )
   {
 
-    if( Util::toLowerCopy( it->second->library_name ) == Util::toLowerCopy( name ) )
+    if( Common::Util::toLowerCopy( it->second->library_name ) == Common::Util::toLowerCopy( name ) )
       return true;
   }
 
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index bb2a86e2..4b7bd27c 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -329,7 +329,7 @@ bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player
   return didCallScript;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onExecute( Action::Action& action )
+bool Sapphire::Scripting::ScriptMgr::onExecute( World::Action::Action& action )
 {
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( action.getId() );
 
@@ -341,7 +341,7 @@ bool Sapphire::Scripting::ScriptMgr::onExecute( Action::Action& action )
   return false;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onInterrupt( Action::Action& action )
+bool Sapphire::Scripting::ScriptMgr::onInterrupt( World::Action::Action& action )
 {
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( action.getId() );
 
@@ -353,7 +353,7 @@ bool Sapphire::Scripting::ScriptMgr::onInterrupt( Action::Action& action )
   return false;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onStart( Action::Action& action )
+bool Sapphire::Scripting::ScriptMgr::onStart( World::Action::Action& action )
 {
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( action.getId() );
 
diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
index 546ec425..94bc8067 100644
--- a/src/world/Script/ScriptMgr.h
+++ b/src/world/Script/ScriptMgr.h
@@ -72,11 +72,11 @@ namespace Sapphire::Scripting
 
     bool onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId );
 
-    bool onStart( Action::Action& action );
+    bool onStart( World::Action::Action& action );
 
-    bool onInterrupt( Action::Action& action );
+    bool onInterrupt( World::Action::Action& action );
 
-    bool onExecute( Action::Action& action );
+    bool onExecute( World::Action::Action& action );
 
     bool onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId );
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 71cef6a0..1929c765 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -270,8 +270,8 @@ void Sapphire::World::ServerMgr::mainLoop()
   {
     std::this_thread::sleep_for( std::chrono::milliseconds( 50 ) );
 
-    auto currTime = Util::getTimeSeconds();
-    auto tickCount = Util::getTimeMs();
+    auto currTime = Common::Util::getTimeSeconds();
+    auto tickCount = Common::Util::getTimeMs();
 
     pTeriMgr->updateTerritoryInstances( tickCount );
 
diff --git a/src/world/Session.cpp b/src/world/Session.cpp
index 6e612421..b1e2c615 100644
--- a/src/world/Session.cpp
+++ b/src/world/Session.cpp
@@ -14,8 +14,8 @@ namespace fs = std::experimental::filesystem;
 
 Sapphire::World::Session::Session( uint32_t sessionId, FrameworkPtr pFw ) :
   m_sessionId( sessionId ),
-  m_lastDataTime( Util::getTimeSeconds() ),
-  m_lastSqlTime( Util::getTimeSeconds() ),
+  m_lastDataTime( Common::Util::getTimeSeconds() ),
+  m_lastSqlTime( Common::Util::getTimeSeconds() ),
   m_isValid( false ),
   m_pFw( std::move( pFw ) ),
   m_isReplaying( false )
@@ -102,12 +102,12 @@ bool Sapphire::World::Session::isValid() const
 
 void Sapphire::World::Session::updateLastDataTime()
 {
-  m_lastDataTime = Util::getTimeSeconds();
+  m_lastDataTime = Common::Util::getTimeSeconds();
 }
 
 void Sapphire::World::Session::updateLastSqlTime()
 {
-  m_lastSqlTime = Util::getTimeSeconds();
+  m_lastSqlTime = Common::Util::getTimeSeconds();
 }
 
 void Sapphire::World::Session::startReplay( const std::string& path )
@@ -146,7 +146,7 @@ void Sapphire::World::Session::startReplay( const std::string& path )
   for( auto set : loadedSets )
   {
     m_replayCache.push_back( std::tuple< uint64_t, std::string >(
-      Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
+      Common::Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
 
     Logger::info( "Registering {0} for {1}", std::get< 1 >( set ), std::get< 0 >( set ) - startTime );
   }
@@ -166,7 +166,7 @@ void Sapphire::World::Session::processReplay()
   int at = 0;
   for( const auto& set : m_replayCache )
   {
-    if( std::get< 0 >( set ) <= Util::getTimeMs() )
+    if( std::get< 0 >( set ) <= Common::Util::getTimeMs() )
     {
       m_pZoneConnection->injectPacket( std::get< 1 >( set ), *getPlayer().get() );
       m_replayCache.erase( m_replayCache.begin() + at );
@@ -201,9 +201,9 @@ void Sapphire::World::Session::update()
     m_pZoneConnection->processInQueue();
 
     // SESSION LOGIC
-    m_pPlayer->update( Util::getTimeMs() );
+    m_pPlayer->update( Common::Util::getTimeMs() );
 
-    if( Util::getTimeSeconds() - static_cast< uint32_t >( getLastSqlTime() ) > 10 )
+    if( Common::Util::getTimeSeconds() - static_cast< uint32_t >( getLastSqlTime() ) > 10 )
     {
       updateLastSqlTime();
       m_pPlayer->updateSql();
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index 339f6399..e0a159c4 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -419,7 +419,7 @@ void Sapphire::Zone::updateBNpcs( uint64_t tickCount )
     return;
 
   m_lastMobUpdate = tickCount;
-  uint64_t currTime = Sapphire::Util::getTimeSeconds();
+  uint64_t currTime = Common::Util::getTimeSeconds();
 
   for( const auto& entry : m_bNpcMap )
   {
diff --git a/src/world/Util/ActorFilter.cpp b/src/world/Util/ActorFilter.cpp
index 4714e1d7..f15b074e 100644
--- a/src/world/Util/ActorFilter.cpp
+++ b/src/world/Util/ActorFilter.cpp
@@ -13,7 +13,7 @@ Sapphire::World::Util::ActorFilterInRange::ActorFilterInRange( Common::FFXIVARR_
 
 bool Sapphire::World::Util::ActorFilterInRange::conditionApplies( const Entity::Actor& actor )
 {
-  return Sapphire::Util::distance( m_startPos, actor.getPos() ) <= m_range;
+  return Sapphire::Common::Util::distance( m_startPos, actor.getPos() ) <= m_range;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////

From 86517c53eac5b3c43618437d0138351a428f8fb1 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 02:30:54 +1000
Subject: [PATCH 03/10] somewhat working action lut stuff

---
 .../archer/ActionHeavyShot97.cpp              | 23 ---------
 .../playeractions/conjurer/ActionCure120.cpp  | 22 --------
 .../darkknight/ActionAbyssalDrain3641.cpp     | 24 ---------
 .../darkknight/ActionHardSlash3617.cpp        | 23 ---------
 .../darkknight/ActionPowerSlash3627.cpp       | 22 --------
 .../darkknight/ActionSpinningSlash3619.cpp    | 22 --------
 .../darkknight/ActionSyphonStrike3623.cpp     | 22 --------
 .../darkknight/ActionUnleash3621.cpp          | 24 ---------
 .../whitemage/ActionAsylum3569.cpp            | 22 --------
 src/world/Action/Action.cpp                   | 50 +++++++++++--------
 src/world/Action/Action.h                     |  4 +-
 src/world/Action/ActionLut.cpp                | 10 ++++
 src/world/Action/ActionLut.h                  |  1 +
 src/world/Manager/ActionMgr.cpp               |  2 +-
 14 files changed, 44 insertions(+), 227 deletions(-)
 delete mode 100644 src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
 delete mode 100644 src/scripts/action/playeractions/conjurer/ActionCure120.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
 delete mode 100644 src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp

diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
deleted file mode 100644
index 3c3ef16f..00000000
--- a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionHeavyShot97 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionHeavyShot97() :
-    Sapphire::ScriptAPI::ActionScript( 97 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    if( auto player = action.getSourceChara()->getAsPlayer() )
-      player->sendDebug( "Imagine you just hit an enemy for 150 potency. Incredible, right?" );
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionHeavyShot97 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
deleted file mode 100644
index 66284ecb..00000000
--- a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionCure120 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionCure120() :
-    Sapphire::ScriptAPI::ActionScript( 120 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionCure120 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
deleted file mode 100644
index 3c369d1c..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionAbyssalDrain3641 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionAbyssalDrain3641() :
-    Sapphire::ScriptAPI::ActionScript( 3641 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    for( auto& chara : action.getHitCharas() )
-    {
-      chara->takeDamage( chara->getMaxHp() * 0.5f );
-    }
-  }
-};
-
-EXPOSE_SCRIPT( ActionAbyssalDrain3641 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
deleted file mode 100644
index 1143c0f7..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionHardSlash3617 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionHardSlash3617() :
-    Sapphire::ScriptAPI::ActionScript( 3617 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    auto chara = action.getHitChara();
-    chara->takeDamage( chara->getMaxHp() * 0.34f );
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionHardSlash3617 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
deleted file mode 100644
index 74cd54a0..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionPowerSlash3627 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionPowerSlash3627() :
-    Sapphire::ScriptAPI::ActionScript( 3627 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionPowerSlash3627 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
deleted file mode 100644
index 1074da11..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionSpinningSlash3619 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionSpinningSlash3619() :
-    Sapphire::ScriptAPI::ActionScript( 3619 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionSpinningSlash3619 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
deleted file mode 100644
index a1d18a74..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionSyphonStrike3623 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionSyphonStrike3623() :
-    Sapphire::ScriptAPI::ActionScript( 3623 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionSyphonStrike3623 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
deleted file mode 100644
index 5af2e472..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionUnleash3621 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionUnleash3621() :
-    Sapphire::ScriptAPI::ActionScript( 3621 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    for( auto& chara : action.getHitCharas() )
-    {
-      chara->takeDamage( chara->getMaxHp() * 0.34f );
-    }
-  }
-};
-
-EXPOSE_SCRIPT( ActionUnleash3621 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
deleted file mode 100644
index 6ac1c92c..00000000
--- a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionAsylum3569 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionAsylum3569() :
-    Sapphire::ScriptAPI::ActionScript( 3569 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionAsylum3569 );
\ No newline at end of file
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 3c6da8c5..676c5e95 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -239,17 +239,16 @@ void Action::start()
   player->queuePacket( actionStartPkt );
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  if( !pScriptMgr->onStart( *this ) )
-  {
-    // check the lut initially and see if we have something usable, otherwise cancel the cast
-//    Sapphire::World::Action::ActionLut::validEntryExists( getId() );
 
-    // script not implemented
+  // check the lut too and see if we have something usable, otherwise cancel the cast
+  if( !pScriptMgr->onStart( *this ) && !ActionLut::validEntryExists( getId() ) )
+  {
+    // script not implemented and insufficient lut data (no potencies)
     interrupt();
 
     if( player )
     {
-      player->sendUrgent( "Action not implemented, missing script for action#{0}", getId() );
+      player->sendUrgent( "Action not implemented, missing script/lut entry for action#{0}", getId() );
       player->setCurrentAction( nullptr );
     }
 
@@ -335,7 +334,17 @@ void Action::execute()
     if( !m_hitActors.empty() )
     {
       // only call script if actors are hit
-      pScriptMgr->onExecute( *this );
+      if( !pScriptMgr->onExecute( *this ) && ActionLut::validEntryExists( getId() ) )
+      {
+        auto lutEntry = ActionLut::getEntry( getId() );
+
+        // no script exists but we have a valid lut entry
+        if( auto player = getSourceChara()->getAsPlayer() )
+        {
+          player->sendDebug( "Hit target: pot: {} (f: {}, r: {}), heal pot: {}",
+                             lutEntry.potency, lutEntry.flankPotency, lutEntry.rearPotency, lutEntry.curePotency );
+        }
+      }
     }
   }
   else if( auto player = m_pSource->getAsPlayer() )
@@ -352,18 +361,18 @@ void Action::execute()
   }
 }
 
-bool Action::precheck()
+bool Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
   {
-    if( !playerPrecheck( *player ) )
+    if( !playerPreCheck( *player ) )
       return false;
   }
 
   return true;
 }
 
-bool Action::playerPrecheck( Entity::Player& player )
+bool Action::playerPreCheck( Entity::Player& player )
 {
   // lol
   if( !player.isAlive() )
@@ -393,17 +402,18 @@ bool Action::playerPrecheck( Entity::Player& player )
       return false;
   }
 
-  // reset target on actions that can only be casted on yourself while having a target set
-  // todo: check what actions send when targeting an enemy
-//  if( m_actionData->canTargetSelf &&
-//      !m_actionData->canTargetFriendly &&
-//      !m_actionData->canTargetHostile &&
-//      !m_actionData->canTargetParty )
-//  {
-//    setTargetId( getSourceChara() );
-//  }
+  if( !m_actionData->canTargetSelf && getTargetId() == m_pSource->getId() )
+    return false;
 
-  // todo: party/enemy validation
+  // todo: does this need to check for party/alliance stuff or it's just same type?
+  // todo: m_pTarget doesn't exist at this stage because we only fill it when we snapshot targets
+//  if( !m_actionData->canTargetFriendly && m_pSource->getObjKind() == m_pTarget->getObjKind() )
+//    return false;
+//
+//  if( !m_actionData->canTargetHostile && m_pSource->getObjKind() != m_pTarget->getObjKind() )
+//    return false;
+
+  // todo: party/dead validation
 
   // validate range
 
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index b4b12363..9f6671ad 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -75,7 +75,7 @@ namespace Sapphire::World::Action
      * @brief Tests if an action is castable by the current source chara
      * @return true if castable, false if the caster doesn't meet the requirements
      */
-    bool precheck();
+    bool preCheck();
 
     /*!
      * @brief Snapshots characters affected by a cast.
@@ -135,7 +135,7 @@ namespace Sapphire::World::Action
     bool primaryCostCheck( bool subtractCosts );
     bool secondaryCostCheck( bool subtractCosts );
 
-    bool playerPrecheck( Entity::Player& player );
+    bool playerPreCheck( Entity::Player& player );
 
     bool preFilterActor( Entity::Actor& actor ) const;
 
diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp
index 9c33bb96..16598e8e 100644
--- a/src/world/Action/ActionLut.cpp
+++ b/src/world/Action/ActionLut.cpp
@@ -1,3 +1,4 @@
+#include <cassert>
 #include "ActionLut.h"
 
 using namespace Sapphire::World::Action;
@@ -14,4 +15,13 @@ bool ActionLut::validEntryExists( uint16_t actionId )
   // if all of the fields are 0, it's not 'valid' due to parse error or no useful data in the tooltip
   return entry.potency != 0 || entry.comboPotency != 0 || entry.flankPotency != 0 || entry.frontPotency != 0 ||
          entry.rearPotency != 0 || entry.curePotency != 0;
+}
+
+const ActionEntry& ActionLut::getEntry( uint16_t actionId )
+{
+  auto it = m_actionLut.find( actionId );
+
+  assert( it != m_actionLut.end() );
+
+  return it->second;
 }
\ No newline at end of file
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index 36949eb5..f8eeafa8 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -22,6 +22,7 @@ namespace Sapphire::World::Action
     using Lut = std::unordered_map< uint16_t, ActionEntry >;
 
     static bool validEntryExists( uint16_t actionId );
+    static const ActionEntry& getEntry( uint16_t actionId );
 
     static Lut m_actionLut;
   };
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 1f03d840..84e8cfb2 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -90,7 +90,7 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
                                                  Action::ActionPtr currentAction,
                                                  Data::Action& actionData )
 {
-  if( !currentAction->precheck() )
+  if( !currentAction->preCheck() )
   {
     // forcefully interrupt the action and reset the cooldown
     currentAction->interrupt();

From ccb83bec5db7c94c202c3a4ea203f72d0bcbaf0c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 20:45:18 +1000
Subject: [PATCH 04/10] move itemaction to own class, perchbird's effect
 command

---
 src/world/Action/Action.cpp           | 19 ++++---
 src/world/Action/ItemAction.cpp       | 73 +++++++++++++++++++++++++++
 src/world/Action/ItemAction.h         | 38 ++++++++++++++
 src/world/ForwardsZone.h              |  1 +
 src/world/Manager/ActionMgr.cpp       | 37 ++------------
 src/world/Manager/DebugCommandMgr.cpp | 24 +++++++++
 6 files changed, 150 insertions(+), 42 deletions(-)
 create mode 100644 src/world/Action/ItemAction.cpp
 create mode 100644 src/world/Action/ItemAction.h

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 676c5e95..c1e071f5 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -34,19 +34,18 @@ Action::Action() = default;
 Action::~Action() = default;
 
 Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
-                                  Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
+  Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
 {
 }
 
-Action::Action( Entity::CharaPtr caster, uint32_t actionId,
-                                  Data::ActionPtr actionData, FrameworkPtr fw ) :
-                                  m_pSource( std::move( caster ) ),
-                                  m_pFw( std::move( fw ) ),
-                                  m_actionData( std::move( actionData ) ),
-                                  m_id( actionId ),
-                                  m_targetId( 0 ),
-                                  m_startTime( 0 ),
-                                  m_interruptType( Common::ActionInterruptType::None )
+Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw ) :
+  m_pSource( std::move( caster ) ),
+  m_pFw( std::move( fw ) ),
+  m_actionData( std::move( actionData ) ),
+  m_id( actionId ),
+  m_targetId( 0 ),
+  m_startTime( 0 ),
+  m_interruptType( Common::ActionInterruptType::None )
 {
 }
 
diff --git a/src/world/Action/ItemAction.cpp b/src/world/Action/ItemAction.cpp
new file mode 100644
index 00000000..efbef2f4
--- /dev/null
+++ b/src/world/Action/ItemAction.cpp
@@ -0,0 +1,73 @@
+#include "ItemAction.h"
+
+#include <Exd/ExdDataGenerated.h>
+
+#include <Actor/Player.h>
+#include <Network/PacketWrappers/EffectPacket.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+ItemAction::ItemAction( Sapphire::Entity::CharaPtr source, uint32_t itemId,
+                        Sapphire::Data::ItemActionPtr itemActionData, uint16_t itemSourceSlot,
+                        uint16_t itemSourceContainer, Sapphire::FrameworkPtr fw ) :
+  m_itemAction( std::move( itemActionData ) ),
+  m_itemSourceSlot( itemSourceSlot ),
+  m_itemSourceContainer( itemSourceContainer )
+{
+  m_id = itemId;
+  m_pSource = std::move( source );
+  m_pFw = std::move( fw );
+}
+
+void ItemAction::start()
+{
+  if( !m_pSource->isPlayer() )
+    return;
+
+  // todo: check inv slot for item
+
+  // todo: can we just do this?
+  execute();
+}
+
+void ItemAction::execute()
+{
+  switch( m_itemAction->type )
+  {
+    default:
+    {
+      getSourceChara()->getAsPlayer()->sendDebug( "ItemAction type {0} not supported.", m_itemAction->type );
+      break;
+    }
+
+    case Common::ItemActionType::ItemActionVFX:
+    case Common::ItemActionType::ItemActionVFX2:
+    {
+      handleVFXItem();
+
+      break;
+    }
+  }
+}
+
+void ItemAction::interrupt()
+{
+
+}
+
+void ItemAction::handleVFXItem()
+{
+  Common::EffectEntry effect{};
+  effect.effectType = Common::ActionEffectType::VFX;
+  effect.value = m_itemAction->data[ 0 ];
+
+  auto effectPacket = std::make_shared< Network::Packets::Server::EffectPacket >( getSourceChara()->getId(),
+                                                                                  getSourceChara()->getId(), getId() );
+  effectPacket->setTargetActor( getSourceChara()->getId() );
+  effectPacket->setAnimationId( Common::ItemActionType::ItemActionVFX );
+  effectPacket->setDisplayType( Common::ActionEffectDisplayType::ShowItemName );
+  effectPacket->addEffect( effect );
+
+  m_pSource->sendToInRangeSet( effectPacket, true );
+}
\ No newline at end of file
diff --git a/src/world/Action/ItemAction.h b/src/world/Action/ItemAction.h
new file mode 100644
index 00000000..f0f7c24f
--- /dev/null
+++ b/src/world/Action/ItemAction.h
@@ -0,0 +1,38 @@
+#ifndef SAPPHIRE_ITEMACTION_H
+#define SAPPHIRE_ITEMACTION_H
+
+#include "Action.h"
+
+namespace Sapphire::Data
+{
+  struct ItemAction;
+  using ItemActionPtr = std::shared_ptr< ItemAction >;
+}
+
+namespace Sapphire::World::Action
+{
+  class ItemAction : public Action
+  {
+  public:
+    ItemAction( Entity::CharaPtr source, uint32_t itemId, Data::ItemActionPtr itemActionData,
+                uint16_t itemSourceSlot, uint16_t itemSourceContainer, FrameworkPtr fw );
+    virtual ~ItemAction() = default;
+
+    void start() override;
+
+    void execute() override;
+
+    void interrupt() override;
+
+  private:
+    void handleVFXItem();
+
+  private:
+    Sapphire::Data::ItemActionPtr m_itemAction;
+
+    uint16_t m_itemSourceSlot;
+    uint16_t m_itemSourceContainer;
+  };
+}
+
+#endif //SAPPHIRE_ITEMACTION_H
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index 08de6d59..fb584c7b 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -86,6 +86,7 @@ namespace World::Action
 {
 TYPE_FORWARD( Action );
 TYPE_FORWARD( EventAction );
+TYPE_FORWARD( ItemAction );
 
 using ActionCallback = std::function< void( Entity::Player&, uint32_t, uint64_t ) >;
 }
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 84e8cfb2..feced875 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -1,6 +1,7 @@
 #include "ActionMgr.h"
 
 #include "Action/Action.h"
+#include "Action/ItemAction.h"
 #include "Script/ScriptMgr.h"
 #include "Actor/Player.h"
 
@@ -66,24 +67,11 @@ void World::Manager::ActionMgr::handleItemAction( Sapphire::Entity::Player& play
 {
   player.sendDebug( "got item act: {0}, slot: {1}, container: {2}", itemId, itemSourceSlot, itemSourceContainer );
 
-  // todo: check we have item & remove item from inventory
+  auto action = Action::make_ItemAction( player.getAsChara(), itemId, itemActionData,
+                                         itemSourceSlot, itemSourceContainer, framework() );
 
-  switch( itemActionData->type )
-  {
-    default:
-    {
-      player.sendDebug( "ItemAction type {0} not supported.", itemActionData->type );
-      break;
-    }
-
-    case Common::ItemActionType::ItemActionVFX:
-    case Common::ItemActionType::ItemActionVFX2:
-    {
-      handleItemActionVFX( player, itemId, itemActionData->data[ 0 ] );
-
-      break;
-    }
-  }
+  // todo: item actions don't have cast times? if so we can just start it and we're good
+  action->start();
 }
 
 void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
@@ -105,19 +93,4 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
 
   // todo: what do in cases of swiftcast/etc? script callback?
   currentAction->start();
-}
-
-void World::Manager::ActionMgr::handleItemActionVFX( Sapphire::Entity::Player& player, uint32_t itemId, uint16_t vfxId )
-{
-  Common::EffectEntry effect{};
-  effect.effectType = Common::ActionEffectType::VFX;
-  effect.value = vfxId;
-
-  auto effectPacket = std::make_shared< Network::Packets::Server::EffectPacket >( player.getId(), player.getId(), itemId );
-  effectPacket->setTargetActor( player.getId() );
-  effectPacket->setAnimationId( Common::ItemActionType::ItemActionVFX );
-  effectPacket->setDisplayType( Common::ActionEffectDisplayType::ShowItemName );
-  effectPacket->addEffect( effect );
-
-  player.sendToInRangeSet( effectPacket, true );
 }
\ No newline at end of file
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 933b7d94..796e254d 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -10,6 +10,7 @@
 #include <Exd/ExdDataGenerated.h>
 #include <Database/DatabaseDef.h>
 #include <cmath>
+#include <Network/PacketWrappers/EffectPacket.h>
 
 #include "DebugCommand/DebugCommand.h"
 #include "DebugCommandMgr.h"
@@ -522,6 +523,29 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     sscanf( params.c_str(), "%d", &id );
     player.learnAction( id );
   }
+  else if ( subCommand == "effect")
+  {
+    uint16_t param1;
+    sscanf( params.c_str(), "%hu", &param1 );
+
+    auto effectPacket = std::make_shared< Server::EffectPacket >( player.getId(), player.getTargetId(), param1 );
+    effectPacket->setRotation( Common::Util::floatToUInt16Rot( player.getRot() ) );
+
+    Common::EffectEntry entry{};
+    entry.value = param1;
+    entry.effectType = Common::ActionEffectType::Damage;
+    entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
+
+    effectPacket->addEffect( entry );
+
+    auto sequence = player.getCurrentZone()->getNextEffectSequence();
+    effectPacket->setSequence( sequence );
+
+//    effectPacket->setAnimationId( param1 );
+//    effectPacket->setEffectFlags( 0 );
+
+    player.queuePacket( effectPacket );
+  }
   else
   {
     player.sendUrgent( "{0} is not a valid ADD command.", subCommand );

From b48525ef46178731d251d38e0f982f7aa6a1f16e Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 21:39:37 +1000
Subject: [PATCH 05/10] fix msvc build

---
 src/common/Util/UtilMath.cpp | 3 ++-
 src/common/Util/UtilMath.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/Util/UtilMath.cpp b/src/common/Util/UtilMath.cpp
index a1e1a01e..ae61e171 100644
--- a/src/common/Util/UtilMath.cpp
+++ b/src/common/Util/UtilMath.cpp
@@ -17,7 +17,8 @@ float Util::distance( float x, float y, float z, float x1, float y1, float z1 )
   return sqrtf( distanceSq( x, y, z, x1, y1, z1 ) );
 }
 
-float Util::distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 )
+float Util::distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1,
+                      const Sapphire::Common::FFXIVARR_POSITION3& pos2 )
 {
   return sqrtf( distanceSq( pos1.x, pos1.y, pos1.z, pos2.x, pos2.y, pos2.z ) );
 }
diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h
index c35ef6be..93344253 100644
--- a/src/common/Util/UtilMath.h
+++ b/src/common/Util/UtilMath.h
@@ -11,7 +11,7 @@ namespace Sapphire::Common::Util
   float distanceSq( float x, float y, float z, float x1, float y1, float z1 );
 
   float distance( float x, float y, float z, float x1, float y1, float z1 );
-  float distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 );
+  float distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1, const Sapphire::Common::FFXIVARR_POSITION3& pos2 );
 
   float distance2DSq( float x, float y, float x1, float y1 );
 

From c15053144ddc988496dca289eadcd5a4b52c33cb Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 23:28:19 +1000
Subject: [PATCH 06/10] move lobby to Sapphire::Lobby, move common lib to
 Sapphire::Common

---
 src/common/Config/ConfigMgr.cpp               |  8 ++-
 src/common/Config/ConfigMgr.h                 |  2 +-
 src/common/Crypt/base64.cpp                   |  4 +-
 src/common/Crypt/base64.h                     |  2 +-
 src/common/Crypt/md5.cpp                      | 10 +--
 src/common/Crypt/md5.h                        |  2 +-
 src/common/Forwards.h                         |  6 +-
 src/common/Framework.h                        |  2 +-
 src/common/Network/Acceptor.cpp               | 29 +++++----
 src/common/Network/Acceptor.h                 |  2 +-
 src/common/Network/CommonActorControl.h       |  2 +-
 src/common/Network/CommonNetwork.h            |  2 +-
 src/common/Network/Connection.cpp             | 48 +++++++-------
 src/common/Network/Connection.h               |  6 +-
 src/common/Network/GamePacket.h               |  2 +-
 src/common/Network/GamePacketParser.cpp       | 15 +++--
 src/common/Network/GamePacketParser.h         |  2 +-
 src/common/Network/Hive.cpp                   | 18 +++---
 src/common/Network/Hive.h                     |  2 +-
 src/common/Network/PacketContainer.cpp        | 12 ++--
 src/common/Network/PacketContainer.h          |  2 +-
 .../Network/PacketDef/Chat/ServerChatDef.h    | 11 +---
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Lobby/ServerLobbyDef.h  |  9 +--
 .../Network/PacketDef/Zone/ClientZoneDef.h    |  9 +--
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 src/lobby/Forwards.h                          | 12 ++--
 src/lobby/GameConnection.cpp                  | 64 +++++++++----------
 src/lobby/GameConnection.h                    | 32 +++++-----
 src/lobby/LobbyPacketContainer.cpp            | 19 +++---
 src/lobby/LobbyPacketContainer.h              |  6 +-
 src/lobby/LobbySession.cpp                    |  4 +-
 src/lobby/LobbySession.h                      |  2 +-
 src/lobby/RestConnector.cpp                   | 26 ++++----
 src/lobby/RestConnector.h                     |  2 +-
 src/lobby/ServerLobby.cpp                     | 14 ++--
 src/lobby/ServerLobby.h                       | 10 ++-
 src/lobby/mainLobbyServer.cpp                 |  2 +-
 src/world/Action/Action.h                     |  2 -
 src/world/Network/GameConnection.h            |  6 +-
 40 files changed, 208 insertions(+), 204 deletions(-)

diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp
index a4fa1bdc..d8283dee 100644
--- a/src/common/Config/ConfigMgr.cpp
+++ b/src/common/Config/ConfigMgr.cpp
@@ -5,12 +5,14 @@
 
 namespace fs = std::experimental::filesystem;
 
+using namespace Sapphire::Common;
+
 /**
  * Loads an ini file and parses it
  * @param configName the name of ini file relative to m_configFolderRoot to load alongside global.ini
  * @return true if loading was successful
  */
-bool Sapphire::ConfigMgr::loadConfig( const std::string& configName )
+bool ConfigMgr::loadConfig( const std::string& configName )
 {
   // get global config
   auto configFile = fs::path( fs::path( m_configFolderRoot ) / configName );
@@ -29,7 +31,7 @@ bool Sapphire::ConfigMgr::loadConfig( const std::string& configName )
   return true;
 }
 
-bool Sapphire::ConfigMgr::loadGlobalConfig( Common::Config::GlobalConfig& config, const std::string& configName )
+bool ConfigMgr::loadGlobalConfig( Common::Config::GlobalConfig& config, const std::string& configName )
 {
   auto configFile = fs::path( fs::path( m_configFolderRoot ) / configName );
 
@@ -71,7 +73,7 @@ bool Sapphire::ConfigMgr::loadGlobalConfig( Common::Config::GlobalConfig& config
   return true;
 }
 
-bool Sapphire::ConfigMgr::copyDefaultConfig( const std::string& configName )
+bool ConfigMgr::copyDefaultConfig( const std::string& configName )
 {
   fs::path configPath( m_configFolderRoot );
   configPath /= configName;
diff --git a/src/common/Config/ConfigMgr.h b/src/common/Config/ConfigMgr.h
index 919762c2..b78da899 100644
--- a/src/common/Config/ConfigMgr.h
+++ b/src/common/Config/ConfigMgr.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include "ConfigDef.h"
 
-namespace Sapphire
+namespace Sapphire::Common
 {
     class ConfigMgr
     {
diff --git a/src/common/Crypt/base64.cpp b/src/common/Crypt/base64.cpp
index 591568b5..7d513c47 100644
--- a/src/common/Crypt/base64.cpp
+++ b/src/common/Crypt/base64.cpp
@@ -41,7 +41,7 @@ static inline bool is_base64( uint8_t c )
   return ( isalnum( c ) || ( c == '+' ) || ( c == '/' ) );
 }
 
-std::string Sapphire::Util::base64Encode( uint8_t const* bytes_to_encode, uint32_t in_len )
+std::string Sapphire::Common::Util::base64Encode( uint8_t const* bytes_to_encode, uint32_t in_len )
 {
   std::string ret;
   int32_t i = 0;
@@ -87,7 +87,7 @@ std::string Sapphire::Util::base64Encode( uint8_t const* bytes_to_encode, uint32
 
 }
 
-std::string Sapphire::Util::base64Decode( std::string const& encoded_string )
+std::string Sapphire::Common::Util::base64Decode( std::string const& encoded_string )
 {
   int32_t in_len = encoded_string.size();
   int32_t i = 0;
diff --git a/src/common/Crypt/base64.h b/src/common/Crypt/base64.h
index c95d09f3..9b5d9eff 100644
--- a/src/common/Crypt/base64.h
+++ b/src/common/Crypt/base64.h
@@ -1,6 +1,6 @@
 #include <string>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
   std::string base64Encode( uint8_t const*, uint32_t len );
 
diff --git a/src/common/Crypt/md5.cpp b/src/common/Crypt/md5.cpp
index 130042e2..de5cf7ef 100644
--- a/src/common/Crypt/md5.cpp
+++ b/src/common/Crypt/md5.cpp
@@ -37,7 +37,7 @@
   (b)[(i) + 3] = (uint8_t) ( (n) >> 24 );       \
 }
 
-void Sapphire::Util::md5_starts( md5_context* ctx )
+void Sapphire::Common::Util::md5_starts( md5_context* ctx )
 {
   ctx->total[ 0 ] = 0;
   ctx->total[ 1 ] = 0;
@@ -48,7 +48,7 @@ void Sapphire::Util::md5_starts( md5_context* ctx )
   ctx->state[ 3 ] = 0x10325476;
 }
 
-void md5_process( Sapphire::Util::md5_context* ctx, uint8_t data[64] )
+void md5_process( Sapphire::Common::Util::md5_context* ctx, uint8_t data[64] )
 {
   uint32_t X[16], A, B, C, D;
 
@@ -171,7 +171,7 @@ void md5_process( Sapphire::Util::md5_context* ctx, uint8_t data[64] )
   ctx->state[ 3 ] += D;
 }
 
-void Sapphire::Util::md5_update( md5_context* ctx, uint8_t* input, uint32_t length )
+void Sapphire::Common::Util::md5_update( md5_context* ctx, uint8_t* input, uint32_t length )
 {
   uint32_t left, fill;
 
@@ -219,7 +219,7 @@ static uint8_t md5_padding[64] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   };
 
-void Sapphire::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
+void Sapphire::Common::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
 {
   uint32_t last, padn;
   uint32_t high, low;
@@ -248,7 +248,7 @@ void Sapphire::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
 * those are the standard RFC 1321 test vectors
 */
 
-void Sapphire::Util::md5( uint8_t* text, uint8_t* hash, int32_t size )
+void Sapphire::Common::Util::md5( uint8_t* text, uint8_t* hash, int32_t size )
 {
   md5_context ctx;
   md5_starts( &ctx );
diff --git a/src/common/Crypt/md5.h b/src/common/Crypt/md5.h
index cfdb4ad8..f27dd5a9 100644
--- a/src/common/Crypt/md5.h
+++ b/src/common/Crypt/md5.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
   using md5_context = struct
   {
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 7434f861..085dfbe9 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-namespace Sapphire
+namespace Sapphire::Common
 {
   class ConfigMgr;
   class Framework;
@@ -11,7 +11,7 @@ namespace Sapphire
   using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Common::Network
 {
   class Hive;
   class Acceptor;
@@ -21,7 +21,7 @@ namespace Sapphire::Network
   using ConnectionPtr = std::shared_ptr< Connection >;
 }
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
   class GamePacket;
   class FFXIVPacketBase;
diff --git a/src/common/Framework.h b/src/common/Framework.h
index 5714bdb3..0e752801 100644
--- a/src/common/Framework.h
+++ b/src/common/Framework.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <cassert>
 
-namespace Sapphire
+namespace Sapphire::Common
 {
 
   class Framework
diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp
index ab76398c..2238b5fa 100644
--- a/src/common/Network/Acceptor.cpp
+++ b/src/common/Network/Acceptor.cpp
@@ -2,7 +2,10 @@
 #include "Acceptor.h"
 #include "Connection.h"
 
-Sapphire::Network::Acceptor::Acceptor( HivePtr hive ) :
+
+using namespace Sapphire::Common;
+
+Network::Acceptor::Acceptor( HivePtr hive ) :
   m_hive( hive ),
   m_acceptor( hive->getService() ),
   m_io_strand( hive->getService() ),
@@ -10,21 +13,21 @@ Sapphire::Network::Acceptor::Acceptor( HivePtr hive ) :
 {
 }
 
-Sapphire::Network::Acceptor::~Acceptor()
+Network::Acceptor::~Acceptor()
 {
 }
 
-bool Sapphire::Network::Acceptor::onAccept( ConnectionPtr connection, const std::string& host, uint16_t port )
+bool Network::Acceptor::onAccept( ConnectionPtr connection, const std::string& host, uint16_t port )
 {
   return true;
 }
 
-void Sapphire::Network::Acceptor::onError( const asio::error_code& error )
+void Network::Acceptor::onError( const asio::error_code& error )
 {
 
 }
 
-void Sapphire::Network::Acceptor::startError( const asio::error_code& error )
+void Network::Acceptor::startError( const asio::error_code& error )
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -37,7 +40,7 @@ void Sapphire::Network::Acceptor::startError( const asio::error_code& error )
   }
 }
 
-void Sapphire::Network::Acceptor::dispatchAccept( ConnectionPtr connection )
+void Network::Acceptor::dispatchAccept( ConnectionPtr connection )
 {
   m_acceptor.async_accept( connection->getSocket(),
                            connection->getStrand().wrap( std::bind( &Acceptor::handleAccept,
@@ -46,7 +49,7 @@ void Sapphire::Network::Acceptor::dispatchAccept( ConnectionPtr connection )
                                                                     connection ) ) );
 }
 
-void Sapphire::Network::Acceptor::handleAccept( const asio::error_code& error, ConnectionPtr connection )
+void Network::Acceptor::handleAccept( const asio::error_code& error, ConnectionPtr connection )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -72,17 +75,17 @@ void Sapphire::Network::Acceptor::handleAccept( const asio::error_code& error, C
   }
 }
 
-void Sapphire::Network::Acceptor::stop()
+void Network::Acceptor::stop()
 {
 
 }
 
-void Sapphire::Network::Acceptor::accept( ConnectionPtr connection )
+void Network::Acceptor::accept( ConnectionPtr connection )
 {
   m_io_strand.post( std::bind( &Acceptor::dispatchAccept, shared_from_this(), connection ) );
 }
 
-void Sapphire::Network::Acceptor::listen( const std::string& host, const uint16_t& port )
+void Network::Acceptor::listen( const std::string& host, const uint16_t& port )
 {
   try
   {
@@ -103,17 +106,17 @@ void Sapphire::Network::Acceptor::listen( const std::string& host, const uint16_
 
 }
 
-Sapphire::Network::HivePtr Sapphire::Network::Acceptor::getHive()
+Network::HivePtr Network::Acceptor::getHive()
 {
   return m_hive;
 }
 
-asio::ip::tcp::acceptor& Sapphire::Network::Acceptor::getAcceptor()
+asio::ip::tcp::acceptor& Network::Acceptor::getAcceptor()
 {
   return m_acceptor;
 }
 
-bool Sapphire::Network::Acceptor::hasError()
+bool Network::Acceptor::hasError()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
diff --git a/src/common/Network/Acceptor.h b/src/common/Network/Acceptor.h
index faae123f..e1a663eb 100644
--- a/src/common/Network/Acceptor.h
+++ b/src/common/Network/Acceptor.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 
-namespace Sapphire::Network
+namespace Sapphire::Common::Network
 {
 
   class Connection;
diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index b3ecf167..043715f1 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -10,7 +10,7 @@
 // The following enumerations are structures to require their type be included.
 // They are also defined within the Sapphire::Common namespace to avoid collisions.
 // +---------------------------------------------------------------------------
-namespace Sapphire::Network::ActorControl
+namespace Sapphire::Common::Network::ActorControl
 {
 
 enum ActorControlType : uint16_t
diff --git a/src/common/Network/CommonNetwork.h b/src/common/Network/CommonNetwork.h
index 1a2bd4d6..c4a27604 100644
--- a/src/common/Network/CommonNetwork.h
+++ b/src/common/Network/CommonNetwork.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   /**
diff --git a/src/common/Network/Connection.cpp b/src/common/Network/Connection.cpp
index 21e8bee7..3ac0bee6 100644
--- a/src/common/Network/Connection.cpp
+++ b/src/common/Network/Connection.cpp
@@ -3,7 +3,9 @@
 #include <functional>
 #include "Framework.h"
 
-Sapphire::Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
+using namespace Sapphire::Common;
+
+Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
   m_hive( hive ),
   m_socket( hive->getService() ),
   m_io_strand( hive->getService() ),
@@ -13,11 +15,9 @@ Sapphire::Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
 {
 }
 
-Sapphire::Network::Connection::~Connection()
-{
-}
+Network::Connection::~Connection() = default;
 
-void Sapphire::Network::Connection::bind( const std::string& ip, uint16_t port )
+void Network::Connection::bind( const std::string& ip, uint16_t port )
 {
   asio::ip::tcp::endpoint endpoint( asio::ip::address::from_string( ip ), port );
   m_socket.open( endpoint.protocol() );
@@ -25,7 +25,7 @@ void Sapphire::Network::Connection::bind( const std::string& ip, uint16_t port )
   m_socket.bind( endpoint );
 }
 
-void Sapphire::Network::Connection::startSend()
+void Network::Connection::startSend()
 {
   if( !m_pending_sends.empty() )
   {
@@ -38,7 +38,7 @@ void Sapphire::Network::Connection::startSend()
   }
 }
 
-void Sapphire::Network::Connection::startRecv( int32_t total_bytes )
+void Network::Connection::startRecv( int32_t total_bytes )
 {
   if( total_bytes > 0 )
   {
@@ -61,7 +61,7 @@ void Sapphire::Network::Connection::startRecv( int32_t total_bytes )
   }
 }
 
-void Sapphire::Network::Connection::startError( const asio::error_code& error )
+void Network::Connection::startError( const asio::error_code& error )
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -74,7 +74,7 @@ void Sapphire::Network::Connection::startError( const asio::error_code& error )
   }
 }
 
-void Sapphire::Network::Connection::handleConnect( const asio::error_code& error )
+void Network::Connection::handleConnect( const asio::error_code& error )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -94,8 +94,8 @@ void Sapphire::Network::Connection::handleConnect( const asio::error_code& error
   }
 }
 
-void Sapphire::Network::Connection::handleSend( const asio::error_code& error,
-                                                std::list< std::vector< uint8_t > >::iterator itr )
+void Network::Connection::handleSend( const asio::error_code& error,
+                                      std::list< std::vector< uint8_t > >::iterator itr )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -109,7 +109,7 @@ void Sapphire::Network::Connection::handleSend( const asio::error_code& error,
   }
 }
 
-void Sapphire::Network::Connection::handleRecv( const asio::error_code& error, int32_t actual_bytes )
+void Network::Connection::handleRecv( const asio::error_code& error, int32_t actual_bytes )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -128,7 +128,7 @@ void Sapphire::Network::Connection::handleRecv( const asio::error_code& error, i
   }
 }
 
-void Sapphire::Network::Connection::dispatchSend( std::vector< uint8_t > buffer )
+void Network::Connection::dispatchSend( std::vector< uint8_t > buffer )
 {
   bool should_start_send = m_pending_sends.empty();
   m_pending_sends.push_back( buffer );
@@ -138,7 +138,7 @@ void Sapphire::Network::Connection::dispatchSend( std::vector< uint8_t > buffer
   }
 }
 
-void Sapphire::Network::Connection::dispatchRecv( int32_t total_bytes )
+void Network::Connection::dispatchRecv( int32_t total_bytes )
 {
   bool should_start_receive = m_pending_recvs.empty();
   m_pending_recvs.push_back( total_bytes );
@@ -149,7 +149,7 @@ void Sapphire::Network::Connection::dispatchRecv( int32_t total_bytes )
 }
 
 
-void Sapphire::Network::Connection::connect( const std::string& host, uint16_t port )
+void Network::Connection::connect( const std::string& host, uint16_t port )
 {
   asio::ip::tcp::resolver resolver( m_hive->getService() );
   asio::ip::tcp::resolver::query query( host, std::to_string( port ) );
@@ -160,48 +160,48 @@ void Sapphire::Network::Connection::connect( const std::string& host, uint16_t p
 
 }
 
-void Sapphire::Network::Connection::disconnect()
+void Network::Connection::disconnect()
 {
   onDisconnect();
   m_socket.close();
 }
 
-void Sapphire::Network::Connection::recv( int32_t total_bytes )
+void Network::Connection::recv( int32_t total_bytes )
 {
   m_io_strand.post( std::bind( &Connection::dispatchRecv, shared_from_this(), total_bytes ) );
 }
 
-void Sapphire::Network::Connection::send( const std::vector< uint8_t >& buffer )
+void Network::Connection::send( const std::vector< uint8_t >& buffer )
 {
   m_io_strand.post( std::bind( &Connection::dispatchSend, shared_from_this(), buffer ) );
 }
 
-asio::ip::tcp::socket& Sapphire::Network::Connection::getSocket()
+asio::ip::tcp::socket& Network::Connection::getSocket()
 {
   return m_socket;
 }
 
-asio::strand& Sapphire::Network::Connection::getStrand()
+asio::strand& Network::Connection::getStrand()
 {
   return m_io_strand;
 }
 
-Sapphire::Network::HivePtr Sapphire::Network::Connection::getHive()
+Network::HivePtr Network::Connection::getHive()
 {
   return m_hive;
 }
 
-void Sapphire::Network::Connection::setReceiveBufferSize( int32_t size )
+void Network::Connection::setReceiveBufferSize( int32_t size )
 {
   m_receive_buffer_size = size;
 }
 
-int32_t Sapphire::Network::Connection::getReceiveBufferSize() const
+int32_t Network::Connection::getReceiveBufferSize() const
 {
   return m_receive_buffer_size;
 }
 
-bool Sapphire::Network::Connection::hasError()
+bool Network::Connection::hasError()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h
index fbfc85c9..3a4623d2 100644
--- a/src/common/Network/Connection.h
+++ b/src/common/Network/Connection.h
@@ -12,13 +12,13 @@
 #include "Acceptor.h"
 #include <memory>
 
-namespace Sapphire
+namespace Sapphire::Common
 {
   class Framework;
   using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Common::Network
 {
 
   class Hive;
@@ -41,7 +41,7 @@ namespace Sapphire::Network
     std::list< std::vector< uint8_t > > m_pending_sends;
     int32_t m_receive_buffer_size;
     std::atomic< uint32_t > m_error_state;
-    Sapphire::FrameworkPtr m_pFw;
+    FrameworkPtr m_pFw;
 
     Connection( HivePtr hive, FrameworkPtr pFw );
 
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index c1c06b76..f40eadc7 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -14,7 +14,7 @@
 #include "CommonNetwork.h"
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   // Must forward define these in order to enable the compiler to produce the
diff --git a/src/common/Network/GamePacketParser.cpp b/src/common/Network/GamePacketParser.cpp
index 6a18b718..4577c21e 100644
--- a/src/common/Network/GamePacketParser.cpp
+++ b/src/common/Network/GamePacketParser.cpp
@@ -3,9 +3,10 @@
 
 #include <string.h>   // memcpy
 
-using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Common;
+using namespace Sapphire::Common::Network::Packets;
 
-PacketParseResult Sapphire::Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
+PacketParseResult Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
                                                          const uint32_t offset,
                                                          FFXIVARR_PACKET_HEADER& header )
 {
@@ -25,7 +26,7 @@ PacketParseResult Sapphire::Network::Packets::getHeader( const std::vector< uint
   return Success;
 }
 
-PacketParseResult Sapphire::Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer,
+PacketParseResult Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer,
                                                                 const uint32_t offset,
                                                                 FFXIVARR_PACKET_SEGMENT_HEADER& header )
 {
@@ -42,7 +43,7 @@ PacketParseResult Sapphire::Network::Packets::getSegmentHeader( const std::vecto
   return Success;
 }
 
-PacketParseResult Sapphire::Network::Packets::getPackets( const std::vector< uint8_t >& buffer,
+PacketParseResult Network::Packets::getPackets( const std::vector< uint8_t >& buffer,
                                                           const uint32_t offset,
                                                           const FFXIVARR_PACKET_HEADER& packetHeader,
                                                           std::vector< FFXIVARR_PACKET_RAW >& packets )
@@ -81,7 +82,7 @@ PacketParseResult Sapphire::Network::Packets::getPackets( const std::vector< uin
   return Success;
 }
 
-PacketParseResult Sapphire::Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset,
+PacketParseResult Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset,
                                                          FFXIVARR_PACKET_RAW& packet )
 {
   // Copy segment header
@@ -103,7 +104,7 @@ PacketParseResult Sapphire::Network::Packets::getPacket( const std::vector< uint
   return Success;
 }
 
-bool Sapphire::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header )
+bool Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header )
 {
   // Max size of the packet is capped at 1MB for now.
   if( header.size > 1 * 1024 * 1024 )
@@ -116,7 +117,7 @@ bool Sapphire::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& head
   return true;
 }
 
-bool Sapphire::Network::Packets::checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header )
+bool Network::Packets::checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header )
 {
   // Max size of individual message is capped at 256KB for now.
   if( header.size > 256 * 1024 )
diff --git a/src/common/Network/GamePacketParser.h b/src/common/Network/GamePacketParser.h
index c50b486a..e847a7c4 100644
--- a/src/common/Network/GamePacketParser.h
+++ b/src/common/Network/GamePacketParser.h
@@ -3,7 +3,7 @@
 
 #include "CommonNetwork.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   enum PacketParseResult
diff --git a/src/common/Network/Hive.cpp b/src/common/Network/Hive.cpp
index 86460b2d..20279869 100644
--- a/src/common/Network/Hive.cpp
+++ b/src/common/Network/Hive.cpp
@@ -2,41 +2,43 @@
 #include <functional>
 #include "Hive.h"
 
+using namespace Sapphire::Common;
+
 //-----------------------------------------------------------------------------
 
-Sapphire::Network::Hive::Hive() :
+Network::Hive::Hive() :
   m_work_ptr( new asio::io_service::work( m_io_service ) ),
   m_shutdown( 0 )
 {
 }
 
-Sapphire::Network::Hive::~Hive()
+Network::Hive::~Hive()
 {
 }
 
-asio::io_service& Sapphire::Network::Hive::getService()
+asio::io_service& Network::Hive::getService()
 {
   return m_io_service;
 }
 
-bool Sapphire::Network::Hive::hasStopped()
+bool Network::Hive::hasStopped()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
   return m_shutdown.compare_exchange_strong( v1, v2 );
 }
 
-void Sapphire::Network::Hive::poll()
+void Network::Hive::poll()
 {
   m_io_service.poll();
 }
 
-void Sapphire::Network::Hive::run()
+void Network::Hive::run()
 {
   m_io_service.run();
 }
 
-void Sapphire::Network::Hive::stop()
+void Network::Hive::stop()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -48,7 +50,7 @@ void Sapphire::Network::Hive::stop()
   }
 }
 
-void Sapphire::Network::Hive::reset()
+void Network::Hive::reset()
 {
   uint32_t v1 = 0;
   uint32_t v2 = 1;
diff --git a/src/common/Network/Hive.h b/src/common/Network/Hive.h
index c8ea62e5..76e53814 100644
--- a/src/common/Network/Hive.h
+++ b/src/common/Network/Hive.h
@@ -5,7 +5,7 @@
 #include <atomic>
 #include <memory>
 
-namespace Sapphire:: Network
+namespace Sapphire::Common::Network
 {
 
   class Hive : public std::enable_shared_from_this< Hive >
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index d89c8df4..7cff0b48 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -7,7 +7,9 @@
 #include <string.h>
 #include <memory>
 
-Sapphire::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
+using namespace Sapphire::Common;
+
+Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
   m_segmentTargetOverride( segmentTargetOverride )
 {
   memset( &m_ipcHdr, 0, sizeof( FFXIVARR_PACKET_HEADER ) );
@@ -15,12 +17,12 @@ Sapphire::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTa
   m_ipcHdr.count = 0;
 }
 
-Sapphire::Network::Packets::PacketContainer::~PacketContainer()
+Network::Packets::PacketContainer::~PacketContainer()
 {
   m_entryList.clear();
 }
 
-void Sapphire::Network::Packets::PacketContainer::addPacket( Sapphire::Network::Packets::FFXIVPacketBasePtr entry )
+void Network::Packets::PacketContainer::addPacket( Network::Packets::FFXIVPacketBasePtr entry )
 {
   m_entryList.push_back( entry );
 
@@ -28,7 +30,7 @@ void Sapphire::Network::Packets::PacketContainer::addPacket( Sapphire::Network::
   m_ipcHdr.count++;
 }
 
-void Sapphire::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >& sendBuffer )
+void Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >& sendBuffer )
 {
   std::vector< uint8_t > tempBuffer( m_ipcHdr.size );
   memset( &tempBuffer[ 0 ], 0, m_ipcHdr.size );
@@ -67,7 +69,7 @@ void Sapphire::Network::Packets::PacketContainer::fillSendBuffer( std::vector< u
 
 }
 
-std::string Sapphire::Network::Packets::PacketContainer::toString()
+std::string Network::Packets::PacketContainer::toString()
 {
   std::vector< uint8_t > tmpBuffer;
 
diff --git a/src/common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h
index 80a35cf1..337d73e0 100644
--- a/src/common/Network/PacketContainer.h
+++ b/src/common/Network/PacketContainer.h
@@ -8,7 +8,7 @@
 #include "GamePacket.h"
 #include "Forwards.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h
index 755ad3c8..8c6c8e01 100644
--- a/src/common/Network/PacketDef/Chat/ServerChatDef.h
+++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h
@@ -4,10 +4,8 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire {
-namespace Network {
-namespace Packets {
-namespace Server {
+namespace Sapphire::Common::Network::Packets::Server
+{
 
 /**
 * Structural representation of the packet sent by the server as response
@@ -31,10 +29,7 @@ struct FFXIVIpcTellErrNotFound : FFXIVIpcBasePacket< TellErrNotFound >
   char receipientName[32];
 };
 
-} /* Server */
-} /* Packets */
-} /* Network */
-} /* Sapphire */
+} /* Sapphire::Common::Network::Packets::Server */
 
 
 
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c6fdac98..5d769f71 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
index 57948d4b..d679db5e 100644
--- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
+++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
@@ -4,10 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire {
-namespace Network {
-namespace Packets {
-namespace Server {
+namespace Sapphire::Common::Network::Packets::Server {
 
 struct FFXIVIpcRetainerList :
   FFXIVIpcBasePacket< LobbyRetainerList >
@@ -152,7 +149,5 @@ struct FFXIVIpcLobbyError : FFXIVIpcBasePacket< LobbyError >
 };
 
 }
-}
-}
-}
+
 #endif
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 3d439dc7..424602d8 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -4,10 +4,8 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire {
-namespace Network {
-namespace Packets {
-namespace Client {
+namespace Sapphire::Common::Network::Packets::Client
+{
 
 struct FFXIVIpcGmCommand1 :
   FFXIVIpcBasePacket< GMCommand1 >
@@ -325,9 +323,6 @@ struct FFXIVIpcMarketBoardRequestItemListingInfo :
   /* 0000 */ uint32_t requestId;
 };
 
-}
-}
-}
 }
 
 #endif //_CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 80588a04..f95b2736 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -10,7 +10,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Network::Packets::Server
+namespace Sapphire::Common::Network::Packets::Server
 {
 
   /**
diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index 9cc3ac76..d32f6f16 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -12,20 +12,24 @@ x ## Ptr make_ ## x( Args &&...args ) { \
 return std::make_shared< x >( std::forward< Args >( args ) ... ); }\
 typedef std::vector< x > x ## PtrList;
 
-namespace Sapphire
+namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Lobby::Network
+{
+  TYPE_FORWARD( GameConnection );
+}
+
+namespace Sapphire::Common::Network
 {
   TYPE_FORWARD( Hive );
   TYPE_FORWARD( Acceptor );
   TYPE_FORWARD( Connection );
-  TYPE_FORWARD( GameConnection );
 }
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
   TYPE_FORWARD( GamePacket );
   TYPE_FORWARD( FFXIVPacketBase );
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 076bb9f6..1fca879b 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -15,30 +15,30 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 
-extern Sapphire::ServerLobby g_serverLobby;
-extern Sapphire::Network::RestConnector g_restConnector;
+using namespace Sapphire;
+using namespace Sapphire::Common::Network::Packets;
+using namespace Sapphire::Common::Network::Packets::Server;
 
-using namespace Sapphire::Common;
-using namespace Sapphire::Network::Packets;
-using namespace Sapphire::Network::Packets::Server;
+extern Lobby::ServerLobby g_serverLobby;
+extern Lobby::Network::RestConnector g_restConnector;
 
-Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
-                                                   Sapphire::Network::AcceptorPtr pAcceptor,
-                                                   FrameworkPtr pFw ) :
-  Connection( pHive, pFw ),
+Lobby::Network::GameConnection::GameConnection( Common::Network::HivePtr pHive,
+                                                Common::Network::AcceptorPtr pAcceptor,
+                                                Common::FrameworkPtr pFw ) :
+  Common::Network::Connection( pHive, pFw ),
   m_pAcceptor( pAcceptor ),
   m_bEncryptionInitialized( false )
 {
 }
 
-Sapphire::Network::GameConnection::~GameConnection()
+Lobby::Network::GameConnection::~GameConnection()
 {
 
 }
 
 
 // overwrite the parents onConnect for our game socket needs
-void Sapphire::Network::GameConnection::onAccept( const std::string& host, uint16_t port )
+void Lobby::Network::GameConnection::onAccept( const std::string& host, uint16_t port )
 {
   auto connection = make_GameConnection( m_hive, m_pAcceptor, m_pFw );
   m_pAcceptor->accept( connection );
@@ -47,17 +47,17 @@ void Sapphire::Network::GameConnection::onAccept( const std::string& host, uint1
 }
 
 
-void Sapphire::Network::GameConnection::onDisconnect()
+void Lobby::Network::GameConnection::onDisconnect()
 {
   Logger::debug( "DISCONNECT" );
 }
 
-void Sapphire::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
+void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-  Packets::FFXIVARR_PACKET_HEADER packetHeader{};
-  const auto headerResult = Packets::getHeader( m_packets, 0, packetHeader );
+  Common::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
+  const auto headerResult = Common::Network::Packets::getHeader( m_packets, 0, packetHeader );
 
   if( headerResult == Incomplete )
     return;
@@ -70,9 +70,9 @@ void Sapphire::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
   }
 
   // Dissect packet list
-  std::vector< Packets::FFXIVARR_PACKET_RAW > packetList;
-  const auto packetResult = Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
-                                                 packetHeader, packetList );
+  std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
+  const auto packetResult = Common::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
+                                                                  packetHeader, packetList );
 
   if( packetResult == Incomplete )
     return;
@@ -90,13 +90,13 @@ void Sapphire::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 
 }
 
-void Sapphire::Network::GameConnection::onError( const asio::error_code& error )
+void Lobby::Network::GameConnection::onError( const asio::error_code& error )
 {
   Logger::info( "GameConnection closed: {0}", error.message() );
 }
 
 void
-Sapphire::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
+Lobby::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
 {
   auto errorPacket = makeLobbyPacket< FFXIVIpcLobbyError >( tmpId );
   errorPacket->data().seq = sequence;
@@ -108,7 +108,7 @@ Sapphire::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorc
   sendPacket( pRP );
 }
 
-void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
@@ -192,7 +192,7 @@ void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet
   }
 }
 
-void Sapphire::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
@@ -234,7 +234,7 @@ void Sapphire::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet,
   sendPacket( pRP );
 }
 
-bool Sapphire::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   LobbySessionPtr pSession = g_serverLobby.getSession( ( char* ) &packet.data[ 0 ] + 0x22 );
 
@@ -273,7 +273,7 @@ bool Sapphire::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_
   return false;
 }
 
-bool Sapphire::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   uint8_t type = *reinterpret_cast< uint8_t* >( &packet.data[ 0 ] + 0x29 );
@@ -381,7 +381,7 @@ bool Sapphire::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW&
   return false;
 }
 
-void Sapphire::Network::GameConnection::handleGamePacket( Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::Network::GameConnection::handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -419,7 +419,7 @@ void Sapphire::Network::GameConnection::handleGamePacket( Packets::FFXIVARR_PACK
 
 }
 
-void Sapphire::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc )
+void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc )
 {
   uint16_t size = pLpc.getSize();
   uint8_t* dataPtr = pLpc.getRawData( false );
@@ -428,7 +428,7 @@ void Sapphire::Network::GameConnection::sendPacket( Packets::LobbyPacketContaine
   send( sendBuffer );
 }
 
-void Sapphire::Network::GameConnection::sendPackets( Packets::PacketContainer* pPacket )
+void Lobby::Network::GameConnection::sendPackets( Common::Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -436,14 +436,14 @@ void Sapphire::Network::GameConnection::sendPackets( Packets::PacketContainer* p
   send( sendBuffer );
 }
 
-void Sapphire::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
+void Lobby::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
 {
   PacketContainer pRP = PacketContainer();
   pRP.addPacket( pPacket );
   sendPackets( &pRP );
 }
 
-void Sapphire::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
+void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
 {
   memset( m_baseKey, 0, 0x2C );
   m_baseKey[ 0 ] = 0x78;
@@ -454,11 +454,11 @@ void Sapphire::Network::GameConnection::generateEncryptionKey( uint32_t key, con
   m_baseKey[ 8 ] = 0xC6;
   m_baseKey[ 9 ] = 0x11;
   memcpy( ( char* ) m_baseKey + 0x0C, keyPhrase.c_str(), keyPhrase.size() );
-  Sapphire::Util::md5( m_baseKey, m_encKey, 0x2C );
+  Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                                                       const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
+void Lobby::Network::GameConnection::handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                                                    const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
   for( auto inPacket : packetData )
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index 42f0a3a2..a04a84f0 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -16,10 +16,10 @@
 
 #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer )
 
-namespace Sapphire::Network
+namespace Sapphire::Lobby::Network
 {
 
-  class GameConnection : public Connection
+  class GameConnection : public Common::Network::Connection
   {
 
   private:
@@ -32,16 +32,16 @@ namespace Sapphire::Network
 
     bool m_bEncryptionInitialized;
 
-    AcceptorPtr m_pAcceptor;
+    Common::Network::AcceptorPtr m_pAcceptor;
 
     LobbySessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Packets::GamePacketPtr > m_inQueue;
-    Common::Util::LockedQueue< Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( HivePtr pHive, AcceptorPtr pAcceptor, FrameworkPtr pFw );
+    GameConnection( Common::Network::HivePtr pHive, Common::Network::AcceptorPtr pAcceptor, Common::FrameworkPtr pFw );
 
     ~GameConnection();
 
@@ -58,26 +58,26 @@ namespace Sapphire::Network
 
     void sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId );
 
-    void getCharList( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void getCharList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void enterWorld( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void enterWorld( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool sendServiceAccountList( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool sendServiceAccountList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool createOrModifyChar( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool createOrModifyChar( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void handlePackets( const Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                        const std::vector< Packets::FFXIVARR_PACKET_RAW >& packetData );
+    void handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                        const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
 
-    void handleGamePacket( Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handlePacket( Packets::FFXIVPacketBasePtr pPacket );
+    void handlePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
 
-    void sendPackets( Packets::PacketContainer* pPacket );
+    void sendPackets( Common::Network::Packets::PacketContainer* pPacket );
 
     void sendPacket( Packets::LobbyPacketContainer& pLpc );
 
-    void sendSinglePacket( Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
 
 
   };
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index c1c7366c..8b81c3d8 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -4,25 +4,26 @@
 #include <Crypt/blowfish.h>
 #include <Common.h>
 
+using namespace Sapphire;
 using namespace Sapphire::Common;
-using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Common::Network::Packets;
 
-Sapphire::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
+Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
 {
-  memset( &m_header, 0, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
-  m_header.size = sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER );
+  memset( &m_header, 0, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  m_header.size = sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER );
 
   m_encKey = encKey;
 
   memset( m_dataBuf, 0, 0x1570 );
 }
 
-Sapphire::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer()
+Lobby::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer()
 {
   m_entryList.clear();
 }
 
-void Sapphire::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
+void Lobby::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
 {
   memcpy( m_dataBuf + m_header.size, &pEntry->getData()[ 0 ], pEntry->getSize() );
 
@@ -38,18 +39,18 @@ void Sapphire::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBas
   m_header.count++;
 }
 
-uint16_t Sapphire::Network::Packets::LobbyPacketContainer::getSize() const
+uint16_t Lobby::Network::Packets::LobbyPacketContainer::getSize() const
 {
   return m_header.size;
 }
 
-uint8_t* Sapphire::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff )
+uint8_t* Lobby::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff )
 {
   if( addstuff )
   {
     m_header.unknown_0 = 0xff41a05252;
     m_header.timestamp = Common::Util::getTimeMs();
   }
-  memcpy( m_dataBuf, &m_header, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  memcpy( m_dataBuf, &m_header, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   return m_dataBuf;
 }
diff --git a/src/lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h
index 9f40ef93..f6c714a8 100644
--- a/src/lobby/LobbyPacketContainer.h
+++ b/src/lobby/LobbyPacketContainer.h
@@ -9,10 +9,10 @@
 
 #include "Forwards.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Lobby::Network::Packets
 {
 
-  using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
+  using FFXIVPacketBasePtr = std::shared_ptr< Common::Network::Packets::FFXIVPacketBase >;
 
   class LobbyPacketContainer
   {
@@ -28,7 +28,7 @@ namespace Sapphire::Network::Packets
     uint8_t* getRawData( bool addstuff = true );
 
   private:
-    Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
+    Common::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
 
     uint8_t* m_encKey;
 
diff --git a/src/lobby/LobbySession.cpp b/src/lobby/LobbySession.cpp
index 4cdd58b8..dc30fae2 100644
--- a/src/lobby/LobbySession.cpp
+++ b/src/lobby/LobbySession.cpp
@@ -1,6 +1,7 @@
 #include "LobbySession.h"
 
-namespace Sapphire {
+using namespace Sapphire::Lobby;
+
 LobbySession::LobbySession( void )
 {
   //setSocket(NULL);
@@ -11,5 +12,4 @@ LobbySession::~LobbySession( void )
 {
 
 }
-}
 
diff --git a/src/lobby/LobbySession.h b/src/lobby/LobbySession.h
index 95eeb5f8..66a77c27 100644
--- a/src/lobby/LobbySession.h
+++ b/src/lobby/LobbySession.h
@@ -7,7 +7,7 @@
 #include <string>
 #include <string.h>
 
-namespace Sapphire
+namespace Sapphire::Lobby
 {
 
   class LobbySession
diff --git a/src/lobby/RestConnector.cpp b/src/lobby/RestConnector.cpp
index 94c988f0..738af406 100644
--- a/src/lobby/RestConnector.cpp
+++ b/src/lobby/RestConnector.cpp
@@ -8,19 +8,21 @@
 
 #include <nlohmann/json.hpp>
 
+using namespace Sapphire;
+
 typedef std::vector< std::tuple< std::string, uint32_t, uint64_t, std::string > > CharList;
 
-Sapphire::Network::RestConnector::RestConnector()
+Lobby::Network::RestConnector::RestConnector()
 {
 
 }
 
-Sapphire::Network::RestConnector::~RestConnector()
+Lobby::Network::RestConnector::~RestConnector()
 {
 
 }
 
-HttpResponse Sapphire::Network::RestConnector::requestApi( std::string endpoint, std::string data )
+HttpResponse Lobby::Network::RestConnector::requestApi( std::string endpoint, std::string data )
 {
   HttpClient client( restHost );
 
@@ -39,7 +41,7 @@ HttpResponse Sapphire::Network::RestConnector::requestApi( std::string endpoint,
   return r;
 }
 
-Sapphire::LobbySessionPtr Sapphire::Network::RestConnector::getSession( char* sId )
+Lobby::LobbySessionPtr Lobby::Network::RestConnector::getSession( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -65,7 +67,7 @@ Sapphire::LobbySessionPtr Sapphire::Network::RestConnector::getSession( char* sI
 
     if( content.find( "invalid" ) == std::string::npos )
     {
-      LobbySessionPtr pSession( new Sapphire::LobbySession() );
+      LobbySessionPtr pSession( new Lobby::LobbySession() );
       pSession->setAccountID( json["result"].get< uint32_t >() );
       pSession->setSessionId( ( uint8_t* ) sId );
       return pSession;
@@ -81,7 +83,7 @@ Sapphire::LobbySessionPtr Sapphire::Network::RestConnector::getSession( char* sI
   }
 }
 
-bool Sapphire::Network::RestConnector::checkNameTaken( std::string name )
+bool Lobby::Network::RestConnector::checkNameTaken( std::string name )
 {
   std::string json_string = "{\"name\": \"" + name + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -115,7 +117,7 @@ bool Sapphire::Network::RestConnector::checkNameTaken( std::string name )
   }
 }
 
-uint32_t Sapphire::Network::RestConnector::getNextCharId()
+uint32_t Lobby::Network::RestConnector::getNextCharId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -154,7 +156,7 @@ uint32_t Sapphire::Network::RestConnector::getNextCharId()
   }
 }
 
-uint64_t Sapphire::Network::RestConnector::getNextContentId()
+uint64_t Lobby::Network::RestConnector::getNextContentId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -193,7 +195,7 @@ uint64_t Sapphire::Network::RestConnector::getNextContentId()
   }
 }
 
-CharList Sapphire::Network::RestConnector::getCharList( char* sId )
+CharList Lobby::Network::RestConnector::getCharList( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -249,7 +251,7 @@ CharList Sapphire::Network::RestConnector::getCharList( char* sId )
   }
 }
 
-bool Sapphire::Network::RestConnector::deleteCharacter( char* sId, std::string name )
+bool Lobby::Network::RestConnector::deleteCharacter( char* sId, std::string name )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name + "\"}";
@@ -283,11 +285,11 @@ bool Sapphire::Network::RestConnector::deleteCharacter( char* sId, std::string n
   }
 }
 
-int Sapphire::Network::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
+int Lobby::Network::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name +
-    "\",\"infoJson\": \"" + Sapphire::Util::base64Encode( ( uint8_t* ) infoJson.c_str(), infoJson.length() ) + "\"}";
+    "\",\"infoJson\": \"" + Common::Util::base64Encode( ( uint8_t* ) infoJson.c_str(), infoJson.length() ) + "\"}";
 
   HttpResponse r = requestApi( "createCharacter", json_string );
 
diff --git a/src/lobby/RestConnector.h b/src/lobby/RestConnector.h
index b8c2935c..05461535 100644
--- a/src/lobby/RestConnector.h
+++ b/src/lobby/RestConnector.h
@@ -15,7 +15,7 @@ namespace Sapphire
   class Session;
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Lobby::Network
 {
   class LobbySession;
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index 9d243624..68076f72 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -21,9 +21,9 @@
 
 #include <thread>
 
-Sapphire::Network::RestConnector g_restConnector;
+Sapphire::Lobby::Network::RestConnector g_restConnector;
 
-namespace Sapphire
+namespace Sapphire::Lobby
 {
 
 
@@ -31,7 +31,7 @@ namespace Sapphire
     m_configPath( configPath ),
     m_numConnections( 0 )
   {
-    m_pConfig = std::make_shared< ConfigMgr >();
+    m_pConfig = std::make_shared< Sapphire::Common::ConfigMgr >();
   }
 
   LobbySessionPtr ServerLobby::getSession( char* sessionId )
@@ -63,15 +63,15 @@ namespace Sapphire
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = std::make_shared< Framework >();
-    Network::HivePtr hive( new Network::Hive() );
-    Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
+    auto pFw = std::make_shared< Common::Framework >();
+    Common::Network::HivePtr hive( new Common::Network::Hive() );
+    Common::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 
     std::vector< std::thread > threadGroup;
 
-    threadGroup.emplace_back( std::bind( &Network::Hive::run, hive.get() ) );
+    threadGroup.emplace_back( std::bind( &Common::Network::Hive::run, hive.get() ) );
 
     for( auto& thread : threadGroup )
       if( thread.joinable() )
diff --git a/src/lobby/ServerLobby.h b/src/lobby/ServerLobby.h
index 99e091ef..c258257a 100644
--- a/src/lobby/ServerLobby.h
+++ b/src/lobby/ServerLobby.h
@@ -9,10 +9,14 @@
 
 const std::string LOBBY_VERSION = "0.0.5";
 
-namespace Sapphire
+namespace Sapphire::Common
+{
+  class ConfigMgr;
+}
+
+namespace Sapphire::Lobby
 {
   class LobbySession;
-  class ConfigMgr;
 
   using LobbySessionMap = std::map< std::string, LobbySessionPtr >;
 
@@ -29,7 +33,7 @@ namespace Sapphire
     uint16_t m_port;
     std::string m_ip;
 
-    std::shared_ptr< ConfigMgr > m_pConfig;
+    std::shared_ptr< Sapphire::Common::ConfigMgr > m_pConfig;
 
   public:
     ServerLobby( const std::string& configPath );
diff --git a/src/lobby/mainLobbyServer.cpp b/src/lobby/mainLobbyServer.cpp
index 957604c8..eb3c7653 100644
--- a/src/lobby/mainLobbyServer.cpp
+++ b/src/lobby/mainLobbyServer.cpp
@@ -4,7 +4,7 @@
 
 Sapphire::Common::Util::CrashHandler crashHandler;
 
-Sapphire::ServerLobby g_serverLobby( "lobby.ini" );
+Sapphire::Lobby::ServerLobby g_serverLobby( "lobby.ini" );
 
 int main( int32_t argc, char* argv[] )
 {
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 9f6671ad..6f3fccca 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -130,8 +130,6 @@ namespace Sapphire::World::Action
 
   protected:
 
-    void calculateActionCost();
-
     bool primaryCostCheck( bool subtractCosts );
     bool secondaryCostCheck( bool subtractCosts );
 
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 56a8fc5d..b5063698 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -28,12 +28,12 @@ namespace Sapphire::Network
     None
   };
 
-  class GameConnection : public Connection
+  class GameConnection : public Common::Network::Connection
   {
 
   private:
     typedef void ( GameConnection::* Handler )( FrameworkPtr pFw,
-                                                const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
+                                                const Common::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                 Entity::Player& player );
 
     using HandlerMap = std::map< uint16_t, Handler >;
@@ -51,7 +51,7 @@ namespace Sapphire::Network
 
     World::SessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
+    Common::Util::LockedQueue< Common::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
     Common::Util::LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 

From 5b473fd16cf3448ab5985a1835ae86eaeff448b2 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 3 Jun 2019 00:21:58 +1000
Subject: [PATCH 07/10] some cleanup, move lobby to Sapphire::Lobby

---
 src/api/Forwards.h                            | 89 -------------------
 src/api/LoginSession.cpp                      | 14 ---
 src/api/LoginSession.h                        | 57 ------------
 src/api/PlayerMinimal.cpp                     |  2 +-
 src/api/PlayerMinimal.h                       |  2 +-
 src/api/SapphireAPI.cpp                       | 34 +++----
 src/api/SapphireAPI.h                         |  8 +-
 src/api/Session.cpp                           |  4 +-
 src/api/Session.h                             |  2 +-
 src/api/main.cpp                              |  7 +-
 src/common/Forwards.h                         | 10 ++-
 src/common/Framework.h                        |  2 +-
 src/common/Network/Acceptor.cpp               |  2 +-
 src/common/Network/Acceptor.h                 |  2 +-
 src/common/Network/CommonActorControl.h       |  2 +-
 src/common/Network/CommonNetwork.h            |  2 +-
 src/common/Network/Connection.cpp             |  2 +-
 src/common/Network/Connection.h               |  8 +-
 src/common/Network/GamePacket.h               |  2 +-
 src/common/Network/GamePacketParser.cpp       |  4 +-
 src/common/Network/GamePacketParser.h         |  2 +-
 src/common/Network/Hive.cpp                   |  2 +-
 src/common/Network/Hive.h                     |  2 +-
 src/common/Network/PacketContainer.cpp        |  2 +-
 src/common/Network/PacketContainer.h          |  2 +-
 .../Network/PacketDef/Chat/ServerChatDef.h    |  2 +-
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Lobby/ServerLobbyDef.h  |  2 +-
 .../Network/PacketDef/Zone/ClientZoneDef.h    |  2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 src/common/Vector3.cpp                        |  4 +-
 src/common/Version.cpp.in                     | 11 ++-
 src/dbm/DbManager.cpp                         |  5 +-
 src/lobby/Forwards.h                          |  9 +-
 src/lobby/GameConnection.cpp                  | 30 ++++---
 src/lobby/GameConnection.h                    | 30 +++----
 src/lobby/LobbyPacketContainer.cpp            |  8 +-
 src/lobby/LobbyPacketContainer.h              |  4 +-
 src/lobby/ServerLobby.cpp                     | 10 ++-
 src/world/Network/GameConnection.h            | 14 +--
 src/world/ServerMgr.cpp                       |  6 +-
 src/world/mainGameServer.cpp                  |  2 +-
 42 files changed, 126 insertions(+), 282 deletions(-)
 delete mode 100644 src/api/Forwards.h
 delete mode 100644 src/api/LoginSession.cpp
 delete mode 100644 src/api/LoginSession.h

diff --git a/src/api/Forwards.h b/src/api/Forwards.h
deleted file mode 100644
index 8c50d1ff..00000000
--- a/src/api/Forwards.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef _FORWARDS_H
-#define _FORWARDS_H
-
-#include <memory>
-
-namespace Sapphire
-{
-  class Cell;
-  class Zone;
-  class Item;
-  class ItemContainer;
-  class Inventory;
-  class Session;
-  class ZonePosition;
-  using ZonePtr = std::shared_ptr< Zone >;
-  using ItemPtr =  std::shared_ptr< Item >;
-  using ItemContainerPtr = std::shared_ptr< ItemContainer >;
-  using InventoryPtr = std::shared_ptr< Inventory >;
-  using SessionPtr = std::shared_ptr< Session >;
-  using ZonePositionPtr = std::shared_ptr< ZonePosition >;
-
-  namespace StatusEffect
-  {
-    class StatusEffect;
-    class StatusEffectContainer;
-    using StatusEffectPtr = std::shared_ptr< StatusEffect >;
-    using StatusEffectContainerPtr = std::shared_ptr< StatusEffectContainer >;
-  }
-
-  namespace Entity
-  {
-    class Chara;
-    class Player;
-    class BattleNpc;
-    using ActorPtr = std::shared_ptr< Chara >;
-    using PlayerPtr = std::shared_ptr< Player >;
-    using BattleNpcPtr = std::shared_ptr< BattleNpc >;
-  }
-
-  namespace Event
-  {
-    class EventHandler;
-    using EventPtr = std::shared_ptr< EventHandler >;
-  }
-
-  namespace Action
-  {
-    class Action;
-    class ActionTeleport;
-    class EventAction;
-    using ActionPtr = std::shared_ptr< Action >;
-    using ActionTeleportPtr = std::shared_ptr< ActionTeleport >;
-    using EventActionPtr = std::shared_ptr< EventAction >;
-  }
-
-  namespace Network
-  {
-    class Hive;
-    class Acceptor;
-    class Connection;
-    class WorldConnection;
-    class SessionConnection;
-    class ZoneConnection;
-    using HivePtr = std::shared_ptr< Hive >;
-    using AcceptorPtr = std::shared_ptr< Acceptor >;
-    using ConnectionPtr = std::shared_ptr< Connection >;
-    using WorldConnectionPtr = std::shared_ptr< WorldConnection >;
-    using ZoneConnectionPtr = std::shared_ptr< ZoneConnection >;
-    using SessionConnectionPtr = std::shared_ptr< SessionConnection >;
-
-    namespace Packets
-    {
-      class GamePacket;
-      using GamePacketPtr = std::shared_ptr< GamePacket >;
-    }
-
-  }
-
-  namespace Scripting
-  {
-  using EventReturnCallback = std::function< void( Entity::Player&, uint32_t, uint16_t, uint16_t, uint16_t,
-                                                   uint16_t ) >;
-  }
-
-  using ActionCallback = std::function< void( Entity::Player&, uint32_t, uint64_t ) >;
-
-}
-
-#endif
diff --git a/src/api/LoginSession.cpp b/src/api/LoginSession.cpp
deleted file mode 100644
index 9b947d19..00000000
--- a/src/api/LoginSession.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "LoginSession.h"
-
-namespace Sapphire {
-  LoginSession::LoginSession( void )
-  {
-    //setSocket(NULL);
-  }
-
-  LoginSession::~LoginSession( void )
-  {
-
-  }
-}
-
diff --git a/src/api/LoginSession.h b/src/api/LoginSession.h
deleted file mode 100644
index 1811bf09..00000000
--- a/src/api/LoginSession.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#ifndef _CLoginSession_H_
-#define _CLoginSession_H_
-
-#include <stdint.h>
-#include <string>
-#include <string.h>
-
-namespace Sapphire
-{
-
-  class LoginSession
-  {
-
-  private:
-    uint32_t m_ip;
-    uint32_t m_accountId;
-    uint8_t m_sessionId[56];
-
-  public:
-    std::string newCharName;
-
-    LoginSession( void );
-
-    ~LoginSession( void );
-
-    uint32_t getIp()
-    {
-      return m_ip;
-    }
-
-    void setSessionId( uint8_t* sessionId )
-    {
-      memcpy( m_sessionId, sessionId, 56 );
-    }
-
-    void setIp( uint32_t ip )
-    {
-      m_ip = ip;
-    }
-
-    uint32_t getAccountId()
-    {
-      return m_accountId;
-    }
-
-    void setAccountId( uint32_t id )
-    {
-      m_accountId = id;
-    }
-
-  };
-
-}
-
-#endif
diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index 70aeca40..37d08121 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -8,7 +8,7 @@
 
 extern Sapphire::Data::ExdDataGenerated g_exdDataGen;
 
-namespace Sapphire {
+namespace Sapphire::API {
 
 using namespace Common;
 
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index dda3202e..a9af97bb 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 
-namespace Sapphire
+namespace Sapphire::API
 {
 
   class PlayerMinimal
diff --git a/src/api/SapphireAPI.cpp b/src/api/SapphireAPI.cpp
index f07c7ce5..ed296ffd 100644
--- a/src/api/SapphireAPI.cpp
+++ b/src/api/SapphireAPI.cpp
@@ -10,7 +10,9 @@
 
 #include <Database/DatabaseDef.h>
 
-bool Sapphire::Network::SapphireAPI::login( const std::string& username, const std::string& pass, std::string& sId )
+using namespace Sapphire::API;
+
+bool SapphireAPI::login( const std::string& username, const std::string& pass, std::string& sId )
 {
   std::string query =
     "SELECT account_id FROM accounts WHERE account_name = '" + username + "' AND account_pass = '" + pass + "';";
@@ -53,7 +55,7 @@ bool Sapphire::Network::SapphireAPI::login( const std::string& username, const s
 }
 
 
-bool Sapphire::Network::SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
+bool SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
 {
   // create session for the new sessionid and store to sessionlist
   auto pSession = std::make_shared< Session >();
@@ -66,7 +68,7 @@ bool Sapphire::Network::SapphireAPI::insertSession( const uint32_t accountId, st
 
 }
 
-bool Sapphire::Network::SapphireAPI::createAccount( const std::string& username, const std::string& pass, std::string& sId )
+bool SapphireAPI::createAccount( const std::string& username, const std::string& pass, std::string& sId )
 {
   // get account from login name
   auto pQR = g_charaDb.query( "SELECT account_id FROM accounts WHERE account_name = '" + username + "';" );
@@ -96,11 +98,11 @@ bool Sapphire::Network::SapphireAPI::createAccount( const std::string& username,
 
 }
 
-int Sapphire::Network::SapphireAPI::createCharacter( const uint32_t accountId, const std::string& name,
-                                                     const std::string& infoJson,
-                                                     const uint32_t gmRank )
+int SapphireAPI::createCharacter( const uint32_t accountId, const std::string& name,
+                                           const std::string& infoJson,
+                                           const uint32_t gmRank )
 {
-  Sapphire::PlayerMinimal newPlayer;
+  API::PlayerMinimal newPlayer;
 
   newPlayer.setAccountId( accountId );
   newPlayer.setId( getNextCharId() );
@@ -169,7 +171,7 @@ int Sapphire::Network::SapphireAPI::createCharacter( const uint32_t accountId, c
   return newPlayer.getAccountId();
 }
 
-void Sapphire::Network::SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
+void SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
 {
   PlayerMinimal deletePlayer;
   auto charList = getCharList( accountId );
@@ -199,17 +201,17 @@ void Sapphire::Network::SapphireAPI::deleteCharacter( std::string name, const ui
   g_charaDb.execute( "DELETE FROM charaquest WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
 }
 
-std::vector< Sapphire::PlayerMinimal > Sapphire::Network::SapphireAPI::getCharList( uint32_t accountId )
+std::vector< PlayerMinimal > SapphireAPI::getCharList( uint32_t accountId )
 {
 
-  std::vector< Sapphire::PlayerMinimal > charList;
+  std::vector< API::PlayerMinimal > charList;
 
   auto pQR = g_charaDb.query(
     "SELECT CharacterId, ContentId FROM charainfo WHERE AccountId = " + std::to_string( accountId ) + ";" );
 
   while( pQR->next() )
   {
-    Sapphire::PlayerMinimal player;
+    API::PlayerMinimal player;
 
     uint32_t charId = pQR->getUInt( 1 );
 
@@ -220,7 +222,7 @@ std::vector< Sapphire::PlayerMinimal > Sapphire::Network::SapphireAPI::getCharLi
   return charList;
 }
 
-bool Sapphire::Network::SapphireAPI::checkNameTaken( std::string name )
+bool SapphireAPI::checkNameTaken( std::string name )
 {
 
   g_charaDb.escapeString( name );
@@ -234,7 +236,7 @@ bool Sapphire::Network::SapphireAPI::checkNameTaken( std::string name )
     return true;
 }
 
-uint32_t Sapphire::Network::SapphireAPI::getNextCharId()
+uint32_t SapphireAPI::getNextCharId()
 {
   uint32_t charId = 0;
 
@@ -250,7 +252,7 @@ uint32_t Sapphire::Network::SapphireAPI::getNextCharId()
   return charId;
 }
 
-uint64_t Sapphire::Network::SapphireAPI::getNextContentId()
+uint64_t SapphireAPI::getNextContentId()
 {
   uint64_t contentId = 0;
 
@@ -266,7 +268,7 @@ uint64_t Sapphire::Network::SapphireAPI::getNextContentId()
   return contentId;
 }
 
-int Sapphire::Network::SapphireAPI::checkSession( const std::string& sId )
+int SapphireAPI::checkSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
@@ -277,7 +279,7 @@ int Sapphire::Network::SapphireAPI::checkSession( const std::string& sId )
 }
 
 
-bool Sapphire::Network::SapphireAPI::removeSession( const std::string& sId )
+bool SapphireAPI::removeSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
diff --git a/src/api/SapphireAPI.h b/src/api/SapphireAPI.h
index 7b2bbd4c..222643b0 100644
--- a/src/api/SapphireAPI.h
+++ b/src/api/SapphireAPI.h
@@ -7,13 +7,9 @@
 #include <memory>
 #include "PlayerMinimal.h"
 
-namespace Sapphire
+namespace Sapphire::API
 {
   class Session;
-}
-
-namespace Sapphire::Network
-{
 
   class SapphireAPI
   {
@@ -34,7 +30,7 @@ namespace Sapphire::Network
 
     bool insertSession( uint32_t accountId, std::string& sId );
 
-    std::vector< Sapphire::PlayerMinimal > getCharList( uint32_t accountId );
+    std::vector< API::PlayerMinimal > getCharList( uint32_t accountId );
 
     bool checkNameTaken( std::string name );
 
diff --git a/src/api/Session.cpp b/src/api/Session.cpp
index fc40d265..b0992293 100644
--- a/src/api/Session.cpp
+++ b/src/api/Session.cpp
@@ -1,6 +1,7 @@
 #include "Session.h"
 
-namespace Sapphire {
+using namespace Sapphire::API;
+
 Session::Session()
 {
 
@@ -35,4 +36,3 @@ void Session::setAccountId( uint32_t id )
 {
   m_accountId = id;
 }
-}
diff --git a/src/api/Session.h b/src/api/Session.h
index 5d9efc41..c6fc26fe 100644
--- a/src/api/Session.h
+++ b/src/api/Session.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <string.h>
 
-namespace Sapphire
+namespace Sapphire::API
 {
 
   class Session
diff --git a/src/api/main.cpp b/src/api/main.cpp
index 3ea413f3..191660e4 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -29,7 +29,6 @@
 #include <Framework.h>
 #include <Logging/Logger.h>
 
-#include "Forwards.h"
 #include "SapphireAPI.h"
 
 #include <Util/CrashHandler.h>
@@ -38,7 +37,7 @@ Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb;
 Sapphire::Data::ExdDataGenerated g_exdDataGen;
-Sapphire::Network::SapphireAPI g_sapphireAPI;
+Sapphire::API::SapphireAPI g_sapphireAPI;
 
 namespace fs = std::experimental::filesystem;
 
@@ -59,7 +58,7 @@ Sapphire::Common::Config::ApiConfig   m_config;
 
 void reloadConfig()
 {
-  auto pConfig = std::make_shared< Sapphire::ConfigMgr >();
+  auto pConfig = std::make_shared< Sapphire::Common::ConfigMgr >();
 
   Logger::info( "Loading config " + configPath );
 
@@ -336,7 +335,7 @@ void createCharacter( shared_ptr< HttpServer::Response > response, shared_ptr< H
     std::string name = json["name"];
     std::string infoJson = json["infoJson"];
 
-    std::string finalJson = Sapphire::Util::base64Decode( infoJson );
+    std::string finalJson = Common::Util::base64Decode( infoJson );
 
     // reloadConfig();
 
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 085dfbe9..620e39a9 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -3,6 +3,12 @@
 
 #include <memory>
 
+namespace Sapphire
+{
+  class Framework;
+  using FrameworkPtr = std::shared_ptr< Framework >;
+}
+
 namespace Sapphire::Common
 {
   class ConfigMgr;
@@ -11,7 +17,7 @@ namespace Sapphire::Common
   using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
   class Hive;
   class Acceptor;
@@ -21,7 +27,7 @@ namespace Sapphire::Common::Network
   using ConnectionPtr = std::shared_ptr< Connection >;
 }
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
   class GamePacket;
   class FFXIVPacketBase;
diff --git a/src/common/Framework.h b/src/common/Framework.h
index 0e752801..5714bdb3 100644
--- a/src/common/Framework.h
+++ b/src/common/Framework.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <cassert>
 
-namespace Sapphire::Common
+namespace Sapphire
 {
 
   class Framework
diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp
index 2238b5fa..43c17d8f 100644
--- a/src/common/Network/Acceptor.cpp
+++ b/src/common/Network/Acceptor.cpp
@@ -3,7 +3,7 @@
 #include "Connection.h"
 
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 Network::Acceptor::Acceptor( HivePtr hive ) :
   m_hive( hive ),
diff --git a/src/common/Network/Acceptor.h b/src/common/Network/Acceptor.h
index e1a663eb..faae123f 100644
--- a/src/common/Network/Acceptor.h
+++ b/src/common/Network/Acceptor.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
 
   class Connection;
diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 043715f1..b3ecf167 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -10,7 +10,7 @@
 // The following enumerations are structures to require their type be included.
 // They are also defined within the Sapphire::Common namespace to avoid collisions.
 // +---------------------------------------------------------------------------
-namespace Sapphire::Common::Network::ActorControl
+namespace Sapphire::Network::ActorControl
 {
 
 enum ActorControlType : uint16_t
diff --git a/src/common/Network/CommonNetwork.h b/src/common/Network/CommonNetwork.h
index c4a27604..1a2bd4d6 100644
--- a/src/common/Network/CommonNetwork.h
+++ b/src/common/Network/CommonNetwork.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   /**
diff --git a/src/common/Network/Connection.cpp b/src/common/Network/Connection.cpp
index 3ac0bee6..1bc9054a 100644
--- a/src/common/Network/Connection.cpp
+++ b/src/common/Network/Connection.cpp
@@ -3,7 +3,7 @@
 #include <functional>
 #include "Framework.h"
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
   m_hive( hive ),
diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h
index 3a4623d2..ef5c4070 100644
--- a/src/common/Network/Connection.h
+++ b/src/common/Network/Connection.h
@@ -12,13 +12,7 @@
 #include "Acceptor.h"
 #include <memory>
 
-namespace Sapphire::Common
-{
-  class Framework;
-  using FrameworkPtr = std::shared_ptr< Framework >;
-}
-
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
 
   class Hive;
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index f40eadc7..c1c06b76 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -14,7 +14,7 @@
 #include "CommonNetwork.h"
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   // Must forward define these in order to enable the compiler to produce the
diff --git a/src/common/Network/GamePacketParser.cpp b/src/common/Network/GamePacketParser.cpp
index 4577c21e..b14d2657 100644
--- a/src/common/Network/GamePacketParser.cpp
+++ b/src/common/Network/GamePacketParser.cpp
@@ -3,8 +3,8 @@
 
 #include <string.h>   // memcpy
 
-using namespace Sapphire::Common;
-using namespace Sapphire::Common::Network::Packets;
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
 
 PacketParseResult Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
                                                          const uint32_t offset,
diff --git a/src/common/Network/GamePacketParser.h b/src/common/Network/GamePacketParser.h
index e847a7c4..c50b486a 100644
--- a/src/common/Network/GamePacketParser.h
+++ b/src/common/Network/GamePacketParser.h
@@ -3,7 +3,7 @@
 
 #include "CommonNetwork.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   enum PacketParseResult
diff --git a/src/common/Network/Hive.cpp b/src/common/Network/Hive.cpp
index 20279869..758c30d3 100644
--- a/src/common/Network/Hive.cpp
+++ b/src/common/Network/Hive.cpp
@@ -2,7 +2,7 @@
 #include <functional>
 #include "Hive.h"
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 //-----------------------------------------------------------------------------
 
diff --git a/src/common/Network/Hive.h b/src/common/Network/Hive.h
index 76e53814..8ac37328 100644
--- a/src/common/Network/Hive.h
+++ b/src/common/Network/Hive.h
@@ -5,7 +5,7 @@
 #include <atomic>
 #include <memory>
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
 
   class Hive : public std::enable_shared_from_this< Hive >
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index 7cff0b48..0b6fa1b1 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <memory>
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
   m_segmentTargetOverride( segmentTargetOverride )
diff --git a/src/common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h
index 337d73e0..80a35cf1 100644
--- a/src/common/Network/PacketContainer.h
+++ b/src/common/Network/PacketContainer.h
@@ -8,7 +8,7 @@
 #include "GamePacket.h"
 #include "Forwards.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h
index 8c6c8e01..ce614f7c 100644
--- a/src/common/Network/PacketDef/Chat/ServerChatDef.h
+++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h
@@ -4,7 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Server
+namespace Sapphire::Network::Packets::Server
 {
 
 /**
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 5d769f71..c6fdac98 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
index d679db5e..811a6e4f 100644
--- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
+++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
@@ -4,7 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Server {
+namespace Sapphire::Network::Packets::Server {
 
 struct FFXIVIpcRetainerList :
   FFXIVIpcBasePacket< LobbyRetainerList >
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 424602d8..bf19fb7e 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -4,7 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Client
+namespace Sapphire::Network::Packets::Client
 {
 
 struct FFXIVIpcGmCommand1 :
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index f95b2736..80588a04 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -10,7 +10,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Server
+namespace Sapphire::Network::Packets::Server
 {
 
   /**
diff --git a/src/common/Vector3.cpp b/src/common/Vector3.cpp
index b2f7f993..e364fc99 100644
--- a/src/common/Vector3.cpp
+++ b/src/common/Vector3.cpp
@@ -1,6 +1,8 @@
 #include "Vector3.h"
 
-inline bool Sapphire::Common::FFXIVARR_POSITION3::operator == ( const FFXIVARR_POSITION3& target ) const
+using namespace Sapphire::Common;
+
+inline bool FFXIVARR_POSITION3::operator == ( const FFXIVARR_POSITION3& target ) const
 {
   return x == target.x && y == target.y && z == target.z;
 }
diff --git a/src/common/Version.cpp.in b/src/common/Version.cpp.in
index 9f973861..cd011ae5 100644
--- a/src/common/Version.cpp.in
+++ b/src/common/Version.cpp.in
@@ -1,10 +1,9 @@
 #include "Version.h"
 
-namespace Sapphire {
-namespace Version {
+namespace Sapphire::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 */
-} /* Sapphire */
+} /* Sapphire::Version */
diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
index 1be6b172..b81790a4 100644
--- a/src/dbm/DbManager.cpp
+++ b/src/dbm/DbManager.cpp
@@ -17,10 +17,7 @@ DbManager::DbManager( const std::string& host, const std::string& database, cons
 {
 }
 
-DbManager::~DbManager()
-{
-
-}
+DbManager::~DbManager() = default;
 
 bool DbManager::execute( const std::string& sql )
 {
diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index d32f6f16..58a724d6 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -12,6 +12,11 @@ x ## Ptr make_ ## x( Args &&...args ) { \
 return std::make_shared< x >( std::forward< Args >( args ) ... ); }\
 typedef std::vector< x > x ## PtrList;
 
+namespace Sapphire
+{
+  TYPE_FORWARD( Framework );
+}
+
 namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
@@ -22,14 +27,14 @@ namespace Sapphire::Lobby::Network
   TYPE_FORWARD( GameConnection );
 }
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
   TYPE_FORWARD( Hive );
   TYPE_FORWARD( Acceptor );
   TYPE_FORWARD( Connection );
 }
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
   TYPE_FORWARD( GamePacket );
   TYPE_FORWARD( FFXIVPacketBase );
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 1fca879b..034b4755 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -15,17 +15,19 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 
+#include "Forwards.h"
+
 using namespace Sapphire;
-using namespace Sapphire::Common::Network::Packets;
-using namespace Sapphire::Common::Network::Packets::Server;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
 
 extern Lobby::ServerLobby g_serverLobby;
 extern Lobby::Network::RestConnector g_restConnector;
 
-Lobby::Network::GameConnection::GameConnection( Common::Network::HivePtr pHive,
-                                                Common::Network::AcceptorPtr pAcceptor,
-                                                Common::FrameworkPtr pFw ) :
-  Common::Network::Connection( pHive, pFw ),
+Lobby::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
+                                                Sapphire::Network::AcceptorPtr pAcceptor,
+                                                FrameworkPtr pFw ) :
+  Sapphire::Network::Connection( pHive, pFw ),
   m_pAcceptor( pAcceptor ),
   m_bEncryptionInitialized( false )
 {
@@ -56,8 +58,8 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-  Common::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
-  const auto headerResult = Common::Network::Packets::getHeader( m_packets, 0, packetHeader );
+  Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
+  const auto headerResult = Sapphire::Network::Packets::getHeader( m_packets, 0, packetHeader );
 
   if( headerResult == Incomplete )
     return;
@@ -70,8 +72,8 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
   }
 
   // Dissect packet list
-  std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
-  const auto packetResult = Common::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
+  std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
+  const auto packetResult = Sapphire::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
                                                                   packetHeader, packetList );
 
   if( packetResult == Incomplete )
@@ -381,7 +383,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
   return false;
 }
 
-void Lobby::Network::GameConnection::handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::Network::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -428,7 +430,7 @@ void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer&
   send( sendBuffer );
 }
 
-void Lobby::Network::GameConnection::sendPackets( Common::Network::Packets::PacketContainer* pPacket )
+void Lobby::Network::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -457,8 +459,8 @@ void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const
   Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Lobby::Network::GameConnection::handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                                                    const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
+void Lobby::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                                                    const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
   for( auto inPacket : packetData )
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index a04a84f0..1ca20a89 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -19,7 +19,7 @@
 namespace Sapphire::Lobby::Network
 {
 
-  class GameConnection : public Common::Network::Connection
+  class GameConnection : public Sapphire::Network::Connection
   {
 
   private:
@@ -32,16 +32,16 @@ namespace Sapphire::Lobby::Network
 
     bool m_bEncryptionInitialized;
 
-    Common::Network::AcceptorPtr m_pAcceptor;
+    Sapphire::Network::AcceptorPtr m_pAcceptor;
 
     LobbySessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_inQueue;
-    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( Common::Network::HivePtr pHive, Common::Network::AcceptorPtr pAcceptor, Common::FrameworkPtr pFw );
+    GameConnection( Sapphire::Network::HivePtr pHive, Sapphire::Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
 
     ~GameConnection();
 
@@ -58,26 +58,26 @@ namespace Sapphire::Lobby::Network
 
     void sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId );
 
-    void getCharList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void getCharList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void enterWorld( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void enterWorld( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool sendServiceAccountList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool sendServiceAccountList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool createOrModifyChar( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool createOrModifyChar( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                        const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
+    void handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                        const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
 
-    void handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handlePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void handlePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
 
-    void sendPackets( Common::Network::Packets::PacketContainer* pPacket );
+    void sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket );
 
     void sendPacket( Packets::LobbyPacketContainer& pLpc );
 
-    void sendSinglePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
 
 
   };
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index 8b81c3d8..ae270d8f 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -6,12 +6,12 @@
 
 using namespace Sapphire;
 using namespace Sapphire::Common;
-using namespace Sapphire::Common::Network::Packets;
+using namespace Sapphire::Network::Packets;
 
 Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
 {
-  memset( &m_header, 0, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
-  m_header.size = sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER );
+  memset( &m_header, 0, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  m_header.size = sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER );
 
   m_encKey = encKey;
 
@@ -51,6 +51,6 @@ uint8_t* Lobby::Network::Packets::LobbyPacketContainer::getRawData( bool addstuf
     m_header.unknown_0 = 0xff41a05252;
     m_header.timestamp = Common::Util::getTimeMs();
   }
-  memcpy( m_dataBuf, &m_header, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  memcpy( m_dataBuf, &m_header, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   return m_dataBuf;
 }
diff --git a/src/lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h
index f6c714a8..44a5fd21 100644
--- a/src/lobby/LobbyPacketContainer.h
+++ b/src/lobby/LobbyPacketContainer.h
@@ -12,7 +12,7 @@
 namespace Sapphire::Lobby::Network::Packets
 {
 
-  using FFXIVPacketBasePtr = std::shared_ptr< Common::Network::Packets::FFXIVPacketBase >;
+  using FFXIVPacketBasePtr = std::shared_ptr< Sapphire::Network::Packets::FFXIVPacketBase >;
 
   class LobbyPacketContainer
   {
@@ -28,7 +28,7 @@ namespace Sapphire::Lobby::Network::Packets
     uint8_t* getRawData( bool addstuff = true );
 
   private:
-    Common::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
+    Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
 
     uint8_t* m_encKey;
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index 68076f72..f8029b27 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -21,6 +21,8 @@
 
 #include <thread>
 
+using namespace Sapphire;
+
 Sapphire::Lobby::Network::RestConnector g_restConnector;
 
 namespace Sapphire::Lobby
@@ -63,15 +65,15 @@ namespace Sapphire::Lobby
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = std::make_shared< Common::Framework >();
-    Common::Network::HivePtr hive( new Common::Network::Hive() );
-    Common::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
+    auto pFw = std::make_shared< Framework >();
+    auto hive = Sapphire::Network::make_Hive();
+    Sapphire::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 
     std::vector< std::thread > threadGroup;
 
-    threadGroup.emplace_back( std::bind( &Common::Network::Hive::run, hive.get() ) );
+    threadGroup.emplace_back( std::bind( &Sapphire::Network::Hive::run, hive.get() ) );
 
     for( auto& thread : threadGroup )
       if( thread.joinable() )
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index b5063698..07962fd9 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -28,12 +28,12 @@ namespace Sapphire::Network
     None
   };
 
-  class GameConnection : public Common::Network::Connection
+  class GameConnection : public Network::Connection
   {
 
   private:
     typedef void ( GameConnection::* Handler )( FrameworkPtr pFw,
-                                                const Common::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
+                                                const Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                 Entity::Player& player );
 
     using HandlerMap = std::map< uint16_t, Handler >;
@@ -51,7 +51,7 @@ namespace Sapphire::Network
 
     World::SessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Common::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
+    Common::Util::LockedQueue< Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
     Common::Util::LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
@@ -82,15 +82,15 @@ namespace Sapphire::Network
 
     void processOutQueue();
 
-    void handlePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handlePacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handleZonePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleZonePacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handleChatPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleChatPacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
     void sendPackets( Packets::PacketContainer* pPacket );
 
-    void sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Network::Packets::FFXIVPacketBasePtr pPacket );
 
     void injectPacket( const std::string& packetpath, Entity::Player& player );
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 1929c765..feffd356 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -66,7 +66,7 @@ size_t Sapphire::World::ServerMgr::getSessionCount() const
 
 bool Sapphire::World::ServerMgr::loadSettings( int32_t argc, char* argv[] )
 {
-  auto pConfig = framework()->get< Sapphire::ConfigMgr >();
+  auto pConfig = framework()->get< Common::ConfigMgr >();
 
   Logger::info( "Loading config {0}", m_configName );
 
@@ -123,8 +123,8 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
 
   printBanner();
 
-  auto pConfig = std::make_shared< ConfigMgr >();
-  framework()->set< ConfigMgr >( pConfig );
+  auto pConfig = std::make_shared< Common::ConfigMgr >();
+  framework()->set< Common::ConfigMgr >( pConfig );
   if( !loadSettings( argc, argv ) )
   {
     Logger::fatal( "Unable to load settings!" );
diff --git a/src/world/mainGameServer.cpp b/src/world/mainGameServer.cpp
index 6e4c1ceb..2c77ea66 100644
--- a/src/world/mainGameServer.cpp
+++ b/src/world/mainGameServer.cpp
@@ -12,7 +12,7 @@ Common::Util::CrashHandler crashHandler;
 
 int main( int32_t argc, char* argv[] )
 {
-  auto pFramework = Sapphire::make_Framework();
+  auto pFramework = make_Framework();
   auto pServer = std::make_shared< ServerMgr >( "world.ini", pFramework );
   pFramework->set< ServerMgr >( pServer );
   pServer->run( argc, argv );

From 62e219d9d9f69b5f21fab50410fe0d8bea3d8b12 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 3 Jun 2019 00:39:02 +1000
Subject: [PATCH 08/10] actually fix world building on msvc this time

---
 src/common/Config/ConfigMgr.cpp  |  1 +
 src/common/Forwards.h            |  2 -
 src/world/Action/Action.cpp      | 76 ++++++++++++++++----------------
 src/world/Action/EventAction.cpp |  1 +
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp
index d8283dee..8b8823f2 100644
--- a/src/common/Config/ConfigMgr.cpp
+++ b/src/common/Config/ConfigMgr.cpp
@@ -5,6 +5,7 @@
 
 namespace fs = std::experimental::filesystem;
 
+using namespace Sapphire;
 using namespace Sapphire::Common;
 
 /**
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 620e39a9..1fa810c9 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -12,9 +12,7 @@ namespace Sapphire
 namespace Sapphire::Common
 {
   class ConfigMgr;
-  class Framework;
   using ConfigMgrPtr = std::shared_ptr< ConfigMgr >;
-  using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
 namespace Sapphire::Network
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index c1e071f5..0f0c0bcd 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -21,24 +21,24 @@
 #include <Logging/Logger.h>
 #include <Util/ActorFilter.h>
 
+using namespace Sapphire;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
-
-using namespace Sapphire::World::Action;
+using namespace Sapphire::World;
 
 
-Action::Action() = default;
-Action::~Action() = default;
+Action::Action::Action() = default;
+Action::Action::~Action() = default;
 
-Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
+Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
   Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
 {
 }
 
-Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw ) :
+Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw ) :
   m_pSource( std::move( caster ) ),
   m_pFw( std::move( fw ) ),
   m_actionData( std::move( actionData ) ),
@@ -49,12 +49,12 @@ Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr acti
 {
 }
 
-uint32_t Action::getId() const
+uint32_t Action::Action::getId() const
 {
   return m_id;
 }
 
-bool Action::init()
+bool Action::Action::init()
 {
   if( !m_actionData )
   {
@@ -123,62 +123,62 @@ bool Action::init()
   return true;
 }
 
-void Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
+void Action::Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
 {
   m_pos = pos;
 }
 
-Sapphire::Common::FFXIVARR_POSITION3 Action::getPos() const
+Sapphire::Common::FFXIVARR_POSITION3 Action::Action::getPos() const
 {
   return m_pos;
 }
 
-void Action::setTargetId( uint64_t targetId )
+void Action::Action::setTargetId( uint64_t targetId )
 {
   m_targetId = targetId;
 }
 
-uint64_t Action::getTargetId() const
+uint64_t Action::Action::getTargetId() const
 {
   return m_targetId;
 }
 
-bool Action::hasClientsideTarget() const
+bool Action::Action::hasClientsideTarget() const
 {
   return m_targetId > 0xFFFFFFFF;
 }
 
-bool Action::isInterrupted() const
+bool Action::Action::isInterrupted() const
 {
   return m_interruptType != Common::ActionInterruptType::None;
 }
 
-void Action::setInterrupted( Common::ActionInterruptType type )
+void Action::Action::setInterrupted( Common::ActionInterruptType type )
 {
   m_interruptType = type;
 }
 
-uint32_t Action::getCastTime() const
+uint32_t Action::Action::getCastTime() const
 {
   return m_castTimeMs;
 }
 
-void Action::setCastTime( uint32_t castTime )
+void Action::Action::setCastTime( uint32_t castTime )
 {
   m_castTimeMs = castTime;
 }
 
-bool Action::hasCastTime() const
+bool Action::Action::hasCastTime() const
 {
   return m_castTimeMs > 0;
 }
 
-Sapphire::Entity::CharaPtr Action::getSourceChara() const
+Sapphire::Entity::CharaPtr Action::Action::getSourceChara() const
 {
   return m_pSource;
 }
 
-bool Action::update()
+bool Action::Action::update()
 {
   // action has not been started yet
   if( m_startTime == 0 )
@@ -206,7 +206,7 @@ bool Action::update()
   return false;
 }
 
-void Action::start()
+void Action::Action::start()
 {
   assert( m_pSource );
 
@@ -259,7 +259,7 @@ void Action::start()
     execute();
 }
 
-void Action::interrupt()
+void Action::Action::interrupt()
 {
   assert( m_pSource );
 
@@ -293,7 +293,7 @@ void Action::interrupt()
   pScriptMgr->onInterrupt( *this );
 }
 
-void Action::execute()
+void Action::Action::execute()
 {
   assert( m_pSource );
 
@@ -360,7 +360,7 @@ void Action::execute()
   }
 }
 
-bool Action::preCheck()
+bool Action::Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
   {
@@ -371,7 +371,7 @@ bool Action::preCheck()
   return true;
 }
 
-bool Action::playerPreCheck( Entity::Player& player )
+bool Action::Action::playerPreCheck( Entity::Player& player )
 {
   // lol
   if( !player.isAlive() )
@@ -423,17 +423,17 @@ bool Action::playerPreCheck( Entity::Player& player )
   return true;
 }
 
-uint32_t Action::getAdditionalData() const
+uint32_t Action::Action::getAdditionalData() const
 {
   return m_additionalData;
 }
 
-void Action::setAdditionalData( uint32_t data )
+void Action::Action::setAdditionalData( uint32_t data )
 {
   m_additionalData = data;
 }
 
-bool Action::isComboAction() const
+bool Action::Action::isComboAction() const
 {
   auto lastActionId = m_pSource->getLastComboActionId();
 
@@ -445,7 +445,7 @@ bool Action::isComboAction() const
   return m_actionData->actionCombo == lastActionId;
 }
 
-bool Action::primaryCostCheck( bool subtractCosts )
+bool Action::Action::primaryCostCheck( bool subtractCosts )
 {
   switch( m_primaryCostType )
   {
@@ -488,23 +488,23 @@ bool Action::primaryCostCheck( bool subtractCosts )
   }
 }
 
-bool Action::secondaryCostCheck( bool subtractCosts )
+bool Action::Action::secondaryCostCheck( bool subtractCosts )
 {
   // todo: these need to be mapped
   return true;
 }
 
-bool Action::hasResources()
+bool Action::Action::hasResources()
 {
   return primaryCostCheck( false ) && secondaryCostCheck( false );
 }
 
-bool Action::consumeResources()
+bool Action::Action::consumeResources()
 {
   return primaryCostCheck( true ) && secondaryCostCheck( true );
 }
 
-bool Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
+bool Action::Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
 {
   for( const auto& actor : m_pSource->getInRangeActors( true ) )
   {
@@ -534,12 +534,12 @@ bool Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
   return !actors.empty();
 }
 
-void Action::addActorFilter( World::Util::ActorFilterPtr filter )
+void Action::Action::addActorFilter( World::Util::ActorFilterPtr filter )
 {
   m_actorFilters.push_back( std::move( filter ) );
 }
 
-void Action::addDefaultActorFilters()
+void Action::Action::addDefaultActorFilters()
 {
   switch( m_castType )
   {
@@ -576,7 +576,7 @@ void Action::addDefaultActorFilters()
   }
 }
 
-bool Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
+bool Action::Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
 {
   auto kind = actor.getObjKind();
 
@@ -589,12 +589,12 @@ bool Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
   return true;
 }
 
-std::vector< Sapphire::Entity::CharaPtr >& Action::getHitCharas()
+std::vector< Sapphire::Entity::CharaPtr >& Action::Action::getHitCharas()
 {
   return m_hitActors;
 }
 
-Sapphire::Entity::CharaPtr Action::getHitChara()
+Sapphire::Entity::CharaPtr Action::Action::getHitChara()
 {
   if( !m_hitActors.empty() )
   {
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index 18c8d993..4cf2cd2b 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -11,6 +11,7 @@
 #include "EventAction.h"
 #include "Framework.h"
 
+using namespace Sapphire;
 using namespace Sapphire::World;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network;

From 375ca2f11446a74fc126fc346ff295ede5aa3c9a Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 7 Jun 2019 18:12:35 +1000
Subject: [PATCH 09/10] clean up unnecessary namespace specialisation, flatten
 namespaces a bit

---
 src/api/PlayerMinimal.cpp                    |  2 +-
 src/api/PlayerMinimal.h                      |  2 +-
 src/api/{SapphireAPI.cpp => SapphireApi.cpp} | 36 ++++++------
 src/api/{SapphireAPI.h => SapphireApi.h}     | 10 ++--
 src/api/Session.cpp                          |  2 +-
 src/api/Session.h                            |  2 +-
 src/api/main.cpp                             |  4 +-
 src/common/Util/UtilMath.h                   |  2 +-
 src/lobby/Forwards.h                         |  4 --
 src/lobby/GameConnection.cpp                 | 58 ++++++++++----------
 src/lobby/GameConnection.h                   | 34 ++++++------
 src/lobby/LobbyPacketContainer.cpp           | 10 ++--
 src/lobby/LobbyPacketContainer.h             |  2 +-
 src/lobby/RestConnector.cpp                  | 20 +++----
 src/lobby/RestConnector.h                    |  2 +-
 src/lobby/ServerLobby.cpp                    |  8 +--
 16 files changed, 97 insertions(+), 101 deletions(-)
 rename src/api/{SapphireAPI.cpp => SapphireApi.cpp} (88%)
 rename src/api/{SapphireAPI.h => SapphireApi.h} (85%)

diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index 37d08121..b95a3da1 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -8,7 +8,7 @@
 
 extern Sapphire::Data::ExdDataGenerated g_exdDataGen;
 
-namespace Sapphire::API {
+namespace Sapphire::Api {
 
 using namespace Common;
 
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index a9af97bb..b137af20 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 
-namespace Sapphire::API
+namespace Sapphire::Api
 {
 
   class PlayerMinimal
diff --git a/src/api/SapphireAPI.cpp b/src/api/SapphireApi.cpp
similarity index 88%
rename from src/api/SapphireAPI.cpp
rename to src/api/SapphireApi.cpp
index ed296ffd..f12da082 100644
--- a/src/api/SapphireAPI.cpp
+++ b/src/api/SapphireApi.cpp
@@ -1,4 +1,4 @@
-#include "SapphireAPI.h"
+#include "SapphireApi.h"
 #include <Crypt/base64.h>
 #include "Session.h"
 #include "PlayerMinimal.h"
@@ -10,9 +10,9 @@
 
 #include <Database/DatabaseDef.h>
 
-using namespace Sapphire::API;
+using namespace Sapphire::Api;
 
-bool SapphireAPI::login( const std::string& username, const std::string& pass, std::string& sId )
+bool SapphireApi::login( const std::string& username, const std::string& pass, std::string& sId )
 {
   std::string query =
     "SELECT account_id FROM accounts WHERE account_name = '" + username + "' AND account_pass = '" + pass + "';";
@@ -55,7 +55,7 @@ bool SapphireAPI::login( const std::string& username, const std::string& pass, s
 }
 
 
-bool SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
+bool SapphireApi::insertSession( const uint32_t accountId, std::string& sId )
 {
   // create session for the new sessionid and store to sessionlist
   auto pSession = std::make_shared< Session >();
@@ -68,7 +68,7 @@ bool SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
 
 }
 
-bool SapphireAPI::createAccount( const std::string& username, const std::string& pass, std::string& sId )
+bool SapphireApi::createAccount( const std::string& username, const std::string& pass, std::string& sId )
 {
   // get account from login name
   auto pQR = g_charaDb.query( "SELECT account_id FROM accounts WHERE account_name = '" + username + "';" );
@@ -98,11 +98,11 @@ bool SapphireAPI::createAccount( const std::string& username, const std::string&
 
 }
 
-int SapphireAPI::createCharacter( const uint32_t accountId, const std::string& name,
-                                           const std::string& infoJson,
-                                           const uint32_t gmRank )
+int SapphireApi::createCharacter( const uint32_t accountId, const std::string& name,
+                                  const std::string& infoJson,
+                                  const uint32_t gmRank )
 {
-  API::PlayerMinimal newPlayer;
+  Api::PlayerMinimal newPlayer;
 
   newPlayer.setAccountId( accountId );
   newPlayer.setId( getNextCharId() );
@@ -171,7 +171,7 @@ int SapphireAPI::createCharacter( const uint32_t accountId, const std::string& n
   return newPlayer.getAccountId();
 }
 
-void SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
+void SapphireApi::deleteCharacter( std::string name, const uint32_t accountId )
 {
   PlayerMinimal deletePlayer;
   auto charList = getCharList( accountId );
@@ -201,17 +201,17 @@ void SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
   g_charaDb.execute( "DELETE FROM charaquest WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
 }
 
-std::vector< PlayerMinimal > SapphireAPI::getCharList( uint32_t accountId )
+std::vector< PlayerMinimal > SapphireApi::getCharList( uint32_t accountId )
 {
 
-  std::vector< API::PlayerMinimal > charList;
+  std::vector< Api::PlayerMinimal > charList;
 
   auto pQR = g_charaDb.query(
     "SELECT CharacterId, ContentId FROM charainfo WHERE AccountId = " + std::to_string( accountId ) + ";" );
 
   while( pQR->next() )
   {
-    API::PlayerMinimal player;
+    Api::PlayerMinimal player;
 
     uint32_t charId = pQR->getUInt( 1 );
 
@@ -222,7 +222,7 @@ std::vector< PlayerMinimal > SapphireAPI::getCharList( uint32_t accountId )
   return charList;
 }
 
-bool SapphireAPI::checkNameTaken( std::string name )
+bool SapphireApi::checkNameTaken( std::string name )
 {
 
   g_charaDb.escapeString( name );
@@ -236,7 +236,7 @@ bool SapphireAPI::checkNameTaken( std::string name )
     return true;
 }
 
-uint32_t SapphireAPI::getNextCharId()
+uint32_t SapphireApi::getNextCharId()
 {
   uint32_t charId = 0;
 
@@ -252,7 +252,7 @@ uint32_t SapphireAPI::getNextCharId()
   return charId;
 }
 
-uint64_t SapphireAPI::getNextContentId()
+uint64_t SapphireApi::getNextContentId()
 {
   uint64_t contentId = 0;
 
@@ -268,7 +268,7 @@ uint64_t SapphireAPI::getNextContentId()
   return contentId;
 }
 
-int SapphireAPI::checkSession( const std::string& sId )
+int SapphireApi::checkSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
@@ -279,7 +279,7 @@ int SapphireAPI::checkSession( const std::string& sId )
 }
 
 
-bool SapphireAPI::removeSession( const std::string& sId )
+bool SapphireApi::removeSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
diff --git a/src/api/SapphireAPI.h b/src/api/SapphireApi.h
similarity index 85%
rename from src/api/SapphireAPI.h
rename to src/api/SapphireApi.h
index 222643b0..c11b3c89 100644
--- a/src/api/SapphireAPI.h
+++ b/src/api/SapphireApi.h
@@ -7,15 +7,15 @@
 #include <memory>
 #include "PlayerMinimal.h"
 
-namespace Sapphire::API
+namespace Sapphire::Api
 {
   class Session;
 
-  class SapphireAPI
+  class SapphireApi
   {
   public:
-    SapphireAPI() = default;
-    ~SapphireAPI() = default;
+    SapphireApi() = default;
+    ~SapphireApi() = default;
 
     using SessionMap = std::map< std::string, std::shared_ptr< Session > >;
 
@@ -30,7 +30,7 @@ namespace Sapphire::API
 
     bool insertSession( uint32_t accountId, std::string& sId );
 
-    std::vector< API::PlayerMinimal > getCharList( uint32_t accountId );
+    std::vector< Api::PlayerMinimal > getCharList( uint32_t accountId );
 
     bool checkNameTaken( std::string name );
 
diff --git a/src/api/Session.cpp b/src/api/Session.cpp
index b0992293..c5030b2f 100644
--- a/src/api/Session.cpp
+++ b/src/api/Session.cpp
@@ -1,6 +1,6 @@
 #include "Session.h"
 
-using namespace Sapphire::API;
+using namespace Sapphire::Api;
 
 Session::Session()
 {
diff --git a/src/api/Session.h b/src/api/Session.h
index c6fc26fe..7bb0d71b 100644
--- a/src/api/Session.h
+++ b/src/api/Session.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <string.h>
 
-namespace Sapphire::API
+namespace Sapphire::Api
 {
 
   class Session
diff --git a/src/api/main.cpp b/src/api/main.cpp
index 191660e4..5d661387 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -29,7 +29,7 @@
 #include <Framework.h>
 #include <Logging/Logger.h>
 
-#include "SapphireAPI.h"
+#include "SapphireApi.h"
 
 #include <Util/CrashHandler.h>
 
@@ -37,7 +37,7 @@ Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb;
 Sapphire::Data::ExdDataGenerated g_exdDataGen;
-Sapphire::API::SapphireAPI g_sapphireAPI;
+Sapphire::Api::SapphireApi g_sapphireAPI;
 
 namespace fs = std::experimental::filesystem;
 
diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h
index 93344253..c35ef6be 100644
--- a/src/common/Util/UtilMath.h
+++ b/src/common/Util/UtilMath.h
@@ -11,7 +11,7 @@ namespace Sapphire::Common::Util
   float distanceSq( float x, float y, float z, float x1, float y1, float z1 );
 
   float distance( float x, float y, float z, float x1, float y1, float z1 );
-  float distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1, const Sapphire::Common::FFXIVARR_POSITION3& pos2 );
+  float distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 );
 
   float distance2DSq( float x, float y, float x1, float y1 );
 
diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index 58a724d6..1f54bcc7 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -20,10 +20,6 @@ namespace Sapphire
 namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
-}
-
-namespace Sapphire::Lobby::Network
-{
   TYPE_FORWARD( GameConnection );
 }
 
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 034b4755..306874c0 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -22,9 +22,9 @@ using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 
 extern Lobby::ServerLobby g_serverLobby;
-extern Lobby::Network::RestConnector g_restConnector;
+extern Lobby::RestConnector g_restConnector;
 
-Lobby::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
+Lobby::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
                                                 Sapphire::Network::AcceptorPtr pAcceptor,
                                                 FrameworkPtr pFw ) :
   Sapphire::Network::Connection( pHive, pFw ),
@@ -33,14 +33,14 @@ Lobby::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive
 {
 }
 
-Lobby::Network::GameConnection::~GameConnection()
+Lobby::GameConnection::~GameConnection()
 {
 
 }
 
 
 // overwrite the parents onConnect for our game socket needs
-void Lobby::Network::GameConnection::onAccept( const std::string& host, uint16_t port )
+void Lobby::GameConnection::onAccept( const std::string& host, uint16_t port )
 {
   auto connection = make_GameConnection( m_hive, m_pAcceptor, m_pFw );
   m_pAcceptor->accept( connection );
@@ -49,12 +49,12 @@ void Lobby::Network::GameConnection::onAccept( const std::string& host, uint16_t
 }
 
 
-void Lobby::Network::GameConnection::onDisconnect()
+void Lobby::GameConnection::onDisconnect()
 {
   Logger::debug( "DISCONNECT" );
 }
 
-void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
+void Lobby::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
@@ -72,9 +72,9 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
   }
 
   // Dissect packet list
-  std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
-  const auto packetResult = Sapphire::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
-                                                                  packetHeader, packetList );
+  std::vector< FFXIVARR_PACKET_RAW > packetList;
+  const auto packetResult = getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
+                                        packetHeader, packetList );
 
   if( packetResult == Incomplete )
     return;
@@ -92,31 +92,31 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 
 }
 
-void Lobby::Network::GameConnection::onError( const asio::error_code& error )
+void Lobby::GameConnection::onError( const asio::error_code& error )
 {
   Logger::info( "GameConnection closed: {0}", error.message() );
 }
 
 void
-Lobby::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
+Lobby::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
 {
   auto errorPacket = makeLobbyPacket< FFXIVIpcLobbyError >( tmpId );
   errorPacket->data().seq = sequence;
   errorPacket->data().error_id = errorcode;
   errorPacket->data().message_id = messageId;
 
-  Packets::LobbyPacketContainer pRP( m_encKey );
+  LobbyPacketContainer pRP( m_encKey );
   pRP.addPacket( errorPacket );
   sendPacket( pRP );
 }
 
-void Lobby::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
 
   Logger::info( "[{0}] ReqCharList", m_pSession->getAccountID() );
-  Packets::LobbyPacketContainer pRP( m_encKey );
+  LobbyPacketContainer pRP( m_encKey );
 
   auto serverListPacket = makeLobbyPacket< FFXIVIpcServerList >( tmpId );
   serverListPacket->data().seq = 1;
@@ -187,14 +187,14 @@ void Lobby::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, u
       charListPacket->data().counter = ( i * 4 ) + 1;
       charListPacket->data().unknown4 = 128;
     }
-    Packets::LobbyPacketContainer pRP( m_encKey );
+    LobbyPacketContainer pRP( m_encKey );
     pRP.addPacket( charListPacket );
     sendPacket( pRP );
 
   }
 }
 
-void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
@@ -223,7 +223,7 @@ void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, ui
 
   Logger::info( "[{0}] Logging in as {1} ({2})", m_pSession->getAccountID(), logInCharName, logInCharId );
 
-  Packets::LobbyPacketContainer pRP( m_encKey );
+  LobbyPacketContainer pRP( m_encKey );
 
   auto enterWorldPacket = makeLobbyPacket< FFXIVIpcEnterWorld >( tmpId );
   enterWorldPacket->data().contentId = lookupId;
@@ -236,7 +236,7 @@ void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, ui
   sendPacket( pRP );
 }
 
-bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   LobbySessionPtr pSession = g_serverLobby.getSession( ( char* ) &packet.data[ 0 ] + 0x22 );
 
@@ -261,7 +261,7 @@ bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW
     serviceIdInfoPacket->data().u2 = 0x99;
     serviceIdInfoPacket->data().serviceAccount[ 0 ].id = 0x002E4A2B;
 
-    Packets::LobbyPacketContainer pRP( m_encKey );
+    LobbyPacketContainer pRP( m_encKey );
     pRP.addPacket( serviceIdInfoPacket );
     sendPacket( pRP );
   }
@@ -275,7 +275,7 @@ bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW
   return false;
 }
 
-bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   uint8_t type = *reinterpret_cast< uint8_t* >( &packet.data[ 0 ] + 0x29 );
@@ -294,7 +294,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
 
     Logger::info( "[{0}] Type 1: {1}", m_pSession->getAccountID(), name );
 
-    Packets::LobbyPacketContainer pRP( m_encKey );
+    LobbyPacketContainer pRP( m_encKey );
 
     m_pSession->newCharName = name;
 
@@ -325,7 +325,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
     if( g_restConnector.createCharacter( ( char* ) m_pSession->getSessionId(), m_pSession->newCharName, charDetails ) !=
         -1 )
     {
-      Packets::LobbyPacketContainer pRP( m_encKey );
+      LobbyPacketContainer pRP( m_encKey );
 
       auto charCreatePacket = makeLobbyPacket< FFXIVIpcCharCreate >( tmpId );
       charCreatePacket->data().content_id = newContentId;
@@ -367,7 +367,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
       charCreatePacket->data().unknown_7 = 1;
       charCreatePacket->data().unknown_8 = 1;
 
-      Packets::LobbyPacketContainer pRP( m_encKey );
+      LobbyPacketContainer pRP( m_encKey );
       pRP.addPacket( charCreatePacket );
       sendPacket( pRP );
     }
@@ -383,7 +383,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
   return false;
 }
 
-void Lobby::Network::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -421,7 +421,7 @@ void Lobby::Network::GameConnection::handleGamePacket( Sapphire::Network::Packet
 
 }
 
-void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc )
+void Lobby::GameConnection::sendPacket( LobbyPacketContainer& pLpc )
 {
   uint16_t size = pLpc.getSize();
   uint8_t* dataPtr = pLpc.getRawData( false );
@@ -430,7 +430,7 @@ void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer&
   send( sendBuffer );
 }
 
-void Lobby::Network::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
+void Lobby::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -438,14 +438,14 @@ void Lobby::Network::GameConnection::sendPackets( Sapphire::Network::Packets::Pa
   send( sendBuffer );
 }
 
-void Lobby::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
+void Lobby::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
 {
   PacketContainer pRP = PacketContainer();
   pRP.addPacket( pPacket );
   sendPackets( &pRP );
 }
 
-void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
+void Lobby::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
 {
   memset( m_baseKey, 0, 0x2C );
   m_baseKey[ 0 ] = 0x78;
@@ -459,7 +459,7 @@ void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const
   Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Lobby::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+void Lobby::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
                                                     const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index 1ca20a89..fbed9386 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -16,10 +16,10 @@
 
 #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer )
 
-namespace Sapphire::Lobby::Network
+namespace Sapphire::Lobby
 {
 
-  class GameConnection : public Sapphire::Network::Connection
+  class GameConnection : public Network::Connection
   {
 
   private:
@@ -32,16 +32,16 @@ namespace Sapphire::Lobby::Network
 
     bool m_bEncryptionInitialized;
 
-    Sapphire::Network::AcceptorPtr m_pAcceptor;
+    Network::AcceptorPtr m_pAcceptor;
 
     LobbySessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_inQueue;
-    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Network::Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Network::Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( Sapphire::Network::HivePtr pHive, Sapphire::Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
+    GameConnection( Network::HivePtr pHive, Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
 
     ~GameConnection();
 
@@ -58,26 +58,26 @@ namespace Sapphire::Lobby::Network
 
     void sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId );
 
-    void getCharList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void getCharList( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void enterWorld( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void enterWorld( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool sendServiceAccountList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool sendServiceAccountList( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool createOrModifyChar( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool createOrModifyChar( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                        const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
+    void handlePackets( const Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                        const std::vector< Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
 
-    void handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleGamePacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handlePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void handlePacket( Network::Packets::FFXIVPacketBasePtr pPacket );
 
-    void sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket );
+    void sendPackets( Network::Packets::PacketContainer* pPacket );
 
-    void sendPacket( Packets::LobbyPacketContainer& pLpc );
+    void sendPacket( Network::Packets::LobbyPacketContainer& pLpc );
 
-    void sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Network::Packets::FFXIVPacketBasePtr pPacket );
 
 
   };
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index ae270d8f..fcd4e459 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -8,7 +8,7 @@ using namespace Sapphire;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 
-Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
+LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
 {
   memset( &m_header, 0, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   m_header.size = sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER );
@@ -18,12 +18,12 @@ Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* en
   memset( m_dataBuf, 0, 0x1570 );
 }
 
-Lobby::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer()
+LobbyPacketContainer::~LobbyPacketContainer()
 {
   m_entryList.clear();
 }
 
-void Lobby::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
+void LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
 {
   memcpy( m_dataBuf + m_header.size, &pEntry->getData()[ 0 ], pEntry->getSize() );
 
@@ -39,12 +39,12 @@ void Lobby::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePt
   m_header.count++;
 }
 
-uint16_t Lobby::Network::Packets::LobbyPacketContainer::getSize() const
+uint16_t LobbyPacketContainer::getSize() const
 {
   return m_header.size;
 }
 
-uint8_t* Lobby::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff )
+uint8_t* LobbyPacketContainer::getRawData( bool addstuff )
 {
   if( addstuff )
   {
diff --git a/src/lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h
index 44a5fd21..0ac3d0b5 100644
--- a/src/lobby/LobbyPacketContainer.h
+++ b/src/lobby/LobbyPacketContainer.h
@@ -9,7 +9,7 @@
 
 #include "Forwards.h"
 
-namespace Sapphire::Lobby::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   using FFXIVPacketBasePtr = std::shared_ptr< Sapphire::Network::Packets::FFXIVPacketBase >;
diff --git a/src/lobby/RestConnector.cpp b/src/lobby/RestConnector.cpp
index 738af406..a8ee459f 100644
--- a/src/lobby/RestConnector.cpp
+++ b/src/lobby/RestConnector.cpp
@@ -12,17 +12,17 @@ using namespace Sapphire;
 
 typedef std::vector< std::tuple< std::string, uint32_t, uint64_t, std::string > > CharList;
 
-Lobby::Network::RestConnector::RestConnector()
+Lobby::RestConnector::RestConnector()
 {
 
 }
 
-Lobby::Network::RestConnector::~RestConnector()
+Lobby::RestConnector::~RestConnector()
 {
 
 }
 
-HttpResponse Lobby::Network::RestConnector::requestApi( std::string endpoint, std::string data )
+HttpResponse Lobby::RestConnector::requestApi( std::string endpoint, std::string data )
 {
   HttpClient client( restHost );
 
@@ -41,7 +41,7 @@ HttpResponse Lobby::Network::RestConnector::requestApi( std::string endpoint, st
   return r;
 }
 
-Lobby::LobbySessionPtr Lobby::Network::RestConnector::getSession( char* sId )
+Lobby::LobbySessionPtr Lobby::RestConnector::getSession( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -83,7 +83,7 @@ Lobby::LobbySessionPtr Lobby::Network::RestConnector::getSession( char* sId )
   }
 }
 
-bool Lobby::Network::RestConnector::checkNameTaken( std::string name )
+bool Lobby::RestConnector::checkNameTaken( std::string name )
 {
   std::string json_string = "{\"name\": \"" + name + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -117,7 +117,7 @@ bool Lobby::Network::RestConnector::checkNameTaken( std::string name )
   }
 }
 
-uint32_t Lobby::Network::RestConnector::getNextCharId()
+uint32_t Lobby::RestConnector::getNextCharId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -156,7 +156,7 @@ uint32_t Lobby::Network::RestConnector::getNextCharId()
   }
 }
 
-uint64_t Lobby::Network::RestConnector::getNextContentId()
+uint64_t Lobby::RestConnector::getNextContentId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -195,7 +195,7 @@ uint64_t Lobby::Network::RestConnector::getNextContentId()
   }
 }
 
-CharList Lobby::Network::RestConnector::getCharList( char* sId )
+CharList Lobby::RestConnector::getCharList( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -251,7 +251,7 @@ CharList Lobby::Network::RestConnector::getCharList( char* sId )
   }
 }
 
-bool Lobby::Network::RestConnector::deleteCharacter( char* sId, std::string name )
+bool Lobby::RestConnector::deleteCharacter( char* sId, std::string name )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name + "\"}";
@@ -285,7 +285,7 @@ bool Lobby::Network::RestConnector::deleteCharacter( char* sId, std::string name
   }
 }
 
-int Lobby::Network::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
+int Lobby::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name +
diff --git a/src/lobby/RestConnector.h b/src/lobby/RestConnector.h
index 05461535..f361416c 100644
--- a/src/lobby/RestConnector.h
+++ b/src/lobby/RestConnector.h
@@ -15,7 +15,7 @@ namespace Sapphire
   class Session;
 }
 
-namespace Sapphire::Lobby::Network
+namespace Sapphire::Lobby
 {
   class LobbySession;
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index f8029b27..b85380c9 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -23,7 +23,7 @@
 
 using namespace Sapphire;
 
-Sapphire::Lobby::Network::RestConnector g_restConnector;
+Sapphire::Lobby::RestConnector g_restConnector;
 
 namespace Sapphire::Lobby
 {
@@ -65,9 +65,9 @@ namespace Sapphire::Lobby
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = std::make_shared< Framework >();
-    auto hive = Sapphire::Network::make_Hive();
-    Sapphire::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
+    auto pFw = make_Framework();
+    auto hive = Network::make_Hive();
+    Network::addServerToHive< GameConnection >( m_ip, m_port, hive, pFw );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 

From 41838196a5ba440e15d8b69b15b658469466eb9e Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 7 Jun 2019 18:15:22 +1000
Subject: [PATCH 10/10] missed a few namespaces that could be cleaned up

---
 src/lobby/GameConnection.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 306874c0..f531f5c2 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -58,8 +58,8 @@ void Lobby::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-  Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
-  const auto headerResult = Sapphire::Network::Packets::getHeader( m_packets, 0, packetHeader );
+  FFXIVARR_PACKET_HEADER packetHeader{};
+  const auto headerResult = getHeader( m_packets, 0, packetHeader );
 
   if( headerResult == Incomplete )
     return;
@@ -383,7 +383,7 @@ bool Lobby::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uin
   return false;
 }
 
-void Lobby::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::GameConnection::handleGamePacket( Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -430,7 +430,7 @@ void Lobby::GameConnection::sendPacket( LobbyPacketContainer& pLpc )
   send( sendBuffer );
 }
 
-void Lobby::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
+void Lobby::GameConnection::sendPackets( Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -459,8 +459,8 @@ void Lobby::GameConnection::generateEncryptionKey( uint32_t key, const std::stri
   Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Lobby::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                                                    const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
+void Lobby::GameConnection::handlePackets( const Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                                           const std::vector< Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
   for( auto inPacket : packetData )