diff --git a/src/libnpsharp/IFriendsHandler.cs b/src/libnpsharp/IFriendsHandler.cs
index 916b14d..957a44d 100644
--- a/src/libnpsharp/IFriendsHandler.cs
+++ b/src/libnpsharp/IFriendsHandler.cs
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using NPSharp.RPC.Messages;
+using NPSharp.RPC.Messages.Structs;
namespace NPSharp
{
diff --git a/src/libnpsharp/NPClient.cs b/src/libnpsharp/NPClient.cs
index c0d960b..2303fc0 100644
--- a/src/libnpsharp/NPClient.cs
+++ b/src/libnpsharp/NPClient.cs
@@ -6,6 +6,8 @@ using System.Threading.Tasks;
using log4net;
using NPSharp.RPC;
using NPSharp.RPC.Messages;
+using NPSharp.RPC.Messages.Client;
+using NPSharp.RPC.Messages.Server;
namespace NPSharp
{
diff --git a/src/libnpsharp/NPServer.cs b/src/libnpsharp/NPServer.cs
index c2a5007..967b9e8 100644
--- a/src/libnpsharp/NPServer.cs
+++ b/src/libnpsharp/NPServer.cs
@@ -8,6 +8,8 @@ using System.Threading.Tasks;
using log4net;
using NPSharp.RPC;
using NPSharp.RPC.Messages;
+using NPSharp.RPC.Messages.Client;
+using NPSharp.RPC.Messages.Server;
using NPSharp.Steam;
namespace NPSharp
diff --git a/src/libnpsharp/NPServerClient.cs b/src/libnpsharp/NPServerClient.cs
index 0934453..c7f9b57 100644
--- a/src/libnpsharp/NPServerClient.cs
+++ b/src/libnpsharp/NPServerClient.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
using System.Linq;
using NPSharp.RPC;
using NPSharp.RPC.Messages;
+using NPSharp.RPC.Messages.Structs;
using NPSharp.Steam;
namespace NPSharp
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateRegisterServerMessage.cs b/src/libnpsharp/RPC/Messages/Client/AuthenticateRegisterServerMessage.cs
similarity index 85%
rename from src/libnpsharp/RPC/Messages/AuthenticateRegisterServerMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/AuthenticateRegisterServerMessage.cs
index 7f2b43b..a617974 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateRegisterServerMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/AuthenticateRegisterServerMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1004)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateValidateTicketMessage.cs b/src/libnpsharp/RPC/Messages/Client/AuthenticateValidateTicketMessage.cs
similarity index 91%
rename from src/libnpsharp/RPC/Messages/AuthenticateValidateTicketMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/AuthenticateValidateTicketMessage.cs
index 3b8e883..c0d1569 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateValidateTicketMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/AuthenticateValidateTicketMessage.cs
@@ -1,7 +1,7 @@
using System;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1004)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateWithDetailsMessage.cs b/src/libnpsharp/RPC/Messages/Client/AuthenticateWithDetailsMessage.cs
similarity index 87%
rename from src/libnpsharp/RPC/Messages/AuthenticateWithDetailsMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/AuthenticateWithDetailsMessage.cs
index 27ea124..12a7878 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateWithDetailsMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/AuthenticateWithDetailsMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1002)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateWithKeyMessage.cs b/src/libnpsharp/RPC/Messages/Client/AuthenticateWithKeyMessage.cs
similarity index 84%
rename from src/libnpsharp/RPC/Messages/AuthenticateWithKeyMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/AuthenticateWithKeyMessage.cs
index 54d8b95..070dfd8 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateWithKeyMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/AuthenticateWithKeyMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1001)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateWithTokenMessage.cs b/src/libnpsharp/RPC/Messages/Client/AuthenticateWithTokenMessage.cs
similarity index 84%
rename from src/libnpsharp/RPC/Messages/AuthenticateWithTokenMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/AuthenticateWithTokenMessage.cs
index a2ad8df..39217f2 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateWithTokenMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/AuthenticateWithTokenMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1003)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/FriendsGetProfileDataMessage.cs b/src/libnpsharp/RPC/Messages/Client/FriendsGetProfileDataMessage.cs
similarity index 88%
rename from src/libnpsharp/RPC/Messages/FriendsGetProfileDataMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/FriendsGetProfileDataMessage.cs
index e758c79..c7538c0 100644
--- a/src/libnpsharp/RPC/Messages/FriendsGetProfileDataMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/FriendsGetProfileDataMessage.cs
@@ -1,7 +1,7 @@
using System;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[ProtoContract]
[Packet(1202)]
diff --git a/src/libnpsharp/RPC/Messages/FriendsGetUserAvatarMessage.cs b/src/libnpsharp/RPC/Messages/Client/FriendsGetUserAvatarMessage.cs
similarity index 84%
rename from src/libnpsharp/RPC/Messages/FriendsGetUserAvatarMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/FriendsGetUserAvatarMessage.cs
index 0b27a08..55947e9 100644
--- a/src/libnpsharp/RPC/Messages/FriendsGetUserAvatarMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/FriendsGetUserAvatarMessage.cs
@@ -1,7 +1,7 @@
using System;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[ProtoContract]
[Packet(1214)]
diff --git a/src/libnpsharp/RPC/Messages/FriendsSetPresenceMessage.cs b/src/libnpsharp/RPC/Messages/Client/FriendsSetPresenceMessage.cs
similarity index 74%
rename from src/libnpsharp/RPC/Messages/FriendsSetPresenceMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/FriendsSetPresenceMessage.cs
index 1f30973..e62581a 100644
--- a/src/libnpsharp/RPC/Messages/FriendsSetPresenceMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/FriendsSetPresenceMessage.cs
@@ -1,6 +1,7 @@
+using NPSharp.RPC.Messages.Structs;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[ProtoContract]
[Packet(1213)]
diff --git a/src/libnpsharp/RPC/Messages/FriendsSetSteamIDMessage.cs b/src/libnpsharp/RPC/Messages/Client/FriendsSetSteamIDMessage.cs
similarity index 85%
rename from src/libnpsharp/RPC/Messages/FriendsSetSteamIDMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/FriendsSetSteamIDMessage.cs
index 80bd4d2..4843868 100644
--- a/src/libnpsharp/RPC/Messages/FriendsSetSteamIDMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/FriendsSetSteamIDMessage.cs
@@ -1,7 +1,7 @@
using System;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[ProtoContract]
[Packet(1201)]
diff --git a/src/libnpsharp/RPC/Messages/MessagingSendDataMessage.cs b/src/libnpsharp/RPC/Messages/Client/MessagingSendDataMessage.cs
similarity index 87%
rename from src/libnpsharp/RPC/Messages/MessagingSendDataMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/MessagingSendDataMessage.cs
index 5b1be59..da1f103 100644
--- a/src/libnpsharp/RPC/Messages/MessagingSendDataMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/MessagingSendDataMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(2002)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/StorageGetPublisherFileMessage.cs b/src/libnpsharp/RPC/Messages/Client/StorageGetPublisherFileMessage.cs
similarity index 84%
rename from src/libnpsharp/RPC/Messages/StorageGetPublisherFileMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/StorageGetPublisherFileMessage.cs
index 28a7a66..6b813da 100644
--- a/src/libnpsharp/RPC/Messages/StorageGetPublisherFileMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/StorageGetPublisherFileMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[ProtoContract]
[Packet(1101)]
diff --git a/src/libnpsharp/RPC/Messages/StorageGetUserFileMessage.cs b/src/libnpsharp/RPC/Messages/Client/StorageGetUserFileMessage.cs
similarity index 88%
rename from src/libnpsharp/RPC/Messages/StorageGetUserFileMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/StorageGetUserFileMessage.cs
index b212683..aac954c 100644
--- a/src/libnpsharp/RPC/Messages/StorageGetUserFileMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/StorageGetUserFileMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1102)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/StorageSendRandomStringMessage.cs b/src/libnpsharp/RPC/Messages/Client/StorageSendRandomStringMessage.cs
similarity index 84%
rename from src/libnpsharp/RPC/Messages/StorageSendRandomStringMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/StorageSendRandomStringMessage.cs
index fb31206..c3fec98 100644
--- a/src/libnpsharp/RPC/Messages/StorageSendRandomStringMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/StorageSendRandomStringMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1104)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/StorageWriteUserFileMessage.cs b/src/libnpsharp/RPC/Messages/Client/StorageWriteUserFileMessage.cs
similarity index 89%
rename from src/libnpsharp/RPC/Messages/StorageWriteUserFileMessage.cs
rename to src/libnpsharp/RPC/Messages/Client/StorageWriteUserFileMessage.cs
index 95e41b4..a700c65 100644
--- a/src/libnpsharp/RPC/Messages/StorageWriteUserFileMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Client/StorageWriteUserFileMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Client
{
[Packet(1103)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateExternalStatusMessage.cs b/src/libnpsharp/RPC/Messages/Server/AuthenticateExternalStatusMessage.cs
similarity index 84%
rename from src/libnpsharp/RPC/Messages/AuthenticateExternalStatusMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/AuthenticateExternalStatusMessage.cs
index c3d7c70..a0e962e 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateExternalStatusMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/AuthenticateExternalStatusMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1006)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateRegisterServerResultMessage.cs b/src/libnpsharp/RPC/Messages/Server/AuthenticateRegisterServerResultMessage.cs
similarity index 90%
rename from src/libnpsharp/RPC/Messages/AuthenticateRegisterServerResultMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/AuthenticateRegisterServerResultMessage.cs
index 6f1877d..e8b4e0f 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateRegisterServerResultMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/AuthenticateRegisterServerResultMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1022)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateResultMessage.cs b/src/libnpsharp/RPC/Messages/Server/AuthenticateResultMessage.cs
similarity index 89%
rename from src/libnpsharp/RPC/Messages/AuthenticateResultMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/AuthenticateResultMessage.cs
index b089216..e072525 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateResultMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/AuthenticateResultMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1010)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateUserGroupMessage.cs b/src/libnpsharp/RPC/Messages/Server/AuthenticateUserGroupMessage.cs
similarity index 84%
rename from src/libnpsharp/RPC/Messages/AuthenticateUserGroupMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/AuthenticateUserGroupMessage.cs
index a639441..70da7b8 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateUserGroupMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/AuthenticateUserGroupMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1011)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/AuthenticateValidateTicketResultMessage.cs b/src/libnpsharp/RPC/Messages/Server/AuthenticateValidateTicketResultMessage.cs
similarity index 91%
rename from src/libnpsharp/RPC/Messages/AuthenticateValidateTicketResultMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/AuthenticateValidateTicketResultMessage.cs
index 9015830..1f55659 100644
--- a/src/libnpsharp/RPC/Messages/AuthenticateValidateTicketResultMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/AuthenticateValidateTicketResultMessage.cs
@@ -1,7 +1,7 @@
using System;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1012)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/CloseAppMessage.cs b/src/libnpsharp/RPC/Messages/Server/CloseAppMessage.cs
similarity index 83%
rename from src/libnpsharp/RPC/Messages/CloseAppMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/CloseAppMessage.cs
index c4a4524..c876f50 100644
--- a/src/libnpsharp/RPC/Messages/CloseAppMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/CloseAppMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(2001)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/FriendsGetProfileDataResultMessage.cs b/src/libnpsharp/RPC/Messages/Server/FriendsGetProfileDataResultMessage.cs
similarity index 57%
rename from src/libnpsharp/RPC/Messages/FriendsGetProfileDataResultMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/FriendsGetProfileDataResultMessage.cs
index 1150276..bf7abaf 100644
--- a/src/libnpsharp/RPC/Messages/FriendsGetProfileDataResultMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/FriendsGetProfileDataResultMessage.cs
@@ -1,12 +1,13 @@
+using NPSharp.RPC.Messages.Structs;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[ProtoContract]
[Packet(1203)]
public sealed class FriendsGetProfileDataResultMessage : RPCServerMessage
{
[ProtoMember(1)]
- public ProfileDataResult[] Results { get; set; }
+ public ProfileData[] Results { get; set; }
}
}
\ No newline at end of file
diff --git a/src/libnpsharp/RPC/Messages/FriendsGetUserAvatarResultMessage.cs b/src/libnpsharp/RPC/Messages/Server/FriendsGetUserAvatarResultMessage.cs
similarity index 91%
rename from src/libnpsharp/RPC/Messages/FriendsGetUserAvatarResultMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/FriendsGetUserAvatarResultMessage.cs
index 44e43f3..19ebb42 100644
--- a/src/libnpsharp/RPC/Messages/FriendsGetUserAvatarResultMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/FriendsGetUserAvatarResultMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[ProtoContract]
[Packet(1215)]
diff --git a/src/libnpsharp/RPC/Messages/FriendsPresenceMessage.cs b/src/libnpsharp/RPC/Messages/Server/FriendsPresenceMessage.cs
similarity index 88%
rename from src/libnpsharp/RPC/Messages/FriendsPresenceMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/FriendsPresenceMessage.cs
index 3eeb8ab..e861723 100644
--- a/src/libnpsharp/RPC/Messages/FriendsPresenceMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/FriendsPresenceMessage.cs
@@ -1,7 +1,8 @@
using System;
+using NPSharp.RPC.Messages.Structs;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[ProtoContract]
[Packet(1212)]
diff --git a/src/libnpsharp/RPC/Messages/FriendsRosterMessage.cs b/src/libnpsharp/RPC/Messages/Server/FriendsRosterMessage.cs
similarity index 78%
rename from src/libnpsharp/RPC/Messages/FriendsRosterMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/FriendsRosterMessage.cs
index 2a39a00..89df5a0 100644
--- a/src/libnpsharp/RPC/Messages/FriendsRosterMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/FriendsRosterMessage.cs
@@ -1,6 +1,7 @@
+using NPSharp.RPC.Messages.Structs;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[ProtoContract]
[Packet(1211)]
diff --git a/src/libnpsharp/RPC/Messages/HelloMessage.cs b/src/libnpsharp/RPC/Messages/Server/HelloMessage.cs
similarity index 92%
rename from src/libnpsharp/RPC/Messages/HelloMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/HelloMessage.cs
index 2e447df..a89b3f5 100644
--- a/src/libnpsharp/RPC/Messages/HelloMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/HelloMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1000)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/StoragePublisherFileMessage.cs b/src/libnpsharp/RPC/Messages/Server/StoragePublisherFileMessage.cs
similarity index 89%
rename from src/libnpsharp/RPC/Messages/StoragePublisherFileMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/StoragePublisherFileMessage.cs
index 2fc58e1..5f94629 100644
--- a/src/libnpsharp/RPC/Messages/StoragePublisherFileMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/StoragePublisherFileMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1111)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/StorageUserFileMessage.cs b/src/libnpsharp/RPC/Messages/Server/StorageUserFileMessage.cs
similarity index 91%
rename from src/libnpsharp/RPC/Messages/StorageUserFileMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/StorageUserFileMessage.cs
index e4f6d87..6a19550 100644
--- a/src/libnpsharp/RPC/Messages/StorageUserFileMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/StorageUserFileMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1112)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/StorageWriteUserFileResultMessage.cs b/src/libnpsharp/RPC/Messages/Server/StorageWriteUserFileResultMessage.cs
similarity index 89%
rename from src/libnpsharp/RPC/Messages/StorageWriteUserFileResultMessage.cs
rename to src/libnpsharp/RPC/Messages/Server/StorageWriteUserFileResultMessage.cs
index b141e13..d197efa 100644
--- a/src/libnpsharp/RPC/Messages/StorageWriteUserFileResultMessage.cs
+++ b/src/libnpsharp/RPC/Messages/Server/StorageWriteUserFileResultMessage.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Server
{
[Packet(1113)]
[ProtoContract]
diff --git a/src/libnpsharp/RPC/Messages/FriendDetails.cs b/src/libnpsharp/RPC/Messages/Structs/FriendDetails.cs
similarity index 87%
rename from src/libnpsharp/RPC/Messages/FriendDetails.cs
rename to src/libnpsharp/RPC/Messages/Structs/FriendDetails.cs
index b27b13b..c56df14 100644
--- a/src/libnpsharp/RPC/Messages/FriendDetails.cs
+++ b/src/libnpsharp/RPC/Messages/Structs/FriendDetails.cs
@@ -1,7 +1,7 @@
using System;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Structs
{
[ProtoContract]
public sealed class FriendDetails
diff --git a/src/libnpsharp/RPC/Messages/FriendsPresence.cs b/src/libnpsharp/RPC/Messages/Structs/FriendsPresence.cs
similarity index 87%
rename from src/libnpsharp/RPC/Messages/FriendsPresence.cs
rename to src/libnpsharp/RPC/Messages/Structs/FriendsPresence.cs
index bc6f5c6..b57ca9d 100644
--- a/src/libnpsharp/RPC/Messages/FriendsPresence.cs
+++ b/src/libnpsharp/RPC/Messages/Structs/FriendsPresence.cs
@@ -1,6 +1,6 @@
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Structs
{
[ProtoContract]
public sealed class FriendsPresence
diff --git a/src/libnpsharp/RPC/Messages/ProfileDataResult.cs b/src/libnpsharp/RPC/Messages/Structs/ProfileData.cs
similarity index 66%
rename from src/libnpsharp/RPC/Messages/ProfileDataResult.cs
rename to src/libnpsharp/RPC/Messages/Structs/ProfileData.cs
index 61e82ba..c532c68 100644
--- a/src/libnpsharp/RPC/Messages/ProfileDataResult.cs
+++ b/src/libnpsharp/RPC/Messages/Structs/ProfileData.cs
@@ -1,12 +1,12 @@
using System;
using ProtoBuf;
-namespace NPSharp.RPC.Messages
+namespace NPSharp.RPC.Messages.Structs
{
[ProtoContract]
- public sealed class ProfileDataResult
+ public sealed class ProfileData
{
- internal ProfileDataResult()
+ internal ProfileData()
{
}
diff --git a/src/libnpsharp/libnpsharp.csproj b/src/libnpsharp/libnpsharp.csproj
index c8d1801..9c5b638 100644
--- a/src/libnpsharp/libnpsharp.csproj
+++ b/src/libnpsharp/libnpsharp.csproj
@@ -77,42 +77,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+