diff --git a/src/server/authserver/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp similarity index 100% rename from src/server/authserver/AuthCodes.cpp rename to src/server/authserver/Authentication/AuthCodes.cpp diff --git a/src/server/authserver/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h similarity index 100% rename from src/server/authserver/AuthCodes.h rename to src/server/authserver/Authentication/AuthCodes.h diff --git a/src/server/authserver/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp similarity index 100% rename from src/server/authserver/RealmList.cpp rename to src/server/authserver/Realms/RealmList.cpp diff --git a/src/server/authserver/RealmList.h b/src/server/authserver/Realms/RealmList.h similarity index 100% rename from src/server/authserver/RealmList.h rename to src/server/authserver/Realms/RealmList.h diff --git a/src/server/authserver/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp similarity index 100% rename from src/server/authserver/AuthSocket.cpp rename to src/server/authserver/Server/AuthSocket.cpp diff --git a/src/server/authserver/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h similarity index 100% rename from src/server/authserver/AuthSocket.h rename to src/server/authserver/Server/AuthSocket.h diff --git a/src/server/authserver/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h similarity index 100% rename from src/server/authserver/RealmAcceptor.h rename to src/server/authserver/Server/RealmAcceptor.h diff --git a/src/server/authserver/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp similarity index 100% rename from src/server/authserver/RealmSocket.cpp rename to src/server/authserver/Server/RealmSocket.cpp diff --git a/src/server/authserver/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h similarity index 100% rename from src/server/authserver/RealmSocket.h rename to src/server/authserver/Server/RealmSocket.h diff --git a/src/server/game/AI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp similarity index 100% rename from src/server/game/AI/CombatAI.cpp rename to src/server/game/AI/CoreAI/CombatAI.cpp diff --git a/src/server/game/AI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h similarity index 100% rename from src/server/game/AI/CombatAI.h rename to src/server/game/AI/CoreAI/CombatAI.h diff --git a/src/server/game/AI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp similarity index 100% rename from src/server/game/AI/GuardAI.cpp rename to src/server/game/AI/CoreAI/GuardAI.cpp diff --git a/src/server/game/AI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h similarity index 100% rename from src/server/game/AI/GuardAI.h rename to src/server/game/AI/CoreAI/GuardAI.h diff --git a/src/server/game/AI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp similarity index 100% rename from src/server/game/AI/PassiveAI.cpp rename to src/server/game/AI/CoreAI/PassiveAI.cpp diff --git a/src/server/game/AI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h similarity index 100% rename from src/server/game/AI/PassiveAI.h rename to src/server/game/AI/CoreAI/PassiveAI.h diff --git a/src/server/game/AI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp similarity index 100% rename from src/server/game/AI/PetAI.cpp rename to src/server/game/AI/CoreAI/PetAI.cpp diff --git a/src/server/game/AI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h similarity index 100% rename from src/server/game/AI/PetAI.h rename to src/server/game/AI/CoreAI/PetAI.h diff --git a/src/server/game/AI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp similarity index 100% rename from src/server/game/AI/ReactorAI.cpp rename to src/server/game/AI/CoreAI/ReactorAI.cpp diff --git a/src/server/game/AI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h similarity index 100% rename from src/server/game/AI/ReactorAI.h rename to src/server/game/AI/CoreAI/ReactorAI.h diff --git a/src/server/game/AI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp similarity index 100% rename from src/server/game/AI/TotemAI.cpp rename to src/server/game/AI/CoreAI/TotemAI.cpp diff --git a/src/server/game/AI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h similarity index 100% rename from src/server/game/AI/TotemAI.h rename to src/server/game/AI/CoreAI/TotemAI.h diff --git a/src/server/game/AI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp similarity index 100% rename from src/server/game/AI/UnitAI.cpp rename to src/server/game/AI/CoreAI/UnitAI.cpp diff --git a/src/server/game/AI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h similarity index 100% rename from src/server/game/AI/UnitAI.h rename to src/server/game/AI/CoreAI/UnitAI.h diff --git a/src/server/game/Account/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp similarity index 100% rename from src/server/game/Account/AccountMgr.cpp rename to src/server/game/Accounts/AccountMgr.cpp diff --git a/src/server/game/Account/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h similarity index 100% rename from src/server/game/Account/AccountMgr.h rename to src/server/game/Accounts/AccountMgr.h diff --git a/src/server/game/AI/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp similarity index 100% rename from src/server/game/AI/AuctionHouseBot/AuctionHouseBot.cpp rename to src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp diff --git a/src/server/game/AI/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h similarity index 100% rename from src/server/game/AI/AuctionHouseBot/AuctionHouseBot.h rename to src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h diff --git a/src/server/game/BattleGrounds/BattleGroundAA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundAA.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundAA.h b/src/server/game/BattleGrounds/Zones/BattleGroundAA.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundAA.h rename to src/server/game/BattleGrounds/Zones/BattleGroundAA.h diff --git a/src/server/game/BattleGrounds/BattleGroundAB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundAB.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundAB.h b/src/server/game/BattleGrounds/Zones/BattleGroundAB.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundAB.h rename to src/server/game/BattleGrounds/Zones/BattleGroundAB.h diff --git a/src/server/game/BattleGrounds/BattleGroundAV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundAV.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundAV.h b/src/server/game/BattleGrounds/Zones/BattleGroundAV.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundAV.h rename to src/server/game/BattleGrounds/Zones/BattleGroundAV.h diff --git a/src/server/game/BattleGrounds/BattleGroundBE.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundBE.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundBE.h b/src/server/game/BattleGrounds/Zones/BattleGroundBE.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundBE.h rename to src/server/game/BattleGrounds/Zones/BattleGroundBE.h diff --git a/src/server/game/BattleGrounds/BattleGroundDS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundDS.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundDS.h b/src/server/game/BattleGrounds/Zones/BattleGroundDS.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundDS.h rename to src/server/game/BattleGrounds/Zones/BattleGroundDS.h diff --git a/src/server/game/BattleGrounds/BattleGroundEY.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundEY.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundEY.h rename to src/server/game/BattleGrounds/Zones/BattleGroundEY.h diff --git a/src/server/game/BattleGrounds/BattleGroundIC.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundIC.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundIC.h b/src/server/game/BattleGrounds/Zones/BattleGroundIC.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundIC.h rename to src/server/game/BattleGrounds/Zones/BattleGroundIC.h diff --git a/src/server/game/BattleGrounds/BattleGroundNA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundNA.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundNA.h b/src/server/game/BattleGrounds/Zones/BattleGroundNA.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundNA.h rename to src/server/game/BattleGrounds/Zones/BattleGroundNA.h diff --git a/src/server/game/BattleGrounds/BattleGroundRB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundRB.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundRB.h b/src/server/game/BattleGrounds/Zones/BattleGroundRB.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundRB.h rename to src/server/game/BattleGrounds/Zones/BattleGroundRB.h diff --git a/src/server/game/BattleGrounds/BattleGroundRL.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundRL.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundRL.h b/src/server/game/BattleGrounds/Zones/BattleGroundRL.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundRL.h rename to src/server/game/BattleGrounds/Zones/BattleGroundRL.h diff --git a/src/server/game/BattleGrounds/BattleGroundRV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundRV.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundRV.h b/src/server/game/BattleGrounds/Zones/BattleGroundRV.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundRV.h rename to src/server/game/BattleGrounds/Zones/BattleGroundRV.h diff --git a/src/server/game/BattleGrounds/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundSA.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundSA.h b/src/server/game/BattleGrounds/Zones/BattleGroundSA.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundSA.h rename to src/server/game/BattleGrounds/Zones/BattleGroundSA.h diff --git a/src/server/game/BattleGrounds/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundWS.cpp rename to src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundWS.h b/src/server/game/BattleGrounds/Zones/BattleGroundWS.h similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundWS.h rename to src/server/game/BattleGrounds/Zones/BattleGroundWS.h diff --git a/src/server/game/Calender/Calendar.cpp b/src/server/game/Calender/Calendar.cpp deleted file mode 100644 index 0c1efb20f87..00000000000 --- a/src/server/game/Calender/Calendar.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ diff --git a/src/server/game/Calender/Calendar.h b/src/server/game/Calender/Calendar.h deleted file mode 100644 index 2d35a6c23c7..00000000000 --- a/src/server/game/Calender/Calendar.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef TRINITY_CALENDAR_H -#define TRINITY_CALENDAR_H - -class Calendar -{ - -}; -#endif diff --git a/src/server/game/Calender/CalendarHandler.cpp b/src/server/game/Calender/CalendarHandler.cpp deleted file mode 100644 index f6679c5d5ac..00000000000 --- a/src/server/game/Calender/CalendarHandler.cpp +++ /dev/null @@ -1,318 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "Common.h" -#include "WorldPacket.h" -#include "WorldSession.h" - -#include "InstanceSaveMgr.h" -#include "Log.h" -#include "Opcodes.h" -#include "Player.h" - -void WorldSession::HandleCalendarGetCalendar(WorldPacket & /*recv_data*/) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_GET_CALENDAR"); // empty - - time_t cur_time = time(NULL); - - WorldPacket data(SMSG_CALENDAR_SEND_CALENDAR,4+4*0+4+4*0+4+4); - - data << uint32(0); // invite count - /* - for (;;) - { - uint64 inviteId; - uint64 unkGuid0; - uint8 unk1, unk2, unk3; - uint64 creatorGuid; - } - */ - - data << uint32(0); // event count - /* - for (;;) - { - uint64 eventId; - std::string title; // 128 chars - uint32 type; - uint32 occurrenceTime; - uint32 flags; - uint32 unk4; -- possibly mapid for dungeon/raid - uint64 creatorGuid; - } - */ - - data << uint32(0); // unk - data << uint32(secsToTimeBitFields(cur_time)); // current time - - uint32 counter = 0; - size_t p_counter = data.wpos(); - data << uint32(counter); // instance save count - - for (int i = 0; i < MAX_DIFFICULTY; ++i) - { - for (Player::BoundInstancesMap::const_iterator itr = _player->m_boundInstances[i].begin(); itr != _player->m_boundInstances[i].end(); ++itr) - { - if (itr->second.perm) - { - InstanceSave *save = itr->second.save; - data << uint32(save->GetMapId()); - data << uint32(save->GetDifficulty()); - data << uint32(save->GetResetTime() - cur_time); - data << uint64(save->GetInstanceId()); // instance save id as unique instance copy id - ++counter; - } - } - } - - data.put(p_counter, counter); - - data << uint32(1135753200); // unk (28.12.2005 12:00) - - counter = 0; - p_counter = data.wpos(); - data << uint32(counter); // raid reset count - - ResetTimeByMapDifficultyMap const& resets = sInstanceSaveManager.GetResetTimeMap(); - for (ResetTimeByMapDifficultyMap::const_iterator itr = resets.begin(); itr != resets.end(); ++itr) - { - uint32 mapid = PAIR32_LOPART(itr->first); - MapEntry const* mapEnt = sMapStore.LookupEntry(mapid); - if (!mapEnt || !mapEnt->IsRaid()) - continue; - - data << uint32(mapid); - data << uint32(itr->second - cur_time); - data << uint32(mapEnt->unk_time); - ++counter; - } - - data.put(p_counter, counter); - - data << uint32(0); // holiday count? - /* - for (;;) - { - uint32 unk5, unk6, unk7, unk8, unk9; - for (uint32 j = 0; j < 26; ++j) - { - uint32 unk10; - } - for (uint32 j = 0; j < 10; ++j) - { - uint32 unk11; - } - for (uint32 j = 0; j < 10; ++j) - { - uint32 unk12; - } - std::string holidayName; // 64 chars - } - */ - - sLog.outDebug("Sending calendar"); - data.hexlike(); - SendPacket(&data); -} - -void WorldSession::HandleCalendarGetEvent(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_GET_EVENT"); - recv_data.hexlike(); - recv_data.read_skip(); // unk -} - -void WorldSession::HandleCalendarGuildFilter(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_GUILD_FILTER"); - recv_data.hexlike(); - recv_data.read_skip(); // unk1 - recv_data.read_skip(); // unk2 - recv_data.read_skip(); // unk3 -} - -void WorldSession::HandleCalendarArenaTeam(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_ARENA_TEAM"); - recv_data.hexlike(); - recv_data.read_skip(); // unk -} - -void WorldSession::HandleCalendarAddEvent(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_ADD_EVENT"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //std::string unk1, unk2; - //recv_data >> (std::string)unk1; - //recv_data >> (std::string)unk2; - - //uint8 unk3, unk4; - //uint32 unk5, unk6, unk7, unk8, unk9, count = 0; - //recv_data >> (uint8)unk3; - //recv_data >> (uint8)unk4; - //recv_data >> (uint32)unk5; - //recv_data >> (uint32)unk6; - //recv_data >> (uint32)unk7; - //recv_data >> (uint32)unk8; - //recv_data >> (uint32)unk9; - //if (!((unk9 >> 6) & 1)) - //{ - // recv_data >> (uint32)count; - // if (count) - // { - // uint8 unk12,unk13; - // uint64 guid; - // for (int i=0; i> (uint8)unk12; - // recv_data >> (uint8)unk13; - // } - // } - //} -} - -void WorldSession::HandleCalendarUpdateEvent(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_UPDATE_EVENT"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> std::string - //recv_data >> std::string - //recv_data >> uint8 - //recv_data >> uint8 - //recv_data >> uint32 - //recv_data >> uint32 - //recv_data >> uint32 - //recv_data >> uint32 - //recv_data >> uint32 -} - -void WorldSession::HandleCalendarRemoveEvent(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_REMOVE_EVENT"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint32 - -} - -void WorldSession::HandleCalendarCopyEvent(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_COPY_EVENT"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint32 - -} - -void WorldSession::HandleCalendarEventInvite(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_INVITE"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> std::string - //recv_data >> uint8 - //recv_data >> uint8 - -} - -void WorldSession::HandleCalendarEventRsvp(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_RSVP"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint32 - -} - -void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_REMOVE_INVITE"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data.readPackGUID(guid) - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint64 -} - -void WorldSession::HandleCalendarEventStatus(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_STATUS"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data.readPackGUID(guid) - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint32 -} - -void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_MODERATOR_STATUS"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data.readPackGUID(guid) - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint32 -} - -void WorldSession::HandleCalendarComplain(WorldPacket &recv_data) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_COMPLAIN"); - recv_data.hexlike(); - recv_data.rpos(recv_data.wpos()); // set to end to avoid warnings spam - - //recv_data >> uint64 - //recv_data >> uint64 - //recv_data >> uint64 -} - -void WorldSession::HandleCalendarGetNumPending(WorldPacket & /*recv_data*/) -{ - sLog.outDebug("WORLD: CMSG_CALENDAR_GET_NUM_PENDING"); // empty - - WorldPacket data(SMSG_CALENDAR_SEND_NUM_PENDING, 4); - data << uint32(0); // 0 - no pending invites, 1 - some pending invites - SendPacket(&data); -} diff --git a/src/server/game/Chat/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp similarity index 100% rename from src/server/game/Chat/Channel.cpp rename to src/server/game/Chat/Channels/Channel.cpp diff --git a/src/server/game/Chat/Channel.h b/src/server/game/Chat/Channels/Channel.h similarity index 100% rename from src/server/game/Chat/Channel.h rename to src/server/game/Chat/Channels/Channel.h diff --git a/src/server/game/Chat/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp similarity index 100% rename from src/server/game/Chat/ChannelMgr.cpp rename to src/server/game/Chat/Channels/ChannelMgr.cpp diff --git a/src/server/game/Chat/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h similarity index 100% rename from src/server/game/Chat/ChannelMgr.h rename to src/server/game/Chat/Channels/ChannelMgr.h diff --git a/src/server/game/Chat/Debugcmds.cpp b/src/server/game/Chat/Commands/Debugcmds.cpp similarity index 100% rename from src/server/game/Chat/Debugcmds.cpp rename to src/server/game/Chat/Commands/Debugcmds.cpp diff --git a/src/server/game/Chat/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp similarity index 100% rename from src/server/game/Chat/Level0.cpp rename to src/server/game/Chat/Commands/Level0.cpp diff --git a/src/server/game/Chat/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp similarity index 100% rename from src/server/game/Chat/Level1.cpp rename to src/server/game/Chat/Commands/Level1.cpp diff --git a/src/server/game/Chat/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp similarity index 100% rename from src/server/game/Chat/Level2.cpp rename to src/server/game/Chat/Commands/Level2.cpp diff --git a/src/server/game/Chat/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp similarity index 100% rename from src/server/game/Chat/Level3.cpp rename to src/server/game/Chat/Commands/Level3.cpp diff --git a/src/server/shared/vmap/BIH.cpp b/src/server/game/CollisionDetection/BIH.cpp similarity index 100% rename from src/server/shared/vmap/BIH.cpp rename to src/server/game/CollisionDetection/BIH.cpp diff --git a/src/server/shared/vmap/BIH.h b/src/server/game/CollisionDetection/BIH.h similarity index 100% rename from src/server/shared/vmap/BIH.h rename to src/server/game/CollisionDetection/BIH.h diff --git a/src/server/shared/vmap/CMakeLists.txt b/src/server/game/CollisionDetection/CMakeLists.txt similarity index 100% rename from src/server/shared/vmap/CMakeLists.txt rename to src/server/game/CollisionDetection/CMakeLists.txt diff --git a/src/server/shared/vmap/IVMapManager.h b/src/server/game/CollisionDetection/IVMapManager.h similarity index 100% rename from src/server/shared/vmap/IVMapManager.h rename to src/server/game/CollisionDetection/IVMapManager.h diff --git a/src/server/shared/vmap/MapTree.cpp b/src/server/game/CollisionDetection/MapTree.cpp similarity index 100% rename from src/server/shared/vmap/MapTree.cpp rename to src/server/game/CollisionDetection/MapTree.cpp diff --git a/src/server/shared/vmap/MapTree.h b/src/server/game/CollisionDetection/MapTree.h similarity index 100% rename from src/server/shared/vmap/MapTree.h rename to src/server/game/CollisionDetection/MapTree.h diff --git a/src/server/shared/vmap/ModelInstance.cpp b/src/server/game/CollisionDetection/ModelInstance.cpp similarity index 100% rename from src/server/shared/vmap/ModelInstance.cpp rename to src/server/game/CollisionDetection/ModelInstance.cpp diff --git a/src/server/shared/vmap/ModelInstance.h b/src/server/game/CollisionDetection/ModelInstance.h similarity index 100% rename from src/server/shared/vmap/ModelInstance.h rename to src/server/game/CollisionDetection/ModelInstance.h diff --git a/src/server/shared/vmap/TileAssembler.cpp b/src/server/game/CollisionDetection/TileAssembler.cpp similarity index 100% rename from src/server/shared/vmap/TileAssembler.cpp rename to src/server/game/CollisionDetection/TileAssembler.cpp diff --git a/src/server/shared/vmap/TileAssembler.h b/src/server/game/CollisionDetection/TileAssembler.h similarity index 100% rename from src/server/shared/vmap/TileAssembler.h rename to src/server/game/CollisionDetection/TileAssembler.h diff --git a/src/server/shared/vmap/VMapDefinitions.h b/src/server/game/CollisionDetection/VMapDefinitions.h similarity index 100% rename from src/server/shared/vmap/VMapDefinitions.h rename to src/server/game/CollisionDetection/VMapDefinitions.h diff --git a/src/server/shared/vmap/VMapFactory.cpp b/src/server/game/CollisionDetection/VMapFactory.cpp similarity index 100% rename from src/server/shared/vmap/VMapFactory.cpp rename to src/server/game/CollisionDetection/VMapFactory.cpp diff --git a/src/server/shared/vmap/VMapFactory.h b/src/server/game/CollisionDetection/VMapFactory.h similarity index 100% rename from src/server/shared/vmap/VMapFactory.h rename to src/server/game/CollisionDetection/VMapFactory.h diff --git a/src/server/shared/vmap/VMapManager2.cpp b/src/server/game/CollisionDetection/VMapManager2.cpp similarity index 100% rename from src/server/shared/vmap/VMapManager2.cpp rename to src/server/game/CollisionDetection/VMapManager2.cpp diff --git a/src/server/shared/vmap/VMapManager2.h b/src/server/game/CollisionDetection/VMapManager2.h similarity index 100% rename from src/server/shared/vmap/VMapManager2.h rename to src/server/game/CollisionDetection/VMapManager2.h diff --git a/src/server/shared/vmap/VMapTools.h b/src/server/game/CollisionDetection/VMapTools.h similarity index 100% rename from src/server/shared/vmap/VMapTools.h rename to src/server/game/CollisionDetection/VMapTools.h diff --git a/src/server/shared/vmap/WorldModel.cpp b/src/server/game/CollisionDetection/WorldModel.cpp similarity index 100% rename from src/server/shared/vmap/WorldModel.cpp rename to src/server/game/CollisionDetection/WorldModel.cpp diff --git a/src/server/shared/vmap/WorldModel.h b/src/server/game/CollisionDetection/WorldModel.h similarity index 100% rename from src/server/shared/vmap/WorldModel.h rename to src/server/game/CollisionDetection/WorldModel.h diff --git a/src/server/game/Events/UnitEvents.h b/src/server/game/Combat/UnitEvents.h similarity index 100% rename from src/server/game/Events/UnitEvents.h rename to src/server/game/Combat/UnitEvents.h diff --git a/src/server/game/ConditionMgr/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp similarity index 100% rename from src/server/game/ConditionMgr/ConditionMgr.cpp rename to src/server/game/Conditions/ConditionMgr.cpp diff --git a/src/server/game/ConditionMgr/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h similarity index 100% rename from src/server/game/ConditionMgr/ConditionMgr.h rename to src/server/game/Conditions/ConditionMgr.h diff --git a/src/server/game/LookingForGroup/LFG.h b/src/server/game/DungeonFinding/LFG.h similarity index 100% rename from src/server/game/LookingForGroup/LFG.h rename to src/server/game/DungeonFinding/LFG.h diff --git a/src/server/game/LookingForGroup/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp similarity index 100% rename from src/server/game/LookingForGroup/LFGMgr.cpp rename to src/server/game/DungeonFinding/LFGMgr.cpp diff --git a/src/server/game/LookingForGroup/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h similarity index 100% rename from src/server/game/LookingForGroup/LFGMgr.h rename to src/server/game/DungeonFinding/LFGMgr.h diff --git a/src/server/game/Entities/Object/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp similarity index 100% rename from src/server/game/Entities/Object/Corpse.cpp rename to src/server/game/Entities/Corpse/Corpse.cpp diff --git a/src/server/game/Entities/Object/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h similarity index 100% rename from src/server/game/Entities/Object/Corpse.h rename to src/server/game/Entities/Corpse/Corpse.h diff --git a/src/server/game/Entities/Object/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp similarity index 100% rename from src/server/game/Entities/Object/DynamicObject.cpp rename to src/server/game/Entities/DynamicObject/DynamicObject.cpp diff --git a/src/server/game/Entities/Object/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h similarity index 100% rename from src/server/game/Entities/Object/DynamicObject.h rename to src/server/game/Entities/DynamicObject/DynamicObject.h diff --git a/src/server/game/Entities/Item/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp similarity index 100% rename from src/server/game/Entities/Item/Bag.cpp rename to src/server/game/Entities/Item/Container/Bag.cpp diff --git a/src/server/game/Entities/Item/Bag.h b/src/server/game/Entities/Item/Container/Bag.h similarity index 100% rename from src/server/game/Entities/Item/Bag.h rename to src/server/game/Entities/Item/Container/Bag.h diff --git a/src/server/game/Map/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp similarity index 100% rename from src/server/game/Map/ObjectPosSelector.cpp rename to src/server/game/Entities/Object/ObjectPosSelector.cpp diff --git a/src/server/game/Map/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h similarity index 100% rename from src/server/game/Map/ObjectPosSelector.h rename to src/server/game/Entities/Object/ObjectPosSelector.h diff --git a/src/server/game/Entities/Object/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp similarity index 100% rename from src/server/game/Entities/Object/UpdateData.cpp rename to src/server/game/Entities/Object/Updates/UpdateData.cpp diff --git a/src/server/game/Entities/Object/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h similarity index 100% rename from src/server/game/Entities/Object/UpdateData.h rename to src/server/game/Entities/Object/Updates/UpdateData.h diff --git a/src/server/game/Entities/Object/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h similarity index 100% rename from src/server/game/Entities/Object/UpdateFields.h rename to src/server/game/Entities/Object/Updates/UpdateFields.h diff --git a/src/server/game/Entities/Object/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h similarity index 100% rename from src/server/game/Entities/Object/UpdateMask.h rename to src/server/game/Entities/Object/Updates/UpdateMask.h diff --git a/src/server/game/Movement/Transports.cpp b/src/server/game/Entities/Transport/Transports.cpp similarity index 100% rename from src/server/game/Movement/Transports.cpp rename to src/server/game/Entities/Transport/Transports.cpp diff --git a/src/server/game/Movement/Transports.h b/src/server/game/Entities/Transport/Transports.h similarity index 100% rename from src/server/game/Movement/Transports.h rename to src/server/game/Entities/Transport/Transports.h diff --git a/src/server/game/Events/GlobalEvents.cpp b/src/server/game/Globals/GlobalEvents.cpp similarity index 100% rename from src/server/game/Events/GlobalEvents.cpp rename to src/server/game/Globals/GlobalEvents.cpp diff --git a/src/server/game/Events/GlobalEvents.h b/src/server/game/Globals/GlobalEvents.h similarity index 100% rename from src/server/game/Events/GlobalEvents.h rename to src/server/game/Globals/GlobalEvents.h diff --git a/src/server/game/Entities/Object/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp similarity index 100% rename from src/server/game/Entities/Object/ObjectAccessor.cpp rename to src/server/game/Globals/ObjectAccessor.cpp diff --git a/src/server/game/Entities/Object/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h similarity index 100% rename from src/server/game/Entities/Object/ObjectAccessor.h rename to src/server/game/Globals/ObjectAccessor.h diff --git a/src/server/game/Entities/Object/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp similarity index 100% rename from src/server/game/Entities/Object/ObjectMgr.cpp rename to src/server/game/Globals/ObjectMgr.cpp diff --git a/src/server/game/Entities/Object/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h similarity index 100% rename from src/server/game/Entities/Object/ObjectMgr.h rename to src/server/game/Globals/ObjectMgr.h diff --git a/src/server/game/Map/Cell/Cell.h b/src/server/game/Maps/Cell/Cell.h similarity index 100% rename from src/server/game/Map/Cell/Cell.h rename to src/server/game/Maps/Cell/Cell.h diff --git a/src/server/game/Map/Cell/CellImpl.h b/src/server/game/Maps/Cell/CellImpl.h similarity index 100% rename from src/server/game/Map/Cell/CellImpl.h rename to src/server/game/Maps/Cell/CellImpl.h diff --git a/src/server/game/Map/Grid/GridDefines.h b/src/server/game/Maps/Grid/GridDefines.h similarity index 100% rename from src/server/game/Map/Grid/GridDefines.h rename to src/server/game/Maps/Grid/GridDefines.h diff --git a/src/server/game/Map/Grid/GridNotifiers.cpp b/src/server/game/Maps/Grid/GridNotifiers.cpp similarity index 100% rename from src/server/game/Map/Grid/GridNotifiers.cpp rename to src/server/game/Maps/Grid/GridNotifiers.cpp diff --git a/src/server/game/Map/Grid/GridNotifiers.h b/src/server/game/Maps/Grid/GridNotifiers.h similarity index 100% rename from src/server/game/Map/Grid/GridNotifiers.h rename to src/server/game/Maps/Grid/GridNotifiers.h diff --git a/src/server/game/Map/Grid/GridNotifiersImpl.h b/src/server/game/Maps/Grid/GridNotifiersImpl.h similarity index 100% rename from src/server/game/Map/Grid/GridNotifiersImpl.h rename to src/server/game/Maps/Grid/GridNotifiersImpl.h diff --git a/src/server/game/Map/Grid/GridStates.cpp b/src/server/game/Maps/Grid/GridStates.cpp similarity index 100% rename from src/server/game/Map/Grid/GridStates.cpp rename to src/server/game/Maps/Grid/GridStates.cpp diff --git a/src/server/game/Map/Grid/GridStates.h b/src/server/game/Maps/Grid/GridStates.h similarity index 100% rename from src/server/game/Map/Grid/GridStates.h rename to src/server/game/Maps/Grid/GridStates.h diff --git a/src/server/game/Map/Grid/ObjectGridLoader.cpp b/src/server/game/Maps/Grid/ObjectGridLoader.cpp similarity index 100% rename from src/server/game/Map/Grid/ObjectGridLoader.cpp rename to src/server/game/Maps/Grid/ObjectGridLoader.cpp diff --git a/src/server/game/Map/Grid/ObjectGridLoader.h b/src/server/game/Maps/Grid/ObjectGridLoader.h similarity index 100% rename from src/server/game/Map/Grid/ObjectGridLoader.h rename to src/server/game/Maps/Grid/ObjectGridLoader.h diff --git a/src/server/game/Map/Map.cpp b/src/server/game/Maps/Map.cpp similarity index 100% rename from src/server/game/Map/Map.cpp rename to src/server/game/Maps/Map.cpp diff --git a/src/server/game/Map/Map.h b/src/server/game/Maps/Map.h similarity index 100% rename from src/server/game/Map/Map.h rename to src/server/game/Maps/Map.h diff --git a/src/server/game/Map/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp similarity index 100% rename from src/server/game/Map/MapInstanced.cpp rename to src/server/game/Maps/MapInstanced.cpp diff --git a/src/server/game/Map/MapInstanced.h b/src/server/game/Maps/MapInstanced.h similarity index 100% rename from src/server/game/Map/MapInstanced.h rename to src/server/game/Maps/MapInstanced.h diff --git a/src/server/game/Map/MapManager.cpp b/src/server/game/Maps/MapManager.cpp similarity index 100% rename from src/server/game/Map/MapManager.cpp rename to src/server/game/Maps/MapManager.cpp diff --git a/src/server/game/Map/MapManager.h b/src/server/game/Maps/MapManager.h similarity index 100% rename from src/server/game/Map/MapManager.h rename to src/server/game/Maps/MapManager.h diff --git a/src/server/game/Map/MapRefManager.h b/src/server/game/Maps/MapRefManager.h similarity index 100% rename from src/server/game/Map/MapRefManager.h rename to src/server/game/Maps/MapRefManager.h diff --git a/src/server/game/Map/MapReference.h b/src/server/game/Maps/MapReference.h similarity index 100% rename from src/server/game/Map/MapReference.h rename to src/server/game/Maps/MapReference.h diff --git a/src/server/game/Map/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp similarity index 100% rename from src/server/game/Map/MapUpdater.cpp rename to src/server/game/Maps/MapUpdater.cpp diff --git a/src/server/game/Map/MapUpdater.h b/src/server/game/Maps/MapUpdater.h similarity index 100% rename from src/server/game/Map/MapUpdater.h rename to src/server/game/Maps/MapUpdater.h diff --git a/src/server/game/Map/ZoneScript.h b/src/server/game/Maps/ZoneScript.h similarity index 100% rename from src/server/game/Map/ZoneScript.h rename to src/server/game/Maps/ZoneScript.h diff --git a/src/server/game/Globals/Formulas.h b/src/server/game/Miscellaneous/Formulas.h similarity index 100% rename from src/server/game/Globals/Formulas.h rename to src/server/game/Miscellaneous/Formulas.h diff --git a/src/server/game/Globals/Language.h b/src/server/game/Miscellaneous/Language.h similarity index 100% rename from src/server/game/Globals/Language.h rename to src/server/game/Miscellaneous/Language.h diff --git a/src/server/game/Globals/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h similarity index 100% rename from src/server/game/Globals/SharedDefines.h rename to src/server/game/Miscellaneous/SharedDefines.h diff --git a/src/server/game/Movement/MovementGenerators/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp similarity index 100% rename from src/server/game/Movement/MovementGenerators/MovementGenerator.cpp rename to src/server/game/Movement/MovementGenerator.cpp diff --git a/src/server/game/Movement/MovementGenerators/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h similarity index 100% rename from src/server/game/Movement/MovementGenerators/MovementGenerator.h rename to src/server/game/Movement/MovementGenerator.h diff --git a/src/server/game/Movement/MovementGenerators/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h similarity index 100% rename from src/server/game/Movement/MovementGenerators/MovementGeneratorImpl.h rename to src/server/game/Movement/MovementGeneratorImpl.h diff --git a/src/server/game/Movement/Path.h b/src/server/game/Movement/Waypoints/Path.h similarity index 100% rename from src/server/game/Movement/Path.h rename to src/server/game/Movement/Waypoints/Path.h diff --git a/src/server/game/Movement/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp similarity index 100% rename from src/server/game/Movement/WaypointManager.cpp rename to src/server/game/Movement/Waypoints/WaypointManager.cpp diff --git a/src/server/game/Movement/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h similarity index 100% rename from src/server/game/Movement/WaypointManager.h rename to src/server/game/Movement/Waypoints/WaypointManager.h diff --git a/src/server/game/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/game/OutdoorPvP/Zones/OutdoorPvPEP.cpp similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPEP.cpp rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPEP.cpp diff --git a/src/server/game/OutdoorPvP/OutdoorPvPEP.h b/src/server/game/OutdoorPvP/Zones/OutdoorPvPEP.h similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPEP.h rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPEP.h diff --git a/src/server/game/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/game/OutdoorPvP/Zones/OutdoorPvPHP.cpp similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPHP.cpp rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPHP.cpp diff --git a/src/server/game/OutdoorPvP/OutdoorPvPHP.h b/src/server/game/OutdoorPvP/Zones/OutdoorPvPHP.h similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPHP.h rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPHP.h diff --git a/src/server/game/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/game/OutdoorPvP/Zones/OutdoorPvPNA.cpp similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPNA.cpp rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPNA.cpp diff --git a/src/server/game/OutdoorPvP/OutdoorPvPNA.h b/src/server/game/OutdoorPvP/Zones/OutdoorPvPNA.h similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPNA.h rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPNA.h diff --git a/src/server/game/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/game/OutdoorPvP/Zones/OutdoorPvPSI.cpp similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPSI.cpp rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPSI.cpp diff --git a/src/server/game/OutdoorPvP/OutdoorPvPSI.h b/src/server/game/OutdoorPvP/Zones/OutdoorPvPSI.h similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPSI.h rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPSI.h diff --git a/src/server/game/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/game/OutdoorPvP/Zones/OutdoorPvPTF.cpp similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPTF.cpp rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPTF.cpp diff --git a/src/server/game/OutdoorPvP/OutdoorPvPTF.h b/src/server/game/OutdoorPvP/Zones/OutdoorPvPTF.h similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPTF.h rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPTF.h diff --git a/src/server/game/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/game/OutdoorPvP/Zones/OutdoorPvPZM.cpp similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPZM.cpp rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPZM.cpp diff --git a/src/server/game/OutdoorPvP/OutdoorPvPZM.h b/src/server/game/OutdoorPvP/Zones/OutdoorPvPZM.h similarity index 100% rename from src/server/game/OutdoorPvP/OutdoorPvPZM.h rename to src/server/game/OutdoorPvP/Zones/OutdoorPvPZM.h diff --git a/src/server/game/PrecompiledHeaders/pchdef.cpp b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp similarity index 100% rename from src/server/game/PrecompiledHeaders/pchdef.cpp rename to src/server/game/PrecompiledHeaders/NixCorePCH.cpp diff --git a/src/server/game/PrecompiledHeaders/pchlinux.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h similarity index 100% rename from src/server/game/PrecompiledHeaders/pchlinux.h rename to src/server/game/PrecompiledHeaders/NixCorePCH.h diff --git a/src/server/game/ScriptMgr/ScriptedPch.cpp b/src/server/game/PrecompiledHeaders/ScriptPCH.cpp similarity index 100% rename from src/server/game/ScriptMgr/ScriptedPch.cpp rename to src/server/game/PrecompiledHeaders/ScriptPCH.cpp diff --git a/src/server/game/ScriptMgr/ScriptedPch.h b/src/server/game/PrecompiledHeaders/ScriptPCH.h similarity index 100% rename from src/server/game/ScriptMgr/ScriptedPch.h rename to src/server/game/PrecompiledHeaders/ScriptPCH.h diff --git a/src/server/game/PrecompiledHeaders/pchlinux.cpp b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp similarity index 100% rename from src/server/game/PrecompiledHeaders/pchlinux.cpp rename to src/server/game/PrecompiledHeaders/WinCorePCH.cpp diff --git a/src/server/game/PrecompiledHeaders/pchdef.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h similarity index 100% rename from src/server/game/PrecompiledHeaders/pchdef.h rename to src/server/game/PrecompiledHeaders/WinCorePCH.h diff --git a/src/server/game/ScriptMgr/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp similarity index 100% rename from src/server/game/ScriptMgr/ScriptLoader.cpp rename to src/server/game/Scripting/ScriptLoader.cpp diff --git a/src/server/game/ScriptMgr/ScriptLoader.h b/src/server/game/Scripting/ScriptLoader.h similarity index 100% rename from src/server/game/ScriptMgr/ScriptLoader.h rename to src/server/game/Scripting/ScriptLoader.h diff --git a/src/server/game/ScriptMgr/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp similarity index 100% rename from src/server/game/ScriptMgr/ScriptMgr.cpp rename to src/server/game/Scripting/ScriptMgr.cpp diff --git a/src/server/game/ScriptMgr/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h similarity index 100% rename from src/server/game/ScriptMgr/ScriptMgr.h rename to src/server/game/Scripting/ScriptMgr.h diff --git a/src/server/game/ScriptMgr/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp similarity index 100% rename from src/server/game/ScriptMgr/ScriptSystem.cpp rename to src/server/game/Scripting/ScriptSystem.cpp diff --git a/src/server/game/ScriptMgr/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h similarity index 100% rename from src/server/game/ScriptMgr/ScriptSystem.h rename to src/server/game/Scripting/ScriptSystem.h diff --git a/src/server/game/Addons/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp similarity index 100% rename from src/server/game/Addons/AddonHandler.cpp rename to src/server/game/Server/Protocol/Handlers/AddonHandler.cpp diff --git a/src/server/game/Addons/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h similarity index 100% rename from src/server/game/Addons/AddonHandler.h rename to src/server/game/Server/Protocol/Handlers/AddonHandler.h diff --git a/src/server/game/BattleGrounds/ArenaTeamHandler.cpp b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp similarity index 100% rename from src/server/game/BattleGrounds/ArenaTeamHandler.cpp rename to src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp diff --git a/src/server/game/AuctionHouse/AuctionHouseHandler.cpp b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp similarity index 100% rename from src/server/game/AuctionHouse/AuctionHouseHandler.cpp rename to src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp diff --git a/src/server/game/BattleGrounds/BattleGroundHandler.cpp b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp similarity index 100% rename from src/server/game/BattleGrounds/BattleGroundHandler.cpp rename to src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp diff --git a/src/server/game/Calendar/CalendarHandler.cpp b/src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp similarity index 100% rename from src/server/game/Calendar/CalendarHandler.cpp rename to src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp diff --git a/src/server/game/Chat/ChannelHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp similarity index 100% rename from src/server/game/Chat/ChannelHandler.cpp rename to src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp diff --git a/src/server/game/Entities/Player/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp similarity index 100% rename from src/server/game/Entities/Player/CharacterHandler.cpp rename to src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp diff --git a/src/server/game/Chat/ChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp similarity index 100% rename from src/server/game/Chat/ChatHandler.cpp rename to src/server/game/Server/Protocol/Handlers/ChatHandler.cpp diff --git a/src/server/game/Combat/CombatHandler.cpp b/src/server/game/Server/Protocol/Handlers/CombatHandler.cpp similarity index 100% rename from src/server/game/Combat/CombatHandler.cpp rename to src/server/game/Server/Protocol/Handlers/CombatHandler.cpp diff --git a/src/server/game/Entities/Player/DuelHandler.cpp b/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp similarity index 100% rename from src/server/game/Entities/Player/DuelHandler.cpp rename to src/server/game/Server/Protocol/Handlers/DuelHandler.cpp diff --git a/src/server/game/Groups/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp similarity index 100% rename from src/server/game/Groups/GroupHandler.cpp rename to src/server/game/Server/Protocol/Handlers/GroupHandler.cpp diff --git a/src/server/game/Guilds/GuildHandler.cpp b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp similarity index 100% rename from src/server/game/Guilds/GuildHandler.cpp rename to src/server/game/Server/Protocol/Handlers/GuildHandler.cpp diff --git a/src/server/game/Entities/Item/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp similarity index 100% rename from src/server/game/Entities/Item/ItemHandler.cpp rename to src/server/game/Server/Protocol/Handlers/ItemHandler.cpp diff --git a/src/server/game/LookingForGroup/LFGHandler.cpp b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp similarity index 100% rename from src/server/game/LookingForGroup/LFGHandler.cpp rename to src/server/game/Server/Protocol/Handlers/LFGHandler.cpp diff --git a/src/server/game/Loot/LootHandler.cpp b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp similarity index 100% rename from src/server/game/Loot/LootHandler.cpp rename to src/server/game/Server/Protocol/Handlers/LootHandler.cpp diff --git a/src/server/game/Entities/Player/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp similarity index 100% rename from src/server/game/Entities/Player/MiscHandler.cpp rename to src/server/game/Server/Protocol/Handlers/MiscHandler.cpp diff --git a/src/server/game/Movement/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp similarity index 100% rename from src/server/game/Movement/MovementHandler.cpp rename to src/server/game/Server/Protocol/Handlers/MovementHandler.cpp diff --git a/src/server/game/Entities/Creature/NPCHandler.cpp b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp similarity index 100% rename from src/server/game/Entities/Creature/NPCHandler.cpp rename to src/server/game/Server/Protocol/Handlers/NPCHandler.cpp diff --git a/src/server/game/Entities/Creature/NPCHandler.h b/src/server/game/Server/Protocol/Handlers/NPCHandler.h similarity index 100% rename from src/server/game/Entities/Creature/NPCHandler.h rename to src/server/game/Server/Protocol/Handlers/NPCHandler.h diff --git a/src/server/game/Entities/Pet/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp similarity index 100% rename from src/server/game/Entities/Pet/PetHandler.cpp rename to src/server/game/Server/Protocol/Handlers/PetHandler.cpp diff --git a/src/server/game/Entities/Player/PetitionsHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp similarity index 100% rename from src/server/game/Entities/Player/PetitionsHandler.cpp rename to src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp diff --git a/src/server/game/Quests/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp similarity index 100% rename from src/server/game/Quests/QueryHandler.cpp rename to src/server/game/Server/Protocol/Handlers/QueryHandler.cpp diff --git a/src/server/game/Quests/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp similarity index 100% rename from src/server/game/Quests/QuestHandler.cpp rename to src/server/game/Server/Protocol/Handlers/QuestHandler.cpp diff --git a/src/server/game/Skills/SkillHandler.cpp b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp similarity index 100% rename from src/server/game/Skills/SkillHandler.cpp rename to src/server/game/Server/Protocol/Handlers/SkillHandler.cpp diff --git a/src/server/game/Spells/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp similarity index 100% rename from src/server/game/Spells/SpellHandler.cpp rename to src/server/game/Server/Protocol/Handlers/SpellHandler.cpp diff --git a/src/server/game/Movement/TaxiHandler.cpp b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp similarity index 100% rename from src/server/game/Movement/TaxiHandler.cpp rename to src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp diff --git a/src/server/game/Entities/Player/TicketHandler.cpp b/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp similarity index 100% rename from src/server/game/Entities/Player/TicketHandler.cpp rename to src/server/game/Server/Protocol/Handlers/TicketHandler.cpp diff --git a/src/server/game/Entities/Player/TradeHandler.cpp b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp similarity index 100% rename from src/server/game/Entities/Player/TradeHandler.cpp rename to src/server/game/Server/Protocol/Handlers/TradeHandler.cpp diff --git a/src/server/game/Entities/Player/VoiceChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp similarity index 100% rename from src/server/game/Entities/Player/VoiceChatHandler.cpp rename to src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp diff --git a/src/server/game/Opcodes/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp similarity index 100% rename from src/server/game/Opcodes/Opcodes.cpp rename to src/server/game/Server/Protocol/Opcodes.cpp diff --git a/src/server/game/Opcodes/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h similarity index 100% rename from src/server/game/Opcodes/Opcodes.h rename to src/server/game/Server/Protocol/Opcodes.h diff --git a/src/server/game/World/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp similarity index 100% rename from src/server/game/World/WorldLog.cpp rename to src/server/game/Server/Protocol/WorldLog.cpp diff --git a/src/server/game/World/WorldLog.h b/src/server/game/Server/Protocol/WorldLog.h similarity index 100% rename from src/server/game/World/WorldLog.h rename to src/server/game/Server/Protocol/WorldLog.h diff --git a/src/server/game/World/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp similarity index 100% rename from src/server/game/World/WorldSession.cpp rename to src/server/game/Server/WorldSession.cpp diff --git a/src/server/game/World/WorldSession.h b/src/server/game/Server/WorldSession.h similarity index 100% rename from src/server/game/World/WorldSession.h rename to src/server/game/Server/WorldSession.h diff --git a/src/server/game/World/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp similarity index 100% rename from src/server/game/World/WorldSocket.cpp rename to src/server/game/Server/WorldSocket.cpp diff --git a/src/server/game/World/WorldSocket.h b/src/server/game/Server/WorldSocket.h similarity index 100% rename from src/server/game/World/WorldSocket.h rename to src/server/game/Server/WorldSocket.h diff --git a/src/server/game/World/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp similarity index 100% rename from src/server/game/World/WorldSocketMgr.cpp rename to src/server/game/Server/WorldSocketMgr.cpp diff --git a/src/server/game/World/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h similarity index 100% rename from src/server/game/World/WorldSocketMgr.h rename to src/server/game/Server/WorldSocketMgr.h diff --git a/src/server/shared/Config/CMakeLists.txt b/src/server/shared/Configuration/CMakeLists.txt similarity index 100% rename from src/server/shared/Config/CMakeLists.txt rename to src/server/shared/Configuration/CMakeLists.txt diff --git a/src/server/shared/Config/Config.cpp b/src/server/shared/Configuration/Config.cpp similarity index 100% rename from src/server/shared/Config/Config.cpp rename to src/server/shared/Configuration/Config.cpp diff --git a/src/server/shared/Config/Config.h b/src/server/shared/Configuration/Config.h similarity index 100% rename from src/server/shared/Config/Config.h rename to src/server/shared/Configuration/Config.h diff --git a/src/server/shared/Config/ConfigEnv.h b/src/server/shared/Configuration/ConfigEnv.h similarity index 100% rename from src/server/shared/Config/ConfigEnv.h rename to src/server/shared/Configuration/ConfigEnv.h diff --git a/src/server/shared/Config/ConfigLibrary.vcproj b/src/server/shared/Configuration/ConfigLibrary.vcproj similarity index 100% rename from src/server/shared/Config/ConfigLibrary.vcproj rename to src/server/shared/Configuration/ConfigLibrary.vcproj diff --git a/src/server/shared/Config/dotconfpp/dotconfpp.cpp b/src/server/shared/Configuration/dotconfpp/dotconfpp.cpp similarity index 100% rename from src/server/shared/Config/dotconfpp/dotconfpp.cpp rename to src/server/shared/Configuration/dotconfpp/dotconfpp.cpp diff --git a/src/server/shared/Config/dotconfpp/dotconfpp.h b/src/server/shared/Configuration/dotconfpp/dotconfpp.h similarity index 100% rename from src/server/shared/Config/dotconfpp/dotconfpp.h rename to src/server/shared/Configuration/dotconfpp/dotconfpp.h diff --git a/src/server/shared/Config/dotconfpp/mempool.cpp b/src/server/shared/Configuration/dotconfpp/mempool.cpp similarity index 100% rename from src/server/shared/Config/dotconfpp/mempool.cpp rename to src/server/shared/Configuration/dotconfpp/mempool.cpp diff --git a/src/server/shared/Config/dotconfpp/mempool.h b/src/server/shared/Configuration/dotconfpp/mempool.h similarity index 100% rename from src/server/shared/Config/dotconfpp/mempool.h rename to src/server/shared/Configuration/dotconfpp/mempool.h diff --git a/src/server/shared/Auth/SARC4.cpp b/src/server/shared/Cryptography/ARC4.cpp similarity index 100% rename from src/server/shared/Auth/SARC4.cpp rename to src/server/shared/Cryptography/ARC4.cpp diff --git a/src/server/shared/Auth/SARC4.h b/src/server/shared/Cryptography/ARC4.h similarity index 100% rename from src/server/shared/Auth/SARC4.h rename to src/server/shared/Cryptography/ARC4.h diff --git a/src/server/shared/Auth/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp similarity index 100% rename from src/server/shared/Auth/AuthCrypt.cpp rename to src/server/shared/Cryptography/Authentication/AuthCrypt.cpp diff --git a/src/server/shared/Auth/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h similarity index 100% rename from src/server/shared/Auth/AuthCrypt.h rename to src/server/shared/Cryptography/Authentication/AuthCrypt.h diff --git a/src/server/shared/Auth/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp similarity index 100% rename from src/server/shared/Auth/BigNumber.cpp rename to src/server/shared/Cryptography/BigNumber.cpp diff --git a/src/server/shared/Auth/BigNumber.h b/src/server/shared/Cryptography/BigNumber.h similarity index 100% rename from src/server/shared/Auth/BigNumber.h rename to src/server/shared/Cryptography/BigNumber.h diff --git a/src/server/shared/Auth/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt similarity index 100% rename from src/server/shared/Auth/CMakeLists.txt rename to src/server/shared/Cryptography/CMakeLists.txt diff --git a/src/server/shared/Auth/Hmac.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp similarity index 100% rename from src/server/shared/Auth/Hmac.cpp rename to src/server/shared/Cryptography/HMACSHA1.cpp diff --git a/src/server/shared/Auth/Hmac.h b/src/server/shared/Cryptography/HMACSHA1.h similarity index 100% rename from src/server/shared/Auth/Hmac.h rename to src/server/shared/Cryptography/HMACSHA1.h diff --git a/src/server/shared/Auth/md5.c b/src/server/shared/Cryptography/MD5.c similarity index 100% rename from src/server/shared/Auth/md5.c rename to src/server/shared/Cryptography/MD5.c diff --git a/src/server/shared/Auth/md5.h b/src/server/shared/Cryptography/MD5.h similarity index 100% rename from src/server/shared/Auth/md5.h rename to src/server/shared/Cryptography/MD5.h diff --git a/src/server/shared/Auth/Sha1.cpp b/src/server/shared/Cryptography/SHA1.cpp similarity index 100% rename from src/server/shared/Auth/Sha1.cpp rename to src/server/shared/Cryptography/SHA1.cpp diff --git a/src/server/shared/Auth/Sha1.h b/src/server/shared/Cryptography/SHA1.h similarity index 100% rename from src/server/shared/Auth/Sha1.h rename to src/server/shared/Cryptography/SHA1.h diff --git a/src/server/shared/Database/DBCFileLoader.cpp b/src/server/shared/DataStores/DBCFileLoader.cpp similarity index 100% rename from src/server/shared/Database/DBCFileLoader.cpp rename to src/server/shared/DataStores/DBCFileLoader.cpp diff --git a/src/server/shared/Database/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h similarity index 100% rename from src/server/shared/Database/DBCFileLoader.h rename to src/server/shared/DataStores/DBCFileLoader.h diff --git a/src/server/shared/Database/DBCStore.h b/src/server/shared/DataStores/DBCStore.h similarity index 100% rename from src/server/shared/Database/DBCStore.h rename to src/server/shared/DataStores/DBCStore.h diff --git a/src/server/shared/Errors.h b/src/server/shared/Debugging/Errors.h similarity index 100% rename from src/server/shared/Errors.h rename to src/server/shared/Debugging/Errors.h diff --git a/src/server/shared/MemoryLeaks.cpp b/src/server/shared/Debugging/MemoryLeaks.cpp similarity index 100% rename from src/server/shared/MemoryLeaks.cpp rename to src/server/shared/Debugging/MemoryLeaks.cpp diff --git a/src/server/shared/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h similarity index 100% rename from src/server/shared/MemoryLeaks.h rename to src/server/shared/Debugging/MemoryLeaks.h diff --git a/src/server/shared/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp similarity index 100% rename from src/server/shared/WheatyExceptionReport.cpp rename to src/server/shared/Debugging/WheatyExceptionReport.cpp diff --git a/src/server/shared/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h similarity index 100% rename from src/server/shared/WheatyExceptionReport.h rename to src/server/shared/Debugging/WheatyExceptionReport.h diff --git a/src/server/shared/Log.cpp b/src/server/shared/Logging/Log.cpp similarity index 100% rename from src/server/shared/Log.cpp rename to src/server/shared/Logging/Log.cpp diff --git a/src/server/shared/Log.h b/src/server/shared/Logging/Log.h similarity index 100% rename from src/server/shared/Log.h rename to src/server/shared/Logging/Log.h diff --git a/src/server/shared/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h similarity index 100% rename from src/server/shared/ByteBuffer.h rename to src/server/shared/Packets/ByteBuffer.h diff --git a/src/server/shared/WorldPacket.h b/src/server/shared/Packets/WorldPacket.h similarity index 100% rename from src/server/shared/WorldPacket.h rename to src/server/shared/Packets/WorldPacket.h diff --git a/src/server/shared/DelayExecutor.cpp b/src/server/shared/Threading/DelayExecutor.cpp similarity index 100% rename from src/server/shared/DelayExecutor.cpp rename to src/server/shared/Threading/DelayExecutor.cpp diff --git a/src/server/shared/DelayExecutor.h b/src/server/shared/Threading/DelayExecutor.h similarity index 100% rename from src/server/shared/DelayExecutor.h rename to src/server/shared/Threading/DelayExecutor.h diff --git a/src/server/shared/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h similarity index 100% rename from src/server/shared/LockedQueue.h rename to src/server/shared/Threading/LockedQueue.h diff --git a/src/server/shared/Threading.cpp b/src/server/shared/Threading/Threading.cpp similarity index 100% rename from src/server/shared/Threading.cpp rename to src/server/shared/Threading/Threading.cpp diff --git a/src/server/shared/Threading.h b/src/server/shared/Threading/Threading.h similarity index 100% rename from src/server/shared/Threading.h rename to src/server/shared/Threading/Threading.h diff --git a/src/server/shared/ProgressBar.cpp b/src/server/shared/Utilities/ProgressBar.cpp similarity index 100% rename from src/server/shared/ProgressBar.cpp rename to src/server/shared/Utilities/ProgressBar.cpp diff --git a/src/server/shared/ProgressBar.h b/src/server/shared/Utilities/ProgressBar.h similarity index 100% rename from src/server/shared/ProgressBar.h rename to src/server/shared/Utilities/ProgressBar.h diff --git a/src/server/shared/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp similarity index 100% rename from src/server/shared/ServiceWin32.cpp rename to src/server/shared/Utilities/ServiceWin32.cpp diff --git a/src/server/shared/ServiceWin32.h b/src/server/shared/Utilities/ServiceWin32.h similarity index 100% rename from src/server/shared/ServiceWin32.h rename to src/server/shared/Utilities/ServiceWin32.h diff --git a/src/server/shared/SignalHandler.h b/src/server/shared/Utilities/SignalHandler.h similarity index 100% rename from src/server/shared/SignalHandler.h rename to src/server/shared/Utilities/SignalHandler.h diff --git a/src/server/shared/Timer.h b/src/server/shared/Utilities/Timer.h similarity index 100% rename from src/server/shared/Timer.h rename to src/server/shared/Utilities/Timer.h diff --git a/src/server/shared/Util.cpp b/src/server/shared/Utilities/Util.cpp similarity index 100% rename from src/server/shared/Util.cpp rename to src/server/shared/Utilities/Util.cpp diff --git a/src/server/shared/Util.h b/src/server/shared/Utilities/Util.h similarity index 100% rename from src/server/shared/Util.h rename to src/server/shared/Utilities/Util.h diff --git a/src/server/worldserver/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp similarity index 100% rename from src/server/worldserver/CliRunnable.cpp rename to src/server/worldserver/CommandLine/CliRunnable.cpp diff --git a/src/server/worldserver/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h similarity index 100% rename from src/server/worldserver/CliRunnable.h rename to src/server/worldserver/CommandLine/CliRunnable.h diff --git a/src/server/worldserver/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp similarity index 100% rename from src/server/worldserver/RASocket.cpp rename to src/server/worldserver/RemoteAccess/RASocket.cpp diff --git a/src/server/worldserver/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h similarity index 100% rename from src/server/worldserver/RASocket.h rename to src/server/worldserver/RemoteAccess/RASocket.h diff --git a/src/server/worldserver/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp similarity index 100% rename from src/server/worldserver/WorldRunnable.cpp rename to src/server/worldserver/WorldThread/WorldRunnable.cpp diff --git a/src/server/worldserver/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h similarity index 100% rename from src/server/worldserver/WorldRunnable.h rename to src/server/worldserver/WorldThread/WorldRunnable.h