diff --git a/src/server/trinityrealm/AuthCodes.cpp b/src/server/authserver/AuthCodes.cpp
similarity index 100%
rename from src/server/trinityrealm/AuthCodes.cpp
rename to src/server/authserver/AuthCodes.cpp
diff --git a/src/server/trinityrealm/AuthCodes.h b/src/server/authserver/AuthCodes.h
similarity index 100%
rename from src/server/trinityrealm/AuthCodes.h
rename to src/server/authserver/AuthCodes.h
diff --git a/src/server/trinityrealm/AuthSocket.cpp b/src/server/authserver/AuthSocket.cpp
similarity index 100%
rename from src/server/trinityrealm/AuthSocket.cpp
rename to src/server/authserver/AuthSocket.cpp
diff --git a/src/server/trinityrealm/AuthSocket.h b/src/server/authserver/AuthSocket.h
similarity index 100%
rename from src/server/trinityrealm/AuthSocket.h
rename to src/server/authserver/AuthSocket.h
diff --git a/src/server/trinityrealm/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
similarity index 100%
rename from src/server/trinityrealm/CMakeLists.txt
rename to src/server/authserver/CMakeLists.txt
diff --git a/src/server/trinityrealm/Main.cpp b/src/server/authserver/Main.cpp
similarity index 100%
rename from src/server/trinityrealm/Main.cpp
rename to src/server/authserver/Main.cpp
diff --git a/src/server/trinityrealm/RealmAcceptor.h b/src/server/authserver/RealmAcceptor.h
similarity index 100%
rename from src/server/trinityrealm/RealmAcceptor.h
rename to src/server/authserver/RealmAcceptor.h
diff --git a/src/server/trinityrealm/RealmList.cpp b/src/server/authserver/RealmList.cpp
similarity index 100%
rename from src/server/trinityrealm/RealmList.cpp
rename to src/server/authserver/RealmList.cpp
diff --git a/src/server/trinityrealm/RealmList.h b/src/server/authserver/RealmList.h
similarity index 100%
rename from src/server/trinityrealm/RealmList.h
rename to src/server/authserver/RealmList.h
diff --git a/src/server/trinityrealm/RealmSocket.cpp b/src/server/authserver/RealmSocket.cpp
similarity index 100%
rename from src/server/trinityrealm/RealmSocket.cpp
rename to src/server/authserver/RealmSocket.cpp
diff --git a/src/server/trinityrealm/RealmSocket.h b/src/server/authserver/RealmSocket.h
similarity index 100%
rename from src/server/trinityrealm/RealmSocket.h
rename to src/server/authserver/RealmSocket.h
diff --git a/src/server/trinityrealm/TrinityRealm.ico b/src/server/authserver/TrinityRealm.ico
similarity index 100%
rename from src/server/trinityrealm/TrinityRealm.ico
rename to src/server/authserver/TrinityRealm.ico
diff --git a/src/server/trinityrealm/TrinityRealm.rc b/src/server/authserver/TrinityRealm.rc
similarity index 100%
rename from src/server/trinityrealm/TrinityRealm.rc
rename to src/server/authserver/TrinityRealm.rc
diff --git a/src/server/trinitycore/resource.h b/src/server/authserver/resource.h
similarity index 100%
rename from src/server/trinitycore/resource.h
rename to src/server/authserver/resource.h
diff --git a/src/server/trinityrealm/trinityrealm.conf.dist b/src/server/authserver/trinityrealm.conf.dist
similarity index 100%
rename from src/server/trinityrealm/trinityrealm.conf.dist
rename to src/server/authserver/trinityrealm.conf.dist
diff --git a/src/server/trinitycore/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
similarity index 100%
rename from src/server/trinitycore/CMakeLists.txt
rename to src/server/worldserver/CMakeLists.txt
diff --git a/src/server/trinitycore/CliRunnable.cpp b/src/server/worldserver/CliRunnable.cpp
similarity index 100%
rename from src/server/trinitycore/CliRunnable.cpp
rename to src/server/worldserver/CliRunnable.cpp
diff --git a/src/server/trinitycore/CliRunnable.h b/src/server/worldserver/CliRunnable.h
similarity index 100%
rename from src/server/trinitycore/CliRunnable.h
rename to src/server/worldserver/CliRunnable.h
diff --git a/src/server/trinitycore/Main.cpp b/src/server/worldserver/Main.cpp
similarity index 100%
rename from src/server/trinitycore/Main.cpp
rename to src/server/worldserver/Main.cpp
diff --git a/src/server/trinitycore/Master.cpp b/src/server/worldserver/Master.cpp
similarity index 100%
rename from src/server/trinitycore/Master.cpp
rename to src/server/worldserver/Master.cpp
diff --git a/src/server/trinitycore/Master.h b/src/server/worldserver/Master.h
similarity index 100%
rename from src/server/trinitycore/Master.h
rename to src/server/worldserver/Master.h
diff --git a/src/server/trinitycore/RASocket.cpp b/src/server/worldserver/RASocket.cpp
similarity index 100%
rename from src/server/trinitycore/RASocket.cpp
rename to src/server/worldserver/RASocket.cpp
diff --git a/src/server/trinitycore/RASocket.h b/src/server/worldserver/RASocket.h
similarity index 100%
rename from src/server/trinitycore/RASocket.h
rename to src/server/worldserver/RASocket.h
diff --git a/src/server/trinitycore/TrinityCore.ico b/src/server/worldserver/TrinityCore.ico
similarity index 100%
rename from src/server/trinitycore/TrinityCore.ico
rename to src/server/worldserver/TrinityCore.ico
diff --git a/src/server/trinitycore/TrinityCore.rc b/src/server/worldserver/TrinityCore.rc
similarity index 100%
rename from src/server/trinitycore/TrinityCore.rc
rename to src/server/worldserver/TrinityCore.rc
diff --git a/src/server/trinitycore/WorldRunnable.cpp b/src/server/worldserver/WorldRunnable.cpp
similarity index 100%
rename from src/server/trinitycore/WorldRunnable.cpp
rename to src/server/worldserver/WorldRunnable.cpp
diff --git a/src/server/trinitycore/WorldRunnable.h b/src/server/worldserver/WorldRunnable.h
similarity index 100%
rename from src/server/trinitycore/WorldRunnable.h
rename to src/server/worldserver/WorldRunnable.h
diff --git a/src/server/trinityrealm/resource.h b/src/server/worldserver/resource.h
similarity index 100%
rename from src/server/trinityrealm/resource.h
rename to src/server/worldserver/resource.h
diff --git a/src/server/trinitycore/trinitycore.conf.dist b/src/server/worldserver/trinitycore.conf.dist
similarity index 100%
rename from src/server/trinitycore/trinitycore.conf.dist
rename to src/server/worldserver/trinitycore.conf.dist