7 files changed, 100 insertions, 96 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 236c7f72277..28147294e1d 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -43,8 +43,8 @@
 #include "SocialMgr.h"
 #include "World.h"
 #include "WorldSession.h"
-#include "club_listener.pb.h"
-#include "club_membership_listener.pb.h"
+#include "api/client/v1/club_listener.pb.h"
+#include "api/client/v1/club_membership_listener.pb.h"
 
 size_t const MAX_GUILD_BANK_TAB_TEXT_LEN = 500;
 
@@ -1203,7 +1203,7 @@ void Guild::Disband()
     guildEventDisbanded.Write();
 
     // Notify the members of club removal.
-    club::v1::UnsubscribeNotification unsubscribeNotification;
+    club::v1::client::UnsubscribeNotification unsubscribeNotification;
     unsubscribeNotification.set_club_id(GetId());
 
     BroadcastWorker([&](Player const* member)
@@ -1211,14 +1211,14 @@ void Guild::Disband()
         member->SendDirectMessage(guildEventDisbanded.GetRawPacket());
 
         // Unsubscribe the removed player from the club to ensure interface updates.
-        Battlenet::WorldserverService<club::v1::ClubListener>(member->GetSession()).OnUnsubscribe(&unsubscribeNotification, true, true);
+        Battlenet::WorldserverService<club::v1::client::ClubListener>(member->GetSession()).OnUnsubscribe(&unsubscribeNotification, true, true);
 
         // Finally notify the client about leaving the club.
-        club::v1::membership::ClubRemovedNotification clubRemovedNotification;
+        club_membership::v1::client::ClubRemovedNotification clubRemovedNotification;
         clubRemovedNotification.set_allocated_member_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(member->GetGUID()).release());
         clubRemovedNotification.set_club_id(GetId());
-        clubRemovedNotification.set_reason(club::v1::ClubRemovedReason::CLUB_REMOVED_REASON_DESTROYED_BY_MEMBER);
-        Battlenet::WorldserverService<club::v1::membership::ClubMembershipListener>(member->GetSession()).OnClubRemoved(&clubRemovedNotification, true, true);
+        clubRemovedNotification.set_reason(club::v1::client::ClubRemovedReason::CLUB_REMOVED_REASON_DESTROYED_BY_MEMBER);
+        Battlenet::WorldserverService<club_membership::v1::client::ClubMembershipListener>(member->GetSession()).OnClubRemoved(&clubRemovedNotification, true, true);
     });
 
     CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction();
@@ -2376,7 +2376,7 @@ void Guild::SendEventNewLeader(Member* newLeader, Member* oldLeader, bool isSelf
     WorldPackets::Guild::GuildEventNewLeader eventPacket;
     eventPacket.SelfPromoted = isSelfPromoted;
 
-    club::v1::MemberRoleChangedNotification memberRoleChangeNotification;
+    club::v1::client::MemberRoleChangedNotification memberRoleChangeNotification;
     memberRoleChangeNotification.set_club_id(GetId());
 
     if (newLeader)
@@ -2386,7 +2386,7 @@ void Guild::SendEventNewLeader(Member* newLeader, Member* oldLeader, bool isSelf
         eventPacket.NewLeaderVirtualRealmAddress = GetVirtualRealmAddress();
 
         // Owner/GuildMaster role is always 1.
-        club::v1::RoleAssignment* newLeaderRoleAssignment = memberRoleChangeNotification.add_assignment();
+        club::v1::client::RoleAssignment* newLeaderRoleAssignment = memberRoleChangeNotification.add_assignment();
         newLeaderRoleAssignment->set_allocated_member_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(newLeader->GetGUID()).release());
         newLeaderRoleAssignment->add_role(AsUnderlyingType(ClubRoleIdentifier::Owner));
     }
@@ -2398,7 +2398,7 @@ void Guild::SendEventNewLeader(Member* newLeader, Member* oldLeader, bool isSelf
         eventPacket.OldLeaderVirtualRealmAddress = GetVirtualRealmAddress();
 
         // Non owner members in guilds get the lowest club/community role after a guild master change.
-        club::v1::RoleAssignment* oldLeaderRoleAssignment = memberRoleChangeNotification.add_assignment();
+        club::v1::client::RoleAssignment* oldLeaderRoleAssignment = memberRoleChangeNotification.add_assignment();
         oldLeaderRoleAssignment->set_allocated_member_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(oldLeader->GetGUID()).release());
         oldLeaderRoleAssignment->add_role(AsUnderlyingType(ClubRoleIdentifier::Member));
     }
@@ -2409,7 +2409,7 @@ void Guild::SendEventNewLeader(Member* newLeader, Member* oldLeader, bool isSelf
     BroadcastWorker([&](Player const* member)
     {
         member->SendDirectMessage(eventPacket.GetRawPacket());
-        Battlenet::WorldserverService<club::v1::ClubListener>(member->GetSession()).OnMemberRoleChanged(&memberRoleChangeNotification, true, true);
+        Battlenet::WorldserverService<club::v1::client::ClubListener>(member->GetSession()).OnMemberRoleChanged(&memberRoleChangeNotification, true, true);
     });
 }
 
@@ -2438,35 +2438,35 @@ void Guild::SendEventPlayerLeft(Member* leaver, Member* remover, bool isRemoved)
         leaverPlayer->SendDirectMessage(eventPacket.GetRawPacket());
 
         // Unsubscribe the removed player from the club to ensure interface updates.
-        club::v1::UnsubscribeNotification unsubscribeNotification;
+        club::v1::client::UnsubscribeNotification unsubscribeNotification;
         unsubscribeNotification.set_club_id(GetId());
-        Battlenet::WorldserverService<club::v1::ClubListener>(leaverPlayer->GetSession()).OnUnsubscribe(&unsubscribeNotification, true, true);
+        Battlenet::WorldserverService<club::v1::client::ClubListener>(leaverPlayer->GetSession()).OnUnsubscribe(&unsubscribeNotification, true, true);
 
         // Finally notify the client about leaving the club.
-        club::v1::membership::ClubRemovedNotification clubRemovedNotification;
+        club_membership::v1::client::ClubRemovedNotification clubRemovedNotification;
         clubRemovedNotification.set_club_id(GetId());
         clubRemovedNotification.set_reason(isRemoved
-            ? club::v1::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_KICKED
-            : club::v1::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_LEFT);
+            ? club::v1::client::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_KICKED
+            : club::v1::client::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_LEFT);
         clubRemovedNotification.set_allocated_member_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(leaver->GetGUID()).release());
-        Battlenet::WorldserverService<club::v1::membership::ClubMembershipListener>(leaverPlayer->GetSession()).OnClubRemoved(&clubRemovedNotification, true, true);
+        Battlenet::WorldserverService<club_membership::v1::client::ClubMembershipListener>(leaverPlayer->GetSession()).OnClubRemoved(&clubRemovedNotification, true, true);
     }
 
-    club::v1::MemberRemovedNotification memberRemovedNotification;
+    club::v1::client::MemberRemovedNotification memberRemovedNotification;
     memberRemovedNotification.set_club_id(GetId());
 
-    club::v1::MemberRemovedAssignment* removedMemberAssignment = memberRemovedNotification.add_member();
+    club::v1::client::MemberRemovedAssignment* removedMemberAssignment = memberRemovedNotification.add_member();
     removedMemberAssignment->set_allocated_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(leaver->GetGUID()).release());
     removedMemberAssignment->set_reason(isRemoved
-        ? club::v1::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_KICKED
-        : club::v1::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_LEFT);
+        ? club::v1::client::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_KICKED
+        : club::v1::client::ClubRemovedReason::CLUB_REMOVED_REASON_MEMBER_LEFT);
 
     // We have to send old guild and new club packets so we use a custom broadcast loop here.
     BroadcastWorker([&](Player const* member)
     {
         // Notify other guild members.
         member->SendDirectMessage(eventPacket.GetRawPacket());
-        Battlenet::WorldserverService<::bgs::protocol::club::v1::ClubListener>(member->GetSession()).OnMemberRemoved(&memberRemovedNotification, true, true);
+        Battlenet::WorldserverService<club::v1::client::ClubListener>(member->GetSession()).OnMemberRemoved(&memberRemovedNotification, true, true);
     }, leaverPlayer);
 }
 
@@ -2900,7 +2900,7 @@ bool Guild::AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, Optio
     {
         player->SendDirectMessage(joinNotificationPacket.GetRawPacket());
 
-        club::v1::membership::ClubAddedNotification clubAddedNotification;
+        club_membership::v1::client::ClubAddedNotification clubAddedNotification;
         clubAddedNotification.mutable_membership()->set_allocated_member_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(guid).release());
 
         club::v1::ClubDescription* guildClub = clubAddedNotification.mutable_membership()->mutable_club();
@@ -2912,7 +2912,7 @@ bool Guild::AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, Optio
         guildClub->set_member_count(GetMembersCount());
 
         // Set the club owner, guild master in this case.
-        club::v1::MemberDescription* guildLeaderDescription = guildClub->add_leader();
+        club::v1::client::MemberDescription* guildLeaderDescription = guildClub->add_leader();
         guildLeaderDescription->set_allocated_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(GetLeaderGUID()).release());
 
         // Date is in microseconds.
@@ -2921,20 +2921,20 @@ bool Guild::AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, Optio
         guildClub->set_timezone("");
         guildClub->set_locale("");
 
-        Battlenet::WorldserverService<club::v1::membership::ClubMembershipListener>(player->GetSession()).OnClubAdded(&clubAddedNotification, true, true);
+        Battlenet::WorldserverService<club_membership::v1::client::ClubMembershipListener>(player->GetSession()).OnClubAdded(&clubAddedNotification, true, true);
     }
 
-    club::v1::MemberAddedNotification memberAddedNotification;
+    club::v1::client::MemberAddedNotification memberAddedNotification;
     memberAddedNotification.set_club_id(GetId());
 
-    club::v1::Member* addedMember = memberAddedNotification.add_member();
+    club::v1::client::Member* addedMember = memberAddedNotification.add_member();
     addedMember->set_allocated_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(guid).release());
     if (HasAnyRankRight(member.GetRankId(), GuildRankRights(GR_RIGHT_OFFCHATLISTEN | GR_RIGHT_OFFCHATSPEAK)))
         addedMember->add_role(AsUnderlyingType(ClubRoleIdentifier::Moderator));
     else
         addedMember->add_role(AsUnderlyingType(ClubRoleIdentifier::Member));
-    addedMember->set_presence_level(club::v1::PresenceLevel::PRESENCE_LEVEL_RICH);
-    addedMember->set_whisper_level(club::v1::WhisperLevel::WHISPER_LEVEL_OPEN);
+    addedMember->set_presence_level(club::v1::client::PresenceLevel::PRESENCE_LEVEL_RICH);
+    addedMember->set_whisper_level(club::v1::client::WhisperLevel::WHISPER_LEVEL_OPEN);
     addedMember->set_note("");
     addedMember->set_active(member.IsOnline());
 
@@ -2943,7 +2943,7 @@ bool Guild::AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, Optio
     {
         // Notify other online guild members.
         otherMember->SendDirectMessage(joinNotificationPacket.GetRawPacket());
-        Battlenet::WorldserverService<club::v1::ClubListener>(otherMember->GetSession()).OnMemberAdded(&memberAddedNotification, true, true);
+        Battlenet::WorldserverService<club::v1::client::ClubListener>(otherMember->GetSession()).OnMemberAdded(&memberAddedNotification, true, true);
     }, player);
 
     // Call scripts if member was succesfully added (and stored to database)
@@ -3717,10 +3717,10 @@ void Guild::SendGuildRanksUpdate(ObjectGuid setterGuid, ObjectGuid targetGuid, G
     rankChange.Promote = (rank < member->GetRankId());
     rankChange.Write();
 
-    club::v1::MemberRoleChangedNotification memberRoleChangeNotification;
+    club::v1::client::MemberRoleChangedNotification memberRoleChangeNotification;
     memberRoleChangeNotification.set_club_id(GetId());
 
-    club::v1::RoleAssignment* changedRoleAssignment = memberRoleChangeNotification.add_assignment();
+    club::v1::client::RoleAssignment* changedRoleAssignment = memberRoleChangeNotification.add_assignment();
     changedRoleAssignment->set_allocated_member_id(Battlenet::Services::ClubMembershipService::CreateClubMemberId(targetGuid).release());
     if (rank == GuildRankId::GuildMaster)
         changedRoleAssignment->add_role(AsUnderlyingType(ClubRoleIdentifier::Owner));
@@ -3732,7 +3732,7 @@ void Guild::SendGuildRanksUpdate(ObjectGuid setterGuid, ObjectGuid targetGuid, G
     BroadcastWorker([&](Player const* memberPlayer)
     {
         memberPlayer->SendDirectMessage(rankChange.GetRawPacket());
-        Battlenet::WorldserverService<club::v1::ClubListener>(memberPlayer->GetSession()).OnMemberRoleChanged(&memberRoleChangeNotification, true, true);
+        Battlenet::WorldserverService<club::v1::client::ClubListener>(memberPlayer->GetSession()).OnMemberRoleChanged(&memberRoleChangeNotification, true, true);
     });
 
     CharacterDatabaseTransaction trans;
diff --git a/src/server/game/Services/ClubMembershipService.cpp b/src/server/game/Services/ClubMembershipService.cpp
index 419d56f29ef..1d4bf487380 100644
--- a/src/server/game/Services/ClubMembershipService.cpp
+++ b/src/server/game/Services/ClubMembershipService.cpp
@@ -27,7 +27,7 @@ namespace Battlenet::Services
 {
 ClubMembershipService::ClubMembershipService(WorldSession* session) : BaseService(session) { }
 
-uint32 ClubMembershipService::HandleSubscribe(club::v1::membership::SubscribeRequest const* /*request*/, club::v1::membership::SubscribeResponse* response,
+uint32 ClubMembershipService::HandleSubscribe(club_membership::v1::client::SubscribeRequest const* /*request*/, club_membership::v1::client::SubscribeResponse* response,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     Player const* player = _session->GetPlayer();
@@ -40,7 +40,7 @@ uint32 ClubMembershipService::HandleSubscribe(club::v1::membership::SubscribeReq
     if (!guild)
         return ERROR_OK;
 
-    club::v1::ClubMembershipDescription* description = response->mutable_state()->add_description();
+    club_membership::v1::client::ClubMembershipDescription* description = response->mutable_state()->add_description();
     description->set_allocated_member_id(CreateClubMemberId(player->GetGUID()).release());
 
     club::v1::ClubDescription* club = description->mutable_club();
@@ -57,7 +57,7 @@ uint32 ClubMembershipService::HandleSubscribe(club::v1::membership::SubscribeReq
     club->set_timezone("");
     club->set_locale("");
 
-    club::v1::MemberDescription* leader = club->add_leader();
+    club::v1::client::MemberDescription* leader = club->add_leader();
 
     leader->set_allocated_id(CreateClubMemberId(guild->GetLeaderGUID()).release());
 
@@ -67,7 +67,7 @@ uint32 ClubMembershipService::HandleSubscribe(club::v1::membership::SubscribeReq
     return ERROR_OK;
 }
 
-uint32 ClubMembershipService::HandleUnsubscribe(club::v1::membership::UnsubscribeRequest const* /*request*/, NoData* /*response*/,
+uint32 ClubMembershipService::HandleUnsubscribe(club_membership::v1::client::UnsubscribeRequest const* /*request*/, NoData* /*response*/,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     // We just have to signal the client that the unsubscribe request came through.
@@ -77,7 +77,7 @@ uint32 ClubMembershipService::HandleUnsubscribe(club::v1::membership::Unsubscrib
 std::unique_ptr<club::v1::MemberId> ClubMembershipService::CreateClubMemberId(ObjectGuid guid)
 {
     std::unique_ptr<club::v1::MemberId> id = std::make_unique<club::v1::MemberId>();
-    id->mutable_account_id()->set_id(sCharacterCache->GetCharacterAccountIdByGuid(guid));
+    id->set_account_id(sCharacterCache->GetCharacterAccountIdByGuid(guid));
     id->set_unique_id(Clubs::CreateClubMemberId(guid));
     return id;
 }
diff --git a/src/server/game/Services/ClubMembershipService.h b/src/server/game/Services/ClubMembershipService.h
index f914f8e25cd..bdc5027aed5 100644
--- a/src/server/game/Services/ClubMembershipService.h
+++ b/src/server/game/Services/ClubMembershipService.h
@@ -19,19 +19,19 @@
 #define ClubMembershipService_h__
 
 #include "WorldserverService.h"
-#include "club_membership_service.pb.h"
+#include "api/client/v1/club_membership_service.pb.h"
 
 namespace Battlenet::Services
 {
-class ClubMembershipService : public WorldserverService<club::v1::membership::ClubMembershipService>
+class ClubMembershipService : public WorldserverService<club_membership::v1::client::ClubMembershipService>
 {
-    typedef WorldserverService<club::v1::membership::ClubMembershipService> BaseService;
+    typedef WorldserverService<club_membership::v1::client::ClubMembershipService> BaseService;
 
 public:
     ClubMembershipService(WorldSession* session);
 
-    uint32 HandleSubscribe(club::v1::membership::SubscribeRequest const* request, club::v1::membership::SubscribeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleUnsubscribe(club::v1::membership::UnsubscribeRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleSubscribe(club_membership::v1::client::SubscribeRequest const* request, club_membership::v1::client::SubscribeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleUnsubscribe(club_membership::v1::client::UnsubscribeRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
 
     static std::unique_ptr<club::v1::MemberId> CreateClubMemberId(ObjectGuid guid);
 };
diff --git a/src/server/game/Services/ClubService.cpp b/src/server/game/Services/ClubService.cpp
index 4b4156a7513..0beb13ed6ba 100644
--- a/src/server/game/Services/ClubService.cpp
+++ b/src/server/game/Services/ClubService.cpp
@@ -22,13 +22,13 @@
 #include "Guild.h"
 #include "Player.h"
 #include "SocialMgr.h"
-#include "club_listener.pb.h"
+#include "api/client/v1/club_listener.pb.h"
 
 namespace Battlenet::Services
 {
 ClubService::ClubService(WorldSession* session) : BaseService(session) { }
 
-uint32 ClubService::HandleGetClubType(club::v1::GetClubTypeRequest const* request, club::v1::GetClubTypeResponse* response,
+uint32 ClubService::HandleGetClubType(club::v1::client::GetClubTypeRequest const* request, club::v1::client::GetClubTypeResponse* response,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     // We only support guilds for now.
@@ -41,7 +41,7 @@ uint32 ClubService::HandleGetClubType(club::v1::GetClubTypeRequest const* reques
     return ERROR_NOT_IMPLEMENTED;
 }
 
-uint32 ClubService::HandleSubscribe(club::v1::SubscribeRequest const* /*request*/, NoData* /*response*/,
+uint32 ClubService::HandleSubscribe(club::v1::client::SubscribeRequest const* /*request*/, NoData* /*response*/,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     Player const* player = _session->GetPlayer();
@@ -55,7 +55,7 @@ uint32 ClubService::HandleSubscribe(club::v1::SubscribeRequest const* /*request*
         return ERROR_CLUB_NO_CLUB;
 
     // Subscibe the client to it's own guild club.
-    club::v1::SubscribeNotification subscribeNotification;
+    club::v1::client::SubscribeNotification subscribeNotification;
 
     Guild::Member const* guildMember = guild->GetMember(player->GetGUID());
 
@@ -70,7 +70,7 @@ uint32 ClubService::HandleSubscribe(club::v1::SubscribeRequest const* /*request*
     subscribeNotification.set_club_id(guild->GetId());
     subscribeNotification.set_allocated_agent_id(ClubMembershipService::CreateClubMemberId(player->GetGUID()).release());
 
-    club::v1::Club* guildClub = subscribeNotification.mutable_club();
+    club::v1::client::Club* guildClub = subscribeNotification.mutable_club();
 
     guildClub->set_id(guild->GetId());
     guildClub->set_allocated_type(CreateGuildClubType().release());
@@ -83,12 +83,12 @@ uint32 ClubService::HandleSubscribe(club::v1::SubscribeRequest const* /*request*
     guildClub->set_member_count(guild->GetMembersCount());
 
     // Set the club leader, guild master in this case.
-    club::v1::MemberDescription* guildLeaderDescription = guildClub->add_leader();
+    club::v1::client::MemberDescription* guildLeaderDescription = guildClub->add_leader();
 
-    guildLeaderDescription->mutable_id()->mutable_account_id()->set_id(guildLeader->GetAccountId());
+    guildLeaderDescription->mutable_id()->set_account_id(guildLeader->GetAccountId());
     guildLeaderDescription->mutable_id()->set_unique_id(guildLeader->GetGUID().GetCounter());
 
-    club::v1::Member* subscriber = subscribeNotification.mutable_member();
+    club::v1::client::Member* subscriber = subscribeNotification.mutable_member();
 
     // The member sending the notification data.
     subscriber->set_allocated_id(ClubMembershipService::CreateClubMemberId(player->GetGUID()).release());
@@ -103,32 +103,32 @@ uint32 ClubService::HandleSubscribe(club::v1::SubscribeRequest const* /*request*
     else
         subscriber->add_role(AsUnderlyingType(ClubRoleIdentifier::Member));
 
-    subscriber->set_presence_level(club::v1::PRESENCE_LEVEL_RICH);
-    subscriber->set_whisper_level(club::v1::WHISPER_LEVEL_OPEN);
+    subscriber->set_presence_level(club::v1::client::PRESENCE_LEVEL_RICH);
+    subscriber->set_whisper_level(club::v1::client::WHISPER_LEVEL_OPEN);
 
     // Member is online and active.
     subscriber->set_active(true);
 
-    WorldserverService<club::v1::ClubListener>(_session).OnSubscribe(&subscribeNotification, true, true);
+    WorldserverService<club::v1::client::ClubListener>(_session).OnSubscribe(&subscribeNotification, true, true);
 
     // Notify the client about the changed club state.
-    club::v1::SubscriberStateChangedNotification subscriberStateChangedNotification;
+    club::v1::client::SubscriberStateChangedNotification subscriberStateChangedNotification;
 
     subscriberStateChangedNotification.set_club_id(guild->GetId());
 
-    club::v1::SubscriberStateAssignment* assignment = subscriberStateChangedNotification.add_assignment();
+    club::v1::client::SubscriberStateAssignment* assignment = subscriberStateChangedNotification.add_assignment();
 
     assignment->set_allocated_member_id(ClubMembershipService::CreateClubMemberId(player->GetGUID()).release());
 
     // Member is online and active.
     assignment->set_active(true);
 
-    WorldserverService<club::v1::ClubListener>(_session).OnSubscriberStateChanged(&subscriberStateChangedNotification, true, true);
+    WorldserverService<club::v1::client::ClubListener>(_session).OnSubscriberStateChanged(&subscriberStateChangedNotification, true, true);
 
     return ERROR_OK;
 }
 
-uint32 ClubService::HandleGetMembers(club::v1::GetMembersRequest const* /*request*/, club::v1::GetMembersResponse* response,
+uint32 ClubService::HandleGetMembers(club::v1::client::GetMembersRequest const* /*request*/, club::v1::client::GetMembersResponse* response,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     Player const* player = _session->GetPlayer();
@@ -145,7 +145,7 @@ uint32 ClubService::HandleGetMembers(club::v1::GetMembersRequest const* /*reques
 
     for (auto const& [guid, member] : guild->GetMembers())
     {
-        club::v1::Member* clubMember = response->add_member();
+        club::v1::client::Member* clubMember = response->add_member();
 
         clubMember->set_allocated_id(ClubMembershipService::CreateClubMemberId(guid).release());
 
@@ -158,8 +158,8 @@ uint32 ClubService::HandleGetMembers(club::v1::GetMembersRequest const* /*reques
         else
             clubMember->add_role(AsUnderlyingType(ClubRoleIdentifier::Member));
 
-        clubMember->set_presence_level(club::v1::PresenceLevel::PRESENCE_LEVEL_RICH);
-        clubMember->set_whisper_level(club::v1::WhisperLevel::WHISPER_LEVEL_OPEN);
+        clubMember->set_presence_level(club::v1::client::PresenceLevel::PRESENCE_LEVEL_RICH);
+        clubMember->set_whisper_level(club::v1::client::WhisperLevel::WHISPER_LEVEL_OPEN);
         clubMember->set_note(member.GetPublicNote());
         clubMember->set_active(member.IsOnline());
     }
@@ -167,7 +167,7 @@ uint32 ClubService::HandleGetMembers(club::v1::GetMembersRequest const* /*reques
     return ERROR_OK;
 }
 
-uint32 ClubService::HandleGetStreams(club::v1::GetStreamsRequest const* /*request*/, club::v1::GetStreamsResponse* response,
+uint32 ClubService::HandleGetStreams(club::v1::client::GetStreamsRequest const* /*request*/, club::v1::client::GetStreamsResponse* response,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     Player const* player = _session->GetPlayer();
@@ -181,7 +181,7 @@ uint32 ClubService::HandleGetStreams(club::v1::GetStreamsRequest const* /*reques
         return ERROR_CLUB_NO_CLUB;
 
     // General guild channel.
-    club::v1::Stream* generalGuildChannelStream = response->add_stream();
+    club::v1::client::Stream* generalGuildChannelStream = response->add_stream();
 
     generalGuildChannelStream->set_club_id(guild->GetId());
     generalGuildChannelStream->set_id(AsUnderlyingType(ClubStreamType::Guild));
@@ -202,10 +202,10 @@ uint32 ClubService::HandleGetStreams(club::v1::GetStreamsRequest const* /*reques
     generalGuildChannelStream->mutable_access()->add_role(AsUnderlyingType(ClubRoleIdentifier::Member));
 
     // No voice support.
-    generalGuildChannelStream->set_voice_level(club::v1::StreamVoiceLevel::VOICE_LEVEL_DISABLED);
+    generalGuildChannelStream->set_voice_level(club::v1::client::StreamVoiceLevel::VOICE_LEVEL_DISABLED);
 
     // Officer guild channel.
-    club::v1::Stream* officerGuildChannelStream = response->add_stream();
+    club::v1::client::Stream* officerGuildChannelStream = response->add_stream();
 
     officerGuildChannelStream->set_club_id(guild->GetId());
     officerGuildChannelStream->set_id(AsUnderlyingType(ClubStreamType::Officer));
@@ -225,15 +225,15 @@ uint32 ClubService::HandleGetStreams(club::v1::GetStreamsRequest const* /*reques
     officerGuildChannelStream->mutable_access()->add_role(AsUnderlyingType(ClubRoleIdentifier::Moderator));
 
     // No voice support.
-    officerGuildChannelStream->set_voice_level(club::v1::StreamVoiceLevel::VOICE_LEVEL_DISABLED);
+    officerGuildChannelStream->set_voice_level(club::v1::client::StreamVoiceLevel::VOICE_LEVEL_DISABLED);
 
     // Enable channel view
-    club::v1::StreamView* generalView = response->add_view();
+    club::v1::client::StreamView* generalView = response->add_view();
 
     generalView->set_club_id(guild->GetId());
     generalView->set_stream_id(AsUnderlyingType(ClubStreamType::Guild));
 
-    club::v1::StreamView* officerView = response->add_view();
+    club::v1::client::StreamView* officerView = response->add_view();
 
     officerView->set_club_id(guild->GetId());
     officerView->set_stream_id(AsUnderlyingType(ClubStreamType::Officer));
@@ -241,7 +241,7 @@ uint32 ClubService::HandleGetStreams(club::v1::GetStreamsRequest const* /*reques
     return ERROR_OK;
 }
 
-uint32 ClubService::HandleSubscribeStream(club::v1::SubscribeStreamRequest const* request, NoData* /*response*/,
+uint32 ClubService::HandleSubscribeStream(club::v1::client::SubscribeStreamRequest const* request, NoData* /*response*/,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     Player const* player = _session->GetPlayer();
@@ -262,14 +262,14 @@ uint32 ClubService::HandleSubscribeStream(club::v1::SubscribeStreamRequest const
     return ERROR_OK;
 }
 
-uint32 ClubService::HandleUnsubscribeStream(club::v1::UnsubscribeStreamRequest const* /*request*/, NoData* /*response*/,
+uint32 ClubService::HandleUnsubscribeStream(club::v1::client::UnsubscribeStreamRequest const* /*request*/, NoData* /*response*/,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     // We just have to signal the client that the unsubscribe request came through.
     return ERROR_OK;
 }
 
-uint32 ClubService::HandleSetStreamFocus(club::v1::SetStreamFocusRequest const* /*request*/, NoData* /*response*/,
+uint32 ClubService::HandleSetStreamFocus(club::v1::client::SetStreamFocusRequest const* /*request*/, NoData* /*response*/,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     Player const* player = _session->GetPlayer();
@@ -285,7 +285,7 @@ uint32 ClubService::HandleSetStreamFocus(club::v1::SetStreamFocusRequest const*
     return ERROR_OK;
 }
 
-uint32 ClubService::HandleAdvanceStreamViewTime(club::v1::AdvanceStreamViewTimeRequest const* /*request*/, NoData* /*response*/,
+uint32 ClubService::HandleAdvanceStreamViewTime(club::v1::client::AdvanceStreamViewTimeRequest const* /*request*/, NoData* /*response*/,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& /*continuation*/)
 {
     Player const* player = _session->GetPlayer();
@@ -301,7 +301,7 @@ uint32 ClubService::HandleAdvanceStreamViewTime(club::v1::AdvanceStreamViewTimeR
     return ERROR_OK;
 }
 
-uint32 ClubService::HandleCreateMessage(club::v1::CreateMessageRequest const* request, club::v1::CreateMessageResponse* response,
+uint32 ClubService::HandleCreateMessage(club::v1::client::CreateMessageRequest const* request, club::v1::client::CreateMessageResponse* response,
     std::function<void(ServiceBase*, uint32, google::protobuf::Message const*)>& continuation)
 {
     // Basic sanity check until full communities are implemented.
@@ -343,7 +343,7 @@ uint32 ClubService::HandleCreateMessage(club::v1::CreateMessageRequest const* re
 
         FillStreamMessage(response->mutable_message(), request->options().content(), messageTime, player->GetGUID());
 
-        club::v1::StreamMessageAddedNotification messageAddedNotification;
+        club::v1::client::StreamMessageAddedNotification messageAddedNotification;
         messageAddedNotification.set_allocated_agent_id(ClubMembershipService::CreateClubMemberId(player->GetGUID()).release());
         messageAddedNotification.set_club_id(guild->GetId());
         messageAddedNotification.set_stream_id(request->stream_id());
@@ -358,7 +358,7 @@ uint32 ClubService::HandleCreateMessage(club::v1::CreateMessageRequest const* re
             if (receiver->GetSocial()->HasIgnore(player->GetGUID(), _session->GetAccountGUID()))
                 return;
 
-            WorldserverService<club::v1::ClubListener>(receiver->GetSession()).OnStreamMessageAdded(&messageAddedNotification, true, true);
+            WorldserverService<club::v1::client::ClubListener>(receiver->GetSession()).OnStreamMessageAdded(&messageAddedNotification, true, true);
         }, player);
 
         return ERROR_OK;
@@ -378,14 +378,14 @@ std::unique_ptr<club::v1::UniqueClubType> ClubService::CreateGuildClubType()
     return type;
 }
 
-void ClubService::FillStreamMessage(club::v1::StreamMessage* message, std::string_view msg, std::chrono::microseconds messageTime, ObjectGuid author)
+void ClubService::FillStreamMessage(club::v1::client::StreamMessage* message, std::string_view msg, std::chrono::microseconds messageTime, ObjectGuid author)
 {
     message->mutable_id()->set_epoch(messageTime.count());
     message->mutable_id()->set_position(0);
 
     message->mutable_author()->set_allocated_id(ClubMembershipService::CreateClubMemberId(author).release());
 
-    club::v1::ContentChain* contentChain = message->add_content_chain();
+    club::v1::client::ContentChain* contentChain = message->add_content_chain();
 
     contentChain->set_content(msg.data(), msg.size());
     contentChain->set_edit_time(messageTime.count());
diff --git a/src/server/game/Services/ClubService.h b/src/server/game/Services/ClubService.h
index 8a7072bc5d0..f0da8fee0bd 100644
--- a/src/server/game/Services/ClubService.h
+++ b/src/server/game/Services/ClubService.h
@@ -19,32 +19,32 @@
 #define ClubService_h__
 
 #include "WorldserverService.h"
-#include "club_service.pb.h"
+#include "api/client/v1/club_service.pb.h"
 
 namespace Battlenet::Services
 {
-class ClubService : public WorldserverService<club::v1::ClubService>
+class ClubService : public WorldserverService<club::v1::client::ClubService>
 {
-    typedef WorldserverService<club::v1::ClubService> BaseService;
+    typedef WorldserverService<club::v1::client::ClubService> BaseService;
 
 public:
 
     ClubService(WorldSession* session);
 
-    uint32 HandleGetClubType(club::v1::GetClubTypeRequest const* request, club::v1::GetClubTypeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleSubscribe(club::v1::SubscribeRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleGetMembers(club::v1::GetMembersRequest const* request, club::v1::GetMembersResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleGetStreams(club::v1::GetStreamsRequest const* request, club::v1::GetStreamsResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleSubscribeStream(club::v1::SubscribeStreamRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleUnsubscribeStream(club::v1::UnsubscribeStreamRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleSetStreamFocus(club::v1::SetStreamFocusRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleAdvanceStreamViewTime(club::v1::AdvanceStreamViewTimeRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
-    uint32 HandleCreateMessage(club::v1::CreateMessageRequest const* request, club::v1::CreateMessageResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleGetClubType(club::v1::client::GetClubTypeRequest const* request, club::v1::client::GetClubTypeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleSubscribe(club::v1::client::SubscribeRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleGetMembers(club::v1::client::GetMembersRequest const* request, club::v1::client::GetMembersResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleGetStreams(club::v1::client::GetStreamsRequest const* request, club::v1::client::GetStreamsResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleSubscribeStream(club::v1::client::SubscribeStreamRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleUnsubscribeStream(club::v1::client::UnsubscribeStreamRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleSetStreamFocus(club::v1::client::SetStreamFocusRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleAdvanceStreamViewTime(club::v1::client::AdvanceStreamViewTimeRequest const* request, NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
+    uint32 HandleCreateMessage(club::v1::client::CreateMessageRequest const* request, club::v1::client::CreateMessageResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) override;
 
     static std::unique_ptr<club::v1::UniqueClubType> CreateGuildClubType();
 
 private:
-    static void FillStreamMessage(club::v1::StreamMessage* message, std::string_view msg, std::chrono::microseconds messageTime, ObjectGuid author);
+    static void FillStreamMessage(club::v1::client::StreamMessage* message, std::string_view msg, std::chrono::microseconds messageTime, ObjectGuid author);
 };
 }
 
diff --git a/src/server/game/Services/WorldserverServiceDispatcher.cpp b/src/server/game/Services/WorldserverServiceDispatcher.cpp
index 62e25e6e326..a91ba05e994 100644
--- a/src/server/game/Services/WorldserverServiceDispatcher.cpp
+++ b/src/server/game/Services/WorldserverServiceDispatcher.cpp
@@ -21,16 +21,17 @@ Battlenet::WorldserverServiceDispatcher::WorldserverServiceDispatcher()
 {
     AddService<WorldserverService<account::v1::AccountService>>();
     AddService<WorldserverService<authentication::v1::AuthenticationService>>();
+    AddService<WorldserverService<block_list::v1::client::BlockListService>>();
     AddService<Services::ClubMembershipService>();
     AddService<Services::ClubService>();
     AddService<WorldserverService<connection::v1::ConnectionService>>();
     AddService<WorldserverService<friends::v1::FriendsService>>();
     AddService<Services::GameUtilitiesService>();
+    AddService<WorldserverService<notification::v2::client::NotificationService>>();
     AddService<WorldserverService<presence::v1::PresenceService>>();
-    AddService<WorldserverService<report::v1::ReportService>>();
     AddService<WorldserverService<report::v2::ReportService>>();
     AddService<WorldserverService<resources::v1::ResourcesService>>();
-    AddService<WorldserverService<user_manager::v1::UserManagerService>>();
+    AddService<WorldserverService<whisper::v2::client::WhisperService>>();
 }
 
 void Battlenet::WorldserverServiceDispatcher::Dispatch(WorldSession* session, uint32 serviceHash, uint32 token, uint32 methodId, MessageBuffer buffer)
diff --git a/src/server/game/Services/WorldserverServiceDispatcher.h b/src/server/game/Services/WorldserverServiceDispatcher.h
index 70e76aacc3f..b4fd09d22b1 100644
--- a/src/server/game/Services/WorldserverServiceDispatcher.h
+++ b/src/server/game/Services/WorldserverServiceDispatcher.h
@@ -23,20 +23,23 @@
 #include "Log.h"
 #include "account_service.pb.h"
 #include "authentication_service.pb.h"
+#include "api/client/v1/block_list_listener.pb.h"
+#include "api/client/v1/block_list_service.pb.h"
 #include "challenge_service.pb.h"
-#include "club_listener.pb.h"
-#include "club_membership_listener.pb.h"
+#include "api/client/v1/club_listener.pb.h"
+#include "api/client/v1/club_membership_listener.pb.h"
 #include "ClubMembershipService.h"
 #include "ClubService.h"
 #include "connection_service.pb.h"
 #include "friends_service.pb.h"
 #include "WorldserverGameUtilitiesService.h"
+#include "api/client/v2/notification_service.pb.h"
 #include "presence_listener.pb.h"
 #include "presence_service.pb.h"
-#include "report_service.pb.h"
 #include "api/client/v2/report_service.pb.h"
 #include "resource_service.pb.h"
-#include "user_manager_service.pb.h"
+#include "api/client/v2/whisper_listener.pb.h"
+#include "api/client/v2/whisper_service.pb.h"
 
 namespace Battlenet
 {