diff --git a/src/game/AI/CreatureAISelector.cpp b/src/game/AI/CreatureAISelector.cpp
index d4f45cc45a9..a0286908476 100644
--- a/src/game/AI/CreatureAISelector.cpp
+++ b/src/game/AI/CreatureAISelector.cpp
@@ -25,7 +25,7 @@
 #include "AI/ScriptDevAI/ScriptDevAIMgr.h"
 #include "Entities/Pet.h"
 #include "Entities/Player.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "AI/BaseAI/PetAI.h"
 #include "BaseAI/PossessedAI.h"
 #include "AI/PlayerAI/PlayerAI.h"
diff --git a/src/game/AI/ScriptDevAI/base/TimerAI.cpp b/src/game/AI/ScriptDevAI/base/TimerAI.cpp
index d372607c6d7..ac15aadbf86 100644
--- a/src/game/AI/ScriptDevAI/base/TimerAI.cpp
+++ b/src/game/AI/ScriptDevAI/base/TimerAI.cpp
@@ -16,7 +16,7 @@
 
 #include "TimerAI.h"
 #include "Chat/Chat.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include <string>
 
 Timer::Timer(uint32 id, std::function<void()> functor, uint32 timerMin, uint32 timerMax, TimerCombat combatSetting, bool disabled)
diff --git a/src/game/Anticheat/module/AddonHandler.cpp b/src/game/Anticheat/module/AddonHandler.cpp
index 8ec2047bb8c..8c63121629f 100644
--- a/src/game/Anticheat/module/AddonHandler.cpp
+++ b/src/game/Anticheat/module/AddonHandler.cpp
@@ -8,7 +8,7 @@
 #include "libanticheat.hpp"
 #include "config.hpp"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include "Util/Util.h"
 #include "Database/DatabaseEnv.h"
diff --git a/src/game/Anticheat/module/Antispam/antispammgr.cpp b/src/game/Anticheat/module/Antispam/antispammgr.cpp
index 6edf2e37850..b7fb1a05b74 100644
--- a/src/game/Anticheat/module/Antispam/antispammgr.cpp
+++ b/src/game/Anticheat/module/Antispam/antispammgr.cpp
@@ -11,7 +11,7 @@
 #include "Server/WorldSession.h"
 #include "World/World.h"
 #include "Accounts/AccountMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include "Database/DatabaseEnv.h"
 #include "Policies/Singleton.h"
diff --git a/src/game/Anticheat/module/Movement/movement.cpp b/src/game/Anticheat/module/Movement/movement.cpp
index e2a5dd8695c..e0908428a27 100644
--- a/src/game/Anticheat/module/Movement/movement.cpp
+++ b/src/game/Anticheat/module/Movement/movement.cpp
@@ -22,7 +22,7 @@
 #include "World/World.h"
 #include "Tools/Language.h"
 #include "Movement/MoveSpline.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 namespace
 {
diff --git a/src/game/Anticheat/module/Warden/warden.cpp b/src/game/Anticheat/module/Warden/warden.cpp
index 7ad8af4a2cf..400b9049d6c 100644
--- a/src/game/Anticheat/module/Warden/warden.cpp
+++ b/src/game/Anticheat/module/Warden/warden.cpp
@@ -14,7 +14,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "World/World.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Util/ByteBuffer.h"
 #include "Database/DatabaseEnv.h"
diff --git a/src/game/Anticheat/module/Warden/wardenmac.cpp b/src/game/Anticheat/module/Warden/wardenmac.cpp
index 1180917d23a..38036a4d201 100644
--- a/src/game/Anticheat/module/Warden/wardenmac.cpp
+++ b/src/game/Anticheat/module/Warden/wardenmac.cpp
@@ -13,7 +13,7 @@
 #include "Auth/CryptoHash.h"
 #include "World/World.h"
 #include "../config.hpp"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include <memory>
 #include <vector>
diff --git a/src/game/Anticheat/module/Warden/wardenmodulemgr.cpp b/src/game/Anticheat/module/Warden/wardenmodulemgr.cpp
index 6c11fca4aa2..37e44ddb335 100644
--- a/src/game/Anticheat/module/Warden/wardenmodulemgr.cpp
+++ b/src/game/Anticheat/module/Warden/wardenmodulemgr.cpp
@@ -12,7 +12,7 @@
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include "Util/Util.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include <vector>
 #include <string>
diff --git a/src/game/Anticheat/module/Warden/wardenwin.cpp b/src/game/Anticheat/module/Warden/wardenwin.cpp
index 47fc454911f..89f9ec284b6 100644
--- a/src/game/Anticheat/module/Warden/wardenwin.cpp
+++ b/src/game/Anticheat/module/Warden/wardenwin.cpp
@@ -23,7 +23,7 @@
 #include "Util/ByteBuffer.h"
 #include "Database/DatabaseEnv.h"
 #include "Entities/Player.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include <string>
 #include <vector>
diff --git a/src/game/Anticheat/module/libanticheat.cpp b/src/game/Anticheat/module/libanticheat.cpp
index 8e6c5ada140..d53d97d31f9 100644
--- a/src/game/Anticheat/module/libanticheat.cpp
+++ b/src/game/Anticheat/module/libanticheat.cpp
@@ -21,7 +21,7 @@
 #include "Chat/Chat.h"
 #include "Tools/Language.h"
 #include "Globals/ObjectMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include "Antispam/antispammgr.hpp"
 #include "Antispam/antispam.hpp"
diff --git a/src/game/Arena/ArenaTeamHandler.cpp b/src/game/Arena/ArenaTeamHandler.cpp
index fad1241ee4d..d84ee9cc1bc 100644
--- a/src/game/Arena/ArenaTeamHandler.cpp
+++ b/src/game/Arena/ArenaTeamHandler.cpp
@@ -18,7 +18,7 @@
 
 #include "Server/WorldSession.h"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Globals/ObjectMgr.h"
 #include "Arena/ArenaTeam.h"
diff --git a/src/game/AuctionHouse/AuctionHouseHandler.cpp b/src/game/AuctionHouse/AuctionHouseHandler.cpp
index 94d5bffd0c5..d98c9bdf195 100644
--- a/src/game/AuctionHouse/AuctionHouseHandler.cpp
+++ b/src/game/AuctionHouse/AuctionHouseHandler.cpp
@@ -19,7 +19,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/ObjectGuid.h"
diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/game/AuctionHouse/AuctionHouseMgr.cpp
index a4eb2b3fde2..6555ef6e728 100644
--- a/src/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -25,7 +25,7 @@
 #include "Accounts/AccountMgr.h"
 #include "Entities/Item.h"
 #include "Tools/Language.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/ObjectGuid.h"
 #include "Entities/Player.h"
diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
index a138d17503a..060313e0910 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -18,7 +18,7 @@
 
 #include "AuctionHouseBot.h"
 #include "Globals/ObjectMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Policies/Singleton.h"
 #include "Util/ProgressBar.h"
 #include "SystemConfig.h"
diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp
index abe8a8c3e97..70f2238ebad 100644
--- a/src/game/BattleGround/BattleGroundHandler.cpp
+++ b/src/game/BattleGround/BattleGroundHandler.cpp
@@ -20,7 +20,7 @@
 #include "Globals/SharedDefines.h"
 #include "Server/WorldPacket.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Globals/ObjectMgr.h"
 #include "Server/WorldSession.h"
diff --git a/src/game/Battlefield/BattlefieldHandler.cpp b/src/game/Battlefield/BattlefieldHandler.cpp
index 24fa6d4d796..9e50b0fb0a8 100644
--- a/src/game/Battlefield/BattlefieldHandler.cpp
+++ b/src/game/Battlefield/BattlefieldHandler.cpp
@@ -21,7 +21,7 @@
 #include "OutdoorPvP/OutdoorPvPMgr.h"
 #include "Battlefield/Battlefield.h"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Entities/Player.h"
 
diff --git a/src/game/Calendar/CalendarHandler.cpp b/src/game/Calendar/CalendarHandler.cpp
index fbe22e73f9d..6de266ade0f 100644
--- a/src/game/Calendar/CalendarHandler.cpp
+++ b/src/game/Calendar/CalendarHandler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp
index f7b23ca2caf..afcc354b043 100644
--- a/src/game/Chat/Chat.cpp
+++ b/src/game/Chat/Chat.cpp
@@ -22,7 +22,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/ObjectGuid.h"
diff --git a/src/game/Chat/ChatHandler.cpp b/src/game/Chat/ChatHandler.cpp
index af121681eac..50918f30d5b 100644
--- a/src/game/Chat/ChatHandler.cpp
+++ b/src/game/Chat/ChatHandler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "World/World.h"
diff --git a/src/game/Chat/Level1.cpp b/src/game/Chat/Level1.cpp
index 55aecb74e49..d4255d4add4 100644
--- a/src/game/Chat/Level1.cpp
+++ b/src/game/Chat/Level1.cpp
@@ -26,7 +26,7 @@
 #include "Server/Opcodes.h"
 #include "Chat/Chat.h"
 #include "Chat/ChannelMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectAccessor.h"
 #include "Tools/Language.h"
 #include "Grids/CellImpl.h"
diff --git a/src/game/Chat/Level3.cpp b/src/game/Chat/Level3.cpp
index d627434f293..a37c6d18fd1 100644
--- a/src/game/Chat/Level3.cpp
+++ b/src/game/Chat/Level3.cpp
@@ -27,7 +27,7 @@
 #include "Entities/Player.h"
 #include "Entities/GameObject.h"
 #include "Chat/Chat.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Guilds/Guild.h"
 #include "Guilds/GuildMgr.h"
 #include "Globals/ObjectAccessor.h"
diff --git a/src/game/Chat/debugcmds.cpp b/src/game/Chat/debugcmds.cpp
index 02406c4c970..1e5014d404d 100644
--- a/src/game/Chat/debugcmds.cpp
+++ b/src/game/Chat/debugcmds.cpp
@@ -21,7 +21,7 @@
 #include "Entities/Player.h"
 #include "Server/Opcodes.h"
 #include "Chat/Chat.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Unit.h"
 #include "Entities/GossipDef.h"
 #include "Tools/Language.h"
diff --git a/src/game/Combat/CombatHandler.cpp b/src/game/Combat/CombatHandler.cpp
index 2bc575209fa..14134229483 100644
--- a/src/game/Combat/CombatHandler.cpp
+++ b/src/game/Combat/CombatHandler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Entities/ObjectGuid.h"
diff --git a/src/game/Combat/DuelHandler.cpp b/src/game/Combat/DuelHandler.cpp
index 695011756b9..24cc939a717 100644
--- a/src/game/Combat/DuelHandler.cpp
+++ b/src/game/Combat/DuelHandler.cpp
@@ -19,7 +19,7 @@
 #include "Common.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 
 void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
diff --git a/src/game/DBScripts/ScriptMgr.cpp b/src/game/DBScripts/ScriptMgr.cpp
index 4953c17eca6..fddaefffc9c 100644
--- a/src/game/DBScripts/ScriptMgr.cpp
+++ b/src/game/DBScripts/ScriptMgr.cpp
@@ -18,7 +18,7 @@
 
 #include "DBScripts/ScriptMgr.h"
 #include "Policies/Singleton.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/ProgressBar.h"
 #include "Globals/ObjectMgr.h"
 #include "MotionGenerators/WaypointManager.h"
diff --git a/src/game/Entities/Camera.cpp b/src/game/Entities/Camera.cpp
index a74ccab0d09..703f66d1b31 100644
--- a/src/game/Entities/Camera.cpp
+++ b/src/game/Entities/Camera.cpp
@@ -19,7 +19,7 @@
 #include "Camera.h"
 #include "Grids/GridNotifiersImpl.h"
 #include "Grids/CellImpl.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/Errors.h"
 #include "Entities/Player.h"
 
diff --git a/src/game/Entities/CharacterHandler.cpp b/src/game/Entities/CharacterHandler.cpp
index 7567e880446..a0bfee10cac 100644
--- a/src/game/Entities/CharacterHandler.cpp
+++ b/src/game/Entities/CharacterHandler.cpp
@@ -22,7 +22,7 @@
 #include "Globals/SharedDefines.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/Player.h"
diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
index 75225ebbc2d..117974eda3f 100644
--- a/src/game/Entities/Creature.cpp
+++ b/src/game/Entities/Creature.cpp
@@ -30,7 +30,7 @@
 #include "GameEvents/GameEventMgr.h"
 #include "Pools/PoolManager.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Loot/LootMgr.h"
 #include "Maps/MapManager.h"
 #include "AI/BaseAI/CreatureAI.h"
diff --git a/src/game/Entities/ItemEnchantmentMgr.cpp b/src/game/Entities/ItemEnchantmentMgr.cpp
index 0ecbfdb59a5..b0915a7cbde 100644
--- a/src/game/Entities/ItemEnchantmentMgr.cpp
+++ b/src/game/Entities/ItemEnchantmentMgr.cpp
@@ -18,7 +18,7 @@
 
 #include "Entities/ItemEnchantmentMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Util/ProgressBar.h"
 #include "Util/Util.h"
diff --git a/src/game/Entities/ItemHandler.cpp b/src/game/Entities/ItemHandler.cpp
index df02ba7f54e..06e823152f8 100644
--- a/src/game/Entities/ItemHandler.cpp
+++ b/src/game/Entities/ItemHandler.cpp
@@ -20,7 +20,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/Player.h"
 #include "Entities/Item.h"
diff --git a/src/game/Entities/MiscHandler.cpp b/src/game/Entities/MiscHandler.cpp
index 3d17253d036..7cec336696e 100644
--- a/src/game/Entities/MiscHandler.cpp
+++ b/src/game/Entities/MiscHandler.cpp
@@ -25,7 +25,7 @@
 #include "Database/DatabaseImpl.h"
 #include "Server/WorldPacket.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "World/World.h"
 #include "Guilds/GuildMgr.h"
diff --git a/src/game/Entities/NPCHandler.cpp b/src/game/Entities/NPCHandler.cpp
index 042498bdad2..7098aeba2cf 100644
--- a/src/game/Entities/NPCHandler.cpp
+++ b/src/game/Entities/NPCHandler.cpp
@@ -22,7 +22,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
 #include "Entities/Player.h"
diff --git a/src/game/Entities/Object.cpp b/src/game/Entities/Object.cpp
index 1fc01f9748f..a9635e22011 100644
--- a/src/game/Entities/Object.cpp
+++ b/src/game/Entities/Object.cpp
@@ -20,7 +20,7 @@
 #include "Globals/SharedDefines.h"
 #include "Server/WorldPacket.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Entities/Creature.h"
 #include "Entities/Player.h"
diff --git a/src/game/Entities/Pet.cpp b/src/game/Entities/Pet.cpp
index 9ea6821c4ef..34493cf3cbd 100644
--- a/src/game/Entities/Pet.cpp
+++ b/src/game/Entities/Pet.cpp
@@ -18,7 +18,7 @@
 
 #include "Entities/Pet.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
diff --git a/src/game/Entities/PetHandler.cpp b/src/game/Entities/PetHandler.cpp
index 6bd1303c84d..1fd66a69a41 100644
--- a/src/game/Entities/PetHandler.cpp
+++ b/src/game/Entities/PetHandler.cpp
@@ -21,7 +21,7 @@
 #include "Server/WorldSession.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Spells/Spell.h"
 #include "AI/BaseAI/CreatureAI.h"
diff --git a/src/game/Entities/PetitionsHandler.cpp b/src/game/Entities/PetitionsHandler.cpp
index 49d3334a4b1..a1d869fcd7e 100644
--- a/src/game/Entities/PetitionsHandler.cpp
+++ b/src/game/Entities/PetitionsHandler.cpp
@@ -22,7 +22,7 @@
 #include "Server/WorldSession.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Guilds/Guild.h"
 #include "Guilds/GuildMgr.h"
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
index f618a98999a..cdbe8715229 100644
--- a/src/game/Entities/Player.cpp
+++ b/src/game/Entities/Player.cpp
@@ -19,7 +19,7 @@
 #include "Entities/Player.h"
 #include "Tools/Language.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Spells/SpellMgr.h"
 #include "World/World.h"
diff --git a/src/game/Entities/QueryHandler.cpp b/src/game/Entities/QueryHandler.cpp
index db36ada7c46..bccfc0074df 100644
--- a/src/game/Entities/QueryHandler.cpp
+++ b/src/game/Entities/QueryHandler.cpp
@@ -23,7 +23,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/ObjectGuid.h"
diff --git a/src/game/Entities/RafHandler.cpp b/src/game/Entities/RafHandler.cpp
index f28e17c1596..760aed96237 100644
--- a/src/game/Entities/RafHandler.cpp
+++ b/src/game/Entities/RafHandler.cpp
@@ -21,7 +21,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Globals/ObjectMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 
 void WorldSession::HandleGrantLevel(WorldPacket& recv_data)
diff --git a/src/game/Entities/SkillHandler.cpp b/src/game/Entities/SkillHandler.cpp
index f74d05a66de..7fde2475cfc 100644
--- a/src/game/Entities/SkillHandler.cpp
+++ b/src/game/Entities/SkillHandler.cpp
@@ -18,7 +18,7 @@
 
 #include "Common.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
diff --git a/src/game/Entities/TemporarySpawn.cpp b/src/game/Entities/TemporarySpawn.cpp
index 9d22a750c0b..efe034bbf60 100644
--- a/src/game/Entities/TemporarySpawn.cpp
+++ b/src/game/Entities/TemporarySpawn.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Entities/TemporarySpawn.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "AI/BaseAI/CreatureAI.h"
 
 TemporarySpawn::TemporarySpawn(ObjectGuid summoner) :
diff --git a/src/game/Entities/Totem.cpp b/src/game/Entities/Totem.cpp
index e3301cc7c5a..5a9485f743a 100644
--- a/src/game/Entities/Totem.cpp
+++ b/src/game/Entities/Totem.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Entities/Totem.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Groups/Group.h"
 #include "Entities/Player.h"
 #include "Globals/ObjectMgr.h"
diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
index cba1731a9cd..37ed4ca5438 100644
--- a/src/game/Entities/Unit.cpp
+++ b/src/game/Entities/Unit.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Entities/Unit.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
diff --git a/src/game/Entities/UpdateData.cpp b/src/game/Entities/UpdateData.cpp
index 925491dde54..08a19a7a247 100644
--- a/src/game/Entities/UpdateData.cpp
+++ b/src/game/Entities/UpdateData.cpp
@@ -22,7 +22,7 @@
 #include "Entities/UpdateData.h"
 #include "Util/ByteBuffer.h"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "World/World.h"
 #include "Entities/ObjectGuid.h"
diff --git a/src/game/Entities/UpdateFields.cpp b/src/game/Entities/UpdateFields.cpp
index 8d7c416a616..445737d22ee 100644
--- a/src/game/Entities/UpdateFields.cpp
+++ b/src/game/Entities/UpdateFields.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "UpdateFields.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "ObjectGuid.h"
 #include <array>
 #include <vector>
diff --git a/src/game/Entities/Vehicle.cpp b/src/game/Entities/Vehicle.cpp
index 9b31b5a9a64..9c2e3e827ad 100644
--- a/src/game/Entities/Vehicle.cpp
+++ b/src/game/Entities/Vehicle.cpp
@@ -35,7 +35,7 @@
 #include "Common.h"
 #include "Globals/SharedDefines.h"
 #include "Entities/ObjectGuid.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Unit.h"
 #include "Entities/Creature.h"
 #include "AI/BaseAI/CreatureAI.h"
diff --git a/src/game/Entities/VehicleHandler.cpp b/src/game/Entities/VehicleHandler.cpp
index 0e6b74cad5d..a6bb4000986 100644
--- a/src/game/Entities/VehicleHandler.cpp
+++ b/src/game/Entities/VehicleHandler.cpp
@@ -20,7 +20,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Entities/ObjectGuid.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Entities/Vehicle.h"
 #include "Globals/ObjectMgr.h"
diff --git a/src/game/GMTickets/GMTicketHandler.cpp b/src/game/GMTickets/GMTicketHandler.cpp
index d13061337a9..21ad9a987e1 100644
--- a/src/game/GMTickets/GMTicketHandler.cpp
+++ b/src/game/GMTickets/GMTicketHandler.cpp
@@ -19,7 +19,7 @@
 #include "Common.h"
 #include "Tools/Language.h"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "GMTickets/GMTicketMgr.h"
 #include "Globals/ObjectAccessor.h"
 #include "Entities/Player.h"
diff --git a/src/game/GameEvents/GameEventMgr.cpp b/src/game/GameEvents/GameEventMgr.cpp
index c98c4421aee..9fd3b3754a4 100644
--- a/src/game/GameEvents/GameEventMgr.cpp
+++ b/src/game/GameEvents/GameEventMgr.cpp
@@ -23,7 +23,7 @@
 #include "Pools/PoolManager.h"
 #include "Util/ProgressBar.h"
 #include "Tools/Language.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Maps/MapManager.h"
 #include "BattleGround/BattleGroundMgr.h"
 #include "Mails/MassMailMgr.h"
diff --git a/src/game/Globals/ObjectMgr.cpp b/src/game/Globals/ObjectMgr.cpp
index 6029f0e90b6..8bcc351e6d6 100644
--- a/src/game/Globals/ObjectMgr.cpp
+++ b/src/game/Globals/ObjectMgr.cpp
@@ -21,7 +21,7 @@
 #include "Policies/Singleton.h"
 
 #include "Server/SQLStorages.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Maps/MapManager.h"
 #include "Entities/ObjectGuid.h"
 #include "AI/ScriptDevAI/ScriptDevAIMgr.h"
diff --git a/src/game/Globals/UnitCondition.cpp b/src/game/Globals/UnitCondition.cpp
index 8474797ee0c..d29eef09947 100644
--- a/src/game/Globals/UnitCondition.cpp
+++ b/src/game/Globals/UnitCondition.cpp
@@ -24,7 +24,7 @@
 #include "MotionGenerators/MovementGenerator.h"
 #include "Spells/SpellAuras.h"
 #include "Util/ProgressBar.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 std::shared_ptr<std::map<int32, UnitConditionEntry>> UnitConditionMgr::Load()
 {
diff --git a/src/game/Grids/GridStates.cpp b/src/game/Grids/GridStates.cpp
index 9fc42f4ed9c..8637147e9ab 100644
--- a/src/game/Grids/GridStates.cpp
+++ b/src/game/Grids/GridStates.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Grids/GridStates.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 void
 InvalidState::Update(Map&, NGridType&, GridInfo&, const uint32& /*x*/, const uint32& /*y*/, const uint32&) const
diff --git a/src/game/Groups/GroupHandler.cpp b/src/game/Groups/GroupHandler.cpp
index 13f52a6e287..3bc82322035 100644
--- a/src/game/Groups/GroupHandler.cpp
+++ b/src/game/Groups/GroupHandler.cpp
@@ -19,7 +19,7 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "World/World.h"
diff --git a/src/game/Guilds/GuildHandler.cpp b/src/game/Guilds/GuildHandler.cpp
index f92d5f9bdad..ddf5535f969 100644
--- a/src/game/Guilds/GuildHandler.cpp
+++ b/src/game/Guilds/GuildHandler.cpp
@@ -21,7 +21,7 @@
 #include "Server/WorldSession.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Guilds/Guild.h"
 #include "Guilds/GuildMgr.h"
diff --git a/src/game/Guilds/GuildMgr.cpp b/src/game/Guilds/GuildMgr.cpp
index 7f6f1ee889e..2206415989d 100644
--- a/src/game/Guilds/GuildMgr.cpp
+++ b/src/game/Guilds/GuildMgr.cpp
@@ -18,7 +18,7 @@
 
 #include "Guilds/GuildMgr.h"
 #include "Guilds/Guild.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/ObjectGuid.h"
 #include "Database/DatabaseEnv.h"
 #include "Policies/Singleton.h"
diff --git a/src/game/LFG/LFGHandler.cpp b/src/game/LFG/LFGHandler.cpp
index 1d464a5c2ed..39f23a697ef 100644
--- a/src/game/LFG/LFGHandler.cpp
+++ b/src/game/LFG/LFGHandler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Server/WorldSession.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Server/WorldPacket.h"
 #include "Globals/ObjectAccessor.h"
diff --git a/src/game/Loot/LootHandler.cpp b/src/game/Loot/LootHandler.cpp
index eea85e5b358..c303f900e94 100644
--- a/src/game/Loot/LootHandler.cpp
+++ b/src/game/Loot/LootHandler.cpp
@@ -18,7 +18,7 @@
 
 #include "Common.h"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Globals/ObjectAccessor.h"
 #include "Entities/ObjectGuid.h"
diff --git a/src/game/Loot/LootMgr.cpp b/src/game/Loot/LootMgr.cpp
index 6a0b6c47cc0..94746a4c678 100644
--- a/src/game/Loot/LootMgr.cpp
+++ b/src/game/Loot/LootMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Loot/LootMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Util/ProgressBar.h"
 #include "World/World.h"
diff --git a/src/game/Mails/Mail.cpp b/src/game/Mails/Mail.cpp
index 775eaf6b8f0..84293c01dcc 100644
--- a/src/game/Mails/Mail.cpp
+++ b/src/game/Mails/Mail.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "Mails/Mail.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/ObjectGuid.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/Item.h"
diff --git a/src/game/Mails/MailHandler.cpp b/src/game/Mails/MailHandler.cpp
index 74ee4377fbf..d061a223e33 100644
--- a/src/game/Mails/MailHandler.cpp
+++ b/src/game/Mails/MailHandler.cpp
@@ -27,7 +27,7 @@
 
 #include "Mails/Mail.h"
 #include "Tools/Language.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/ObjectGuid.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/Item.h"
diff --git a/src/game/Maps/GridMap.cpp b/src/game/Maps/GridMap.cpp
index c35e6368a1e..6beceb913f2 100644
--- a/src/game/Maps/GridMap.cpp
+++ b/src/game/Maps/GridMap.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Log.h"
+#include "Log/Log.h"
 #include "Grids/CellImpl.h"
 #include "GridDefines.h"
 #include "Maps/Map.h"
diff --git a/src/game/Maps/InstanceData.cpp b/src/game/Maps/InstanceData.cpp
index 24d602404f7..c31fa2da058 100644
--- a/src/game/Maps/InstanceData.cpp
+++ b/src/game/Maps/InstanceData.cpp
@@ -19,7 +19,7 @@
 #include "Maps/InstanceData.h"
 #include "Database/DatabaseEnv.h"
 #include "Maps/Map.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 
 void InstanceData::SaveToDB() const
diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp
index 81d42a66767..1777196c3dc 100644
--- a/src/game/Maps/Map.cpp
+++ b/src/game/Maps/Map.cpp
@@ -20,7 +20,7 @@
 #include "Maps/MapManager.h"
 #include "Entities/Player.h"
 #include "Grids/GridNotifiers.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Grids/ObjectGridLoader.h"
 #include "Grids/CellImpl.h"
 #include "Grids/GridNotifiersImpl.h"
diff --git a/src/game/Maps/MapManager.cpp b/src/game/Maps/MapManager.cpp
index f08d682c221..f3a82278485 100644
--- a/src/game/Maps/MapManager.cpp
+++ b/src/game/Maps/MapManager.cpp
@@ -20,7 +20,7 @@
 #include "Maps/MapPersistentStateMgr.h"
 #include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Transports.h"
 #include "Maps/GridDefines.h"
 #include "World/World.h"
diff --git a/src/game/Maps/MapPersistentStateMgr.cpp b/src/game/Maps/MapPersistentStateMgr.cpp
index 99097667a16..a66e9fd5628 100644
--- a/src/game/Maps/MapPersistentStateMgr.cpp
+++ b/src/game/Maps/MapPersistentStateMgr.cpp
@@ -21,7 +21,7 @@
 #include "Maps/MapPersistentStateMgr.h"
 
 #include "Entities/Player.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Grids/CellImpl.h"
 #include "Maps/Map.h"
 #include "Maps/MapManager.h"
diff --git a/src/game/Maps/TaxiHandler.cpp b/src/game/Maps/TaxiHandler.cpp
index bd033c3e7f2..167814970b1 100644
--- a/src/game/Maps/TaxiHandler.cpp
+++ b/src/game/Maps/TaxiHandler.cpp
@@ -21,7 +21,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/Player.h"
 #include "MotionGenerators/Path.h"
diff --git a/src/game/Models/M2Stores.cpp b/src/game/Models/M2Stores.cpp
index 2440e9b6aaa..edc1b06b2a3 100644
--- a/src/game/Models/M2Stores.cpp
+++ b/src/game/Models/M2Stores.cpp
@@ -22,7 +22,7 @@
 #include "M2Structure.h"
 #include "M2Stores.h"
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/DBCStructure.h"
 #include "World/World.h"
 #include <cstdint>
diff --git a/src/game/MotionGenerators/MotionMaster.cpp b/src/game/MotionGenerators/MotionMaster.cpp
index 3301c20f8fc..a6013324b98 100644
--- a/src/game/MotionGenerators/MotionMaster.cpp
+++ b/src/game/MotionGenerators/MotionMaster.cpp
@@ -35,7 +35,7 @@
 #include "Entities/Player.h"
 #include "Entities/Pet.h"
 #include "Server/DBCStores.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Maps/TransportSystem.h"
 #include "Metric/Metric.h"
 
diff --git a/src/game/MotionGenerators/MoveMap.cpp b/src/game/MotionGenerators/MoveMap.cpp
index 06e5d0d864f..07af2804ca4 100644
--- a/src/game/MotionGenerators/MoveMap.cpp
+++ b/src/game/MotionGenerators/MoveMap.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Entities/Creature.h"
 #include "MotionGenerators/MoveMap.h"
diff --git a/src/game/MotionGenerators/MovementHandler.cpp b/src/game/MotionGenerators/MovementHandler.cpp
index 29260913229..d27e04e1de5 100644
--- a/src/game/MotionGenerators/MovementHandler.cpp
+++ b/src/game/MotionGenerators/MovementHandler.cpp
@@ -20,7 +20,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Movement/MoveSpline.h"
 #include "Maps/MapManager.h"
diff --git a/src/game/MotionGenerators/PathFinder.cpp b/src/game/MotionGenerators/PathFinder.cpp
index 50776a663ae..79471343d59 100644
--- a/src/game/MotionGenerators/PathFinder.cpp
+++ b/src/game/MotionGenerators/PathFinder.cpp
@@ -20,7 +20,7 @@
 #include "Maps/GridMap.h"
 #include "Entities/Creature.h"
 #include "MotionGenerators/PathFinder.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Entities/Transports.h"
 #include <Detour/Include/DetourCommon.h>
diff --git a/src/game/Movement/MoveSpline.cpp b/src/game/Movement/MoveSpline.cpp
index f300c3382fa..dba03967f73 100644
--- a/src/game/Movement/MoveSpline.cpp
+++ b/src/game/Movement/MoveSpline.cpp
@@ -18,7 +18,7 @@
 
 #include "MoveSpline.h"
 #include <sstream>
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Unit.h"
 
 namespace Movement
diff --git a/src/game/Movement/MoveSplineInit.cpp b/src/game/Movement/MoveSplineInit.cpp
index 005b6561961..cb027043122 100644
--- a/src/game/Movement/MoveSplineInit.cpp
+++ b/src/game/Movement/MoveSplineInit.cpp
@@ -20,7 +20,7 @@
 #include "MoveSpline.h"
 #include "packet_builder.h"
 #include "Entities/Unit.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Maps/TransportSystem.h"
 #include "Entities/Transports.h"
 
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
index d8deb6e0737..a8f55c542e1 100644
--- a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -20,7 +20,7 @@
 #include "Policies/Singleton.h"
 #include "OutdoorPvP.h"
 #include "World/World.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "OutdoorPvPEP.h"
 #include "OutdoorPvPGH.h"
 #include "OutdoorPvPHP.h"
diff --git a/src/game/PlayerBot/Base/PlayerbotAI.cpp b/src/game/PlayerBot/Base/PlayerbotAI.cpp
index 7e8f0a5b5a5..7fafb0ab512 100644
--- a/src/game/PlayerBot/Base/PlayerbotAI.cpp
+++ b/src/game/PlayerBot/Base/PlayerbotAI.cpp
@@ -18,7 +18,7 @@
 
 #include <stdarg.h>
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "PlayerbotAI.h"
diff --git a/src/game/Pools/PoolManager.cpp b/src/game/Pools/PoolManager.cpp
index af80f507fd6..865473791c4 100644
--- a/src/game/Pools/PoolManager.cpp
+++ b/src/game/Pools/PoolManager.cpp
@@ -20,7 +20,7 @@
 #include "Globals/ObjectMgr.h"
 #include "Entities/ObjectGuid.h"
 #include "Util/ProgressBar.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Maps/MapPersistentStateMgr.h"
 #include "World/World.h"
 #include "Policies/Singleton.h"
diff --git a/src/game/Quests/QuestHandler.cpp b/src/game/Quests/QuestHandler.cpp
index 16b08d4e597..3bf83ca277f 100644
--- a/src/game/Quests/QuestHandler.cpp
+++ b/src/game/Quests/QuestHandler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
diff --git a/src/game/Server/AuthCrypt.cpp b/src/game/Server/AuthCrypt.cpp
index 574ee91140b..ec7d2c970eb 100644
--- a/src/game/Server/AuthCrypt.cpp
+++ b/src/game/Server/AuthCrypt.cpp
@@ -19,7 +19,7 @@
 #include "AuthCrypt.h"
 #include "Auth/CryptoHash.h"
 #include "Auth/HMACSHA1.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Auth/BigNumber.h"
 
 AuthCrypt::AuthCrypt() : _clientDecrypt(Sha1Hash::GetLength()), _serverEncrypt(Sha1Hash::GetLength()), _initialized(false) {}
diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp
index b048d668fc5..ce8d9351974 100644
--- a/src/game/Server/DBCStores.cpp
+++ b/src/game/Server/DBCStores.cpp
@@ -18,7 +18,7 @@
 
 #include "Server/DBCStores.h"
 #include "Policies/Singleton.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/ProgressBar.h"
 #include "Util/Util.h"
 #include "Globals/Locales.h"
diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
index 2a2fbf0f529..019aaeb5681 100644
--- a/src/game/Server/WorldSession.cpp
+++ b/src/game/Server/WorldSession.cpp
@@ -25,7 +25,7 @@
 #include "Server/WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
diff --git a/src/game/Server/WorldSocket.cpp b/src/game/Server/WorldSocket.cpp
index df316865b75..f6631e2509d 100644
--- a/src/game/Server/WorldSocket.cpp
+++ b/src/game/Server/WorldSocket.cpp
@@ -29,7 +29,7 @@
 #include "Database/DatabaseEnv.h"
 #include "Auth/CryptoHash.h"
 #include "Server/WorldSession.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/DBCStores.h"
 #include "Util/CommonDefines.h"
 #include "Anticheat/Anticheat.hpp"
diff --git a/src/game/Skills/SkillDiscovery.cpp b/src/game/Skills/SkillDiscovery.cpp
index 21df2ab1638..92e5601d58a 100644
--- a/src/game/Skills/SkillDiscovery.cpp
+++ b/src/game/Skills/SkillDiscovery.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/ProgressBar.h"
 #include "Policies/Singleton.h"
 #include "World/World.h"
diff --git a/src/game/Skills/SkillExtraItems.cpp b/src/game/Skills/SkillExtraItems.cpp
index aa2cc907b52..e1dd5129e62 100644
--- a/src/game/Skills/SkillExtraItems.cpp
+++ b/src/game/Skills/SkillExtraItems.cpp
@@ -18,7 +18,7 @@
 
 #include "Skills/SkillExtraItems.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/ProgressBar.h"
 #include "Entities/Player.h"
 #include "Server/DBCStores.h"
diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp
index fc2af3cffb2..092190834f5 100644
--- a/src/game/Spells/Spell.cpp
+++ b/src/game/Spells/Spell.cpp
@@ -23,7 +23,7 @@
 #include "Grids/GridNotifiers.h"
 #include "Grids/GridNotifiersImpl.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp
index af74806a8de..ec7c98cc2e9 100755
--- a/src/game/Spells/SpellAuras.cpp
+++ b/src/game/Spells/SpellAuras.cpp
@@ -21,7 +21,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
diff --git a/src/game/Spells/SpellEffects.cpp b/src/game/Spells/SpellEffects.cpp
index 8160c47d8e8..b13951e152f 100644
--- a/src/game/Spells/SpellEffects.cpp
+++ b/src/game/Spells/SpellEffects.cpp
@@ -20,7 +20,7 @@
 #include "Database/DatabaseEnv.h"
 #include "Server/WorldPacket.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
diff --git a/src/game/Spells/SpellHandler.cpp b/src/game/Spells/SpellHandler.cpp
index 2f9ad7dcb6a..160be4aeba1 100644
--- a/src/game/Spells/SpellHandler.cpp
+++ b/src/game/Spells/SpellHandler.cpp
@@ -22,7 +22,7 @@
 #include "Server/WorldSession.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Spells/Spell.h"
 #include "AI/ScriptDevAI/ScriptDevAIMgr.h"
diff --git a/src/game/Spells/SpellTargets.cpp b/src/game/Spells/SpellTargets.cpp
index 0f012a8b703..a65e2a37ebf 100644
--- a/src/game/Spells/SpellTargets.cpp
+++ b/src/game/Spells/SpellTargets.cpp
@@ -21,7 +21,7 @@
 #include "Spells/SpellMgr.h"
 #include "Server/DBCStructure.h"
 #include "Server/SQLStorages.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 SpellTargetInfo::SpellTargetInfo(char const* name, SpellTargetImplicitType type, SpellTargetFilter filter, SpellTargetEnumerator enumerator, SpellTargetLOS los) :
     name(name), type(type), filter(filter), enumerator(enumerator), los(los)
diff --git a/src/game/Spells/UnitAuraProcHandler.cpp b/src/game/Spells/UnitAuraProcHandler.cpp
index 70ed6299909..17adf23c8b4 100644
--- a/src/game/Spells/UnitAuraProcHandler.cpp
+++ b/src/game/Spells/UnitAuraProcHandler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Spells/SpellMgr.h"
 #include "Entities/Player.h"
diff --git a/src/game/Trade/TradeHandler.cpp b/src/game/Trade/TradeHandler.cpp
index 91810998e40..a3c536c8cbe 100644
--- a/src/game/Trade/TradeHandler.cpp
+++ b/src/game/Trade/TradeHandler.cpp
@@ -21,7 +21,7 @@
 #include "Server/WorldSession.h"
 #include "World/World.h"
 #include "Globals/ObjectAccessor.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Entities/Player.h"
 #include "Entities/Item.h"
diff --git a/src/game/Vmap/DynamicTree.cpp b/src/game/Vmap/DynamicTree.cpp
index 18079a921ec..ea3f71ac15d 100644
--- a/src/game/Vmap/DynamicTree.cpp
+++ b/src/game/Vmap/DynamicTree.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "DynamicTree.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/Timer.h"
 #include "BIHWrap.h"
 #include "RegularGrid.h"
diff --git a/src/game/Vmap/VMapDefinitions.h b/src/game/Vmap/VMapDefinitions.h
index 28976687bba..c59f4d9e6d5 100644
--- a/src/game/Vmap/VMapDefinitions.h
+++ b/src/game/Vmap/VMapDefinitions.h
@@ -33,7 +33,7 @@ namespace VMAP
 
 #ifndef NO_CORE_FUNCS
 #include "Util/Errors.h"
-#include "Log.h"
+#include "Log/Log.h"
 #define ERROR_LOG(...) sLog.outError(__VA_ARGS__);
 #elif defined MMAP_GENERATOR
 #include <assert.h>
diff --git a/src/game/VoiceChat/VoiceChatHandler.cpp b/src/game/VoiceChat/VoiceChatHandler.cpp
index 7e90520557e..918446df834 100644
--- a/src/game/VoiceChat/VoiceChatHandler.cpp
+++ b/src/game/VoiceChat/VoiceChatHandler.cpp
@@ -19,7 +19,7 @@
 #include "Common.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recv_data)
 {
diff --git a/src/game/Weather/Weather.cpp b/src/game/Weather/Weather.cpp
index 50f0a4c3c35..4c9baff9733 100644
--- a/src/game/Weather/Weather.cpp
+++ b/src/game/Weather/Weather.cpp
@@ -25,7 +25,7 @@
 #include "Maps/Map.h"
 #include "World/World.h"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/Util.h"
 #include "Util/ProgressBar.h"
 
diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp
index e248429c519..b24567d155b 100644
--- a/src/game/World/World.cpp
+++ b/src/game/World/World.cpp
@@ -26,7 +26,7 @@
 #include "Models/M2Stores.h"
 #include "Platform/Define.h"
 #include "SystemConfig.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Server/WorldSession.h"
 #include "Server/WorldPacket.h"
diff --git a/src/game/pchdef.h b/src/game/pchdef.h
index 8f960df8b7b..9d29ce7e88c 100644
--- a/src/game/pchdef.h
+++ b/src/game/pchdef.h
@@ -26,7 +26,7 @@
 #include <thread>
 #include <boost/asio.hpp>
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/SQLStorages.h"
 #include "Server/DBCStructure.h"
 #include "Server/DBCStores.h"
diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp
index 2497b95e48b..6bcd63fd207 100644
--- a/src/mangosd/CliRunnable.cpp
+++ b/src/mangosd/CliRunnable.cpp
@@ -22,7 +22,7 @@
 
 #include "Common.h"
 #include "Tools/Language.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Server/WorldSession.h"
diff --git a/src/mangosd/MaNGOSsoap.h b/src/mangosd/MaNGOSsoap.h
index 9c20df215a0..5774e862bb6 100644
--- a/src/mangosd/MaNGOSsoap.h
+++ b/src/mangosd/MaNGOSsoap.h
@@ -22,7 +22,7 @@
 #include "Common.h"
 #include "World/World.h"
 #include "Accounts/AccountMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include "soapH.h"
 #include "soapStub.h"
diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp
index 73af5d6b874..47f0586bd73 100644
--- a/src/mangosd/Main.cpp
+++ b/src/mangosd/Main.cpp
@@ -24,7 +24,7 @@
 #include "Database/DatabaseEnv.h"
 #include "Config/Config.h"
 #include "Util/ProgressBar.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Master.h"
 #include "SystemConfig.h"
 #include "AuctionHouseBot/AuctionHouseBot.h"
diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp
index c8b4e458879..e88fa550eb6 100644
--- a/src/mangosd/Master.cpp
+++ b/src/mangosd/Master.cpp
@@ -25,7 +25,7 @@
 #include "Server/WorldSocket.h"
 #include "WorldRunnable.h"
 #include "World/World.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/Timer.h"
 #include "SystemConfig.h"
 #include "CliRunnable.h"
diff --git a/src/mangosd/RASocket.cpp b/src/mangosd/RASocket.cpp
index 463a51d6b07..20b7fd328f1 100644
--- a/src/mangosd/RASocket.cpp
+++ b/src/mangosd/RASocket.cpp
@@ -22,7 +22,7 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "RASocket.h"
 #include "World/World.h"
 #include "Config/Config.h"
diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp
index 2789b91a4c1..f2f52db9bdb 100644
--- a/src/realmd/AuthSocket.cpp
+++ b/src/realmd/AuthSocket.cpp
@@ -25,7 +25,7 @@
 #include "Auth/base32.h"
 #include "Database/DatabaseEnv.h"
 #include "Config/Config.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "RealmList.h"
 #include "AuthSocket.h"
 #include "AuthCodes.h"
diff --git a/src/realmd/Main.cpp b/src/realmd/Main.cpp
index 686ead102a6..89ca099f176 100644
--- a/src/realmd/Main.cpp
+++ b/src/realmd/Main.cpp
@@ -25,7 +25,7 @@
 #include "RealmList.h"
 
 #include "Config/Config.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "AuthSocket.h"
 #include "SystemConfig.h"
 #include "revision.h"
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index fa84c8ef9d1..327b162299f 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -76,8 +76,8 @@ set(SRC_GRP_DATABASE_DBC
 )
 
 set(SRC_GRP_LOG
-    Log.cpp
-    Log.h
+    Log/Log.cpp
+    Log/Log.h
 )
 
 set(SRC_GRP_MT
diff --git a/src/shared/Common.h b/src/shared/Common.h
index 234aa184738..eb9e44a9bcb 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -50,6 +50,7 @@
 
 #include "Util/Errors.h"
 #include "Multithreading/Threading.h"
+#include "Log/Log.h"
 
 // included to use sleep_for()
 #include <thread>
diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h
index 5cfd5cabeb8..daa6742c465 100644
--- a/src/shared/Database/DatabaseEnv.h
+++ b/src/shared/Database/DatabaseEnv.h
@@ -20,7 +20,7 @@
 #define DATABASEENV_H
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/Errors.h"
 
 #include "Database/Field.h"
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index 273bc12eb5b..f89852d9607 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -20,7 +20,7 @@
 #define SQLSTORAGE_IMPL_H
 
 #include "Util/ProgressBar.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "DBCFileLoader.h"
 
 template<class DerivedLoader, class StorageClass>
diff --git a/src/shared/Log.cpp b/src/shared/Log/Log.cpp
similarity index 100%
rename from src/shared/Log.cpp
rename to src/shared/Log/Log.cpp
diff --git a/src/shared/Log.h b/src/shared/Log/Log.h
similarity index 100%
rename from src/shared/Log.h
rename to src/shared/Log/Log.h
diff --git a/src/shared/Metric/Metric.cpp b/src/shared/Metric/Metric.cpp
index fb0c0950e19..ac0d75767d8 100644
--- a/src/shared/Metric/Metric.cpp
+++ b/src/shared/Metric/Metric.cpp
@@ -20,7 +20,7 @@
 #include <functional>
 
 #include "Config/Config.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Metric.h"
 
 metric::measurement::measurement(std::string name, std::function<bool()> condition)
diff --git a/src/shared/Network/Socket.cpp b/src/shared/Network/Socket.cpp
index d992caa494f..8ff39cb8115 100644
--- a/src/shared/Network/Socket.cpp
+++ b/src/shared/Network/Socket.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "Socket.hpp"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include <boost/asio.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
diff --git a/src/shared/Platform/PosixDaemon.h b/src/shared/Platform/PosixDaemon.h
index 779e0f25247..9e79064fdea 100644
--- a/src/shared/Platform/PosixDaemon.h
+++ b/src/shared/Platform/PosixDaemon.h
@@ -17,7 +17,7 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 void startDaemon(uint32_t timeout = 10);
 void stopDaemon();
diff --git a/src/shared/Platform/ServiceWin32.cpp b/src/shared/Platform/ServiceWin32.cpp
index ed56b4c87fa..020556225a0 100644
--- a/src/shared/Platform/ServiceWin32.cpp
+++ b/src/shared/Platform/ServiceWin32.cpp
@@ -19,7 +19,7 @@
 #ifdef _WIN32
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include <cstring>
 #include <windows.h>
 #include <winsvc.h>
diff --git a/src/shared/Util/ByteBuffer.cpp b/src/shared/Util/ByteBuffer.cpp
index 3f856f1188d..c4b739dd665 100644
--- a/src/shared/Util/ByteBuffer.cpp
+++ b/src/shared/Util/ByteBuffer.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ByteBuffer.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 void ByteBufferException::PrintPosError() const
 {
diff --git a/src/shared/pchdef.h b/src/shared/pchdef.h
index 504f193fe23..586ee3ae316 100644
--- a/src/shared/pchdef.h
+++ b/src/shared/pchdef.h
@@ -26,7 +26,7 @@
 #include <thread>
 #include <boost/asio.hpp>
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Util/ByteBuffer.h"
 #include "Util/ProgressBar.h"
 #include "Server/WorldPacket.h"