diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java b/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java
deleted file mode 100644
index 11a5409..0000000
--- a/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package it.polimi.ingsw.gc14.Network.Client.RMI;
-
-public class RMIClient {
-}
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java
deleted file mode 100644
index 81e4a16..0000000
--- a/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package it.polimi.ingsw.gc14.Network.Server.RMI;
-
-public class RMIServer {
-    public void Test(String[]args)
-    {
-
-    }
-}
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Client/TCP/TCPClient.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java
similarity index 95%
rename from src/main/java/it/polimi/ingsw/gc14/Network/Client/TCP/TCPClient.java
rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java
index 78aea6f..b4cc5ec 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/Client/TCP/TCPClient.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java
@@ -1,4 +1,4 @@
-package it.polimi.ingsw.gc14.Network.Client.TCP;
+package it.polimi.ingsw.gc14.Network.TCP.Client;
 
 import it.polimi.ingsw.gc14.View.IView;
 
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/EventType.java
similarity index 82%
rename from src/main/java/it/polimi/ingsw/gc14/Network/EventType.java
rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/EventType.java
index aae15bf..3b63fcb 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/EventType.java
@@ -1,4 +1,4 @@
-package it.polimi.ingsw.gc14.Network;
+package it.polimi.ingsw.gc14.Network.TCP;
 
 public enum EventType {
     ADD_PLAYER,
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvent.java
similarity index 83%
rename from src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java
rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvent.java
index feb526d..addbf74 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvent.java
@@ -1,4 +1,4 @@
-package it.polimi.ingsw.gc14.Network;
+package it.polimi.ingsw.gc14.Network.TCP;
 
 import it.polimi.ingsw.gc14.Controller.GameController;
 
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvents/AddPlayer.java
similarity index 79%
rename from src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java
rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvents/AddPlayer.java
index 4862a46..0067bcd 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvents/AddPlayer.java
@@ -1,8 +1,8 @@
-package it.polimi.ingsw.gc14.Network.NetworkEvents;
+package it.polimi.ingsw.gc14.Network.TCP.NetworkEvents;
 
 import it.polimi.ingsw.gc14.Controller.GameController;
-import it.polimi.ingsw.gc14.Network.EventType;
-import it.polimi.ingsw.gc14.Network.NetworkEvent;
+import it.polimi.ingsw.gc14.Network.TCP.EventType;
+import it.polimi.ingsw.gc14.Network.TCP.NetworkEvent;
 import it.polimi.ingsw.gc14.View.IView;
 
 import java.io.Serializable;
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/ClientHandler.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java
similarity index 96%
rename from src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/ClientHandler.java
rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java
index 9977552..a599d19 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/ClientHandler.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java
@@ -1,4 +1,4 @@
-package it.polimi.ingsw.gc14.Network.Server.TCP;
+package it.polimi.ingsw.gc14.Network.TCP.Server;
 
 import it.polimi.ingsw.gc14.Controller.GameController;
 
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/TCPServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
similarity index 96%
rename from src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/TCPServer.java
rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
index 4403d84..31a5ff4 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/TCPServer.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
@@ -1,4 +1,4 @@
-package it.polimi.ingsw.gc14.Network.Server.TCP;
+package it.polimi.ingsw.gc14.Network.TCP.Server;
 
 import it.polimi.ingsw.gc14.Controller.GameController;