diff --git a/src/client/Master/Client/MasterGetServersMessage.cs b/src/client/Master/Messages/Client/MasterGetServersMessage.cs
similarity index 100%
rename from src/client/Master/Client/MasterGetServersMessage.cs
rename to src/client/Master/Messages/Client/MasterGetServersMessage.cs
diff --git a/src/client/Master/MasterClientMessage.cs b/src/client/Master/Messages/MasterClientMessage.cs
similarity index 100%
rename from src/client/Master/MasterClientMessage.cs
rename to src/client/Master/Messages/MasterClientMessage.cs
diff --git a/src/client/Master/MasterClientMessageAttribute.cs b/src/client/Master/Messages/MasterClientMessageAttribute.cs
similarity index 100%
rename from src/client/Master/MasterClientMessageAttribute.cs
rename to src/client/Master/Messages/MasterClientMessageAttribute.cs
diff --git a/src/server/Master/Messages/MasterServerMessage.cs b/src/client/Master/Messages/MasterServerMessage.cs
similarity index 100%
rename from src/server/Master/Messages/MasterServerMessage.cs
rename to src/client/Master/Messages/MasterServerMessage.cs
diff --git a/src/server/Master/Messages/MasterServerMessageAttribute.cs b/src/client/Master/Messages/MasterServerMessageAttribute.cs
similarity index 100%
rename from src/server/Master/Messages/MasterServerMessageAttribute.cs
rename to src/client/Master/Messages/MasterServerMessageAttribute.cs
diff --git a/src/client/NPSharp.Client.csproj b/src/client/NPSharp.Client.csproj
index e2f9e39..ed9e949 100644
--- a/src/client/NPSharp.Client.csproj
+++ b/src/client/NPSharp.Client.csproj
@@ -46,10 +46,12 @@
     <Compile Include="Authentication\SessionAuthenticationClient.cs" />
     <Compile Include="Authentication\SessionAuthenticationResult.cs" />
     <Compile Include="Master\Data\MasterGetServersKeywords.cs" />
-    <Compile Include="Master\Client\MasterGetServersMessage.cs" />
+    <Compile Include="Master\Messages\Client\MasterGetServersMessage.cs" />
     <Compile Include="Master\DedicatedServerEntry.cs" />
-    <Compile Include="Master\MasterClientMessage.cs" />
-    <Compile Include="Master\MasterClientMessageAttribute.cs" />
+    <Compile Include="Master\Messages\MasterClientMessage.cs" />
+    <Compile Include="Master\Messages\MasterClientMessageAttribute.cs" />
+    <Compile Include="Master\Messages\MasterServerMessage.cs" />
+    <Compile Include="Master\Messages\MasterServerMessageAttribute.cs" />
     <Compile Include="NP\NPAuthenticationResult.cs" />
     <Compile Include="NP\NPClient.cs" />
     <Compile Include="NP\NPFileException.cs" />
diff --git a/src/server/NPSharp.Server.csproj b/src/server/NPSharp.Server.csproj
index 21c8943..0d4ee74 100644
--- a/src/server/NPSharp.Server.csproj
+++ b/src/server/NPSharp.Server.csproj
@@ -57,8 +57,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Master\MasterServer.cs" />
-    <Compile Include="Master\Messages\MasterServerMessage.cs" />
-    <Compile Include="Master\Messages\MasterServerMessageAttribute.cs" />
     <Compile Include="Authentication\SessionAuthenticationServer.cs" />
     <Compile Include="Events\ClientEventArgs.cs" />
     <Compile Include="Events\ClientEventHandler.cs" />