diff --git a/src/main/java/it/unibo/controller/api/BoardController.java b/src/main/java/it/unibo/controller/board/BoardController.java
similarity index 98%
rename from src/main/java/it/unibo/controller/api/BoardController.java
rename to src/main/java/it/unibo/controller/board/BoardController.java
index 45bc491..100af1e 100644
--- a/src/main/java/it/unibo/controller/api/BoardController.java
+++ b/src/main/java/it/unibo/controller/board/BoardController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.board;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/it/unibo/controller/impl/BoardControllerImpl.java b/src/main/java/it/unibo/controller/board/BoardControllerImpl.java
similarity index 97%
rename from src/main/java/it/unibo/controller/impl/BoardControllerImpl.java
rename to src/main/java/it/unibo/controller/board/BoardControllerImpl.java
index bd6e27e..d73238d 100644
--- a/src/main/java/it/unibo/controller/impl/BoardControllerImpl.java
+++ b/src/main/java/it/unibo/controller/board/BoardControllerImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.board;
 
 import java.util.List;
 import java.util.Set;
@@ -18,7 +18,6 @@
 import it.unibo.common.road.RoadPositionImpl;
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.BoardController;
 import it.unibo.model.api.Board;
 import it.unibo.model.api.Player;
 import it.unibo.model.api.PropertyManager;
diff --git a/src/main/java/it/unibo/controller/api/MainController.java b/src/main/java/it/unibo/controller/main/MainController.java
similarity index 97%
rename from src/main/java/it/unibo/controller/api/MainController.java
rename to src/main/java/it/unibo/controller/main/MainController.java
index 6a324b3..cbe2cf3 100644
--- a/src/main/java/it/unibo/controller/api/MainController.java
+++ b/src/main/java/it/unibo/controller/main/MainController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.main;
 
 import java.util.List;
 import java.util.Map;
@@ -9,6 +9,8 @@
 import it.unibo.common.road.RoadPosition;
 import it.unibo.common.tile.ResourceType;
 import it.unibo.common.tile.TilePosition;
+import it.unibo.controller.board.BoardController;
+import it.unibo.controller.resource.ResourceController;
 
 /**
  * Main controller.
diff --git a/src/main/java/it/unibo/controller/impl/MainControllerImpl.java b/src/main/java/it/unibo/controller/main/MainControllerImpl.java
similarity index 95%
rename from src/main/java/it/unibo/controller/impl/MainControllerImpl.java
rename to src/main/java/it/unibo/controller/main/MainControllerImpl.java
index 0b8129a..89b36a4 100644
--- a/src/main/java/it/unibo/controller/impl/MainControllerImpl.java
+++ b/src/main/java/it/unibo/controller/main/MainControllerImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.main;
 
 import java.util.List;
 import java.util.Map;
@@ -11,10 +11,12 @@
 import it.unibo.common.road.RoadPosition;
 import it.unibo.common.tile.ResourceType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.BoardController;
-import it.unibo.controller.api.MainController;
-import it.unibo.controller.api.ResourceController;
-import it.unibo.controller.api.TurnController;
+import it.unibo.controller.board.BoardController;
+import it.unibo.controller.board.BoardControllerImpl;
+import it.unibo.controller.resource.ResourceController;
+import it.unibo.controller.resource.ResourceControllerImpl;
+import it.unibo.controller.turn.TurnController;
+import it.unibo.controller.turn.TurnControllerImpl;
 import it.unibo.model.api.GameManager;
 import it.unibo.model.api.Player;
 import it.unibo.model.impl.GameManagerImpl;
diff --git a/src/main/java/it/unibo/controller/api/ResourceController.java b/src/main/java/it/unibo/controller/resource/ResourceController.java
similarity index 99%
rename from src/main/java/it/unibo/controller/api/ResourceController.java
rename to src/main/java/it/unibo/controller/resource/ResourceController.java
index 4bcbbd8..26cf469 100644
--- a/src/main/java/it/unibo/controller/api/ResourceController.java
+++ b/src/main/java/it/unibo/controller/resource/ResourceController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.resource;
 
 import java.util.Map;
 
diff --git a/src/main/java/it/unibo/controller/impl/ResourceControllerImpl.java b/src/main/java/it/unibo/controller/resource/ResourceControllerImpl.java
similarity index 97%
rename from src/main/java/it/unibo/controller/impl/ResourceControllerImpl.java
rename to src/main/java/it/unibo/controller/resource/ResourceControllerImpl.java
index 8967a75..789f83e 100644
--- a/src/main/java/it/unibo/controller/impl/ResourceControllerImpl.java
+++ b/src/main/java/it/unibo/controller/resource/ResourceControllerImpl.java
@@ -1,11 +1,10 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.resource;
 
 import java.util.Map;
 import java.util.function.Function;
 import java.util.HashMap;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.controller.api.ResourceController;
 import it.unibo.model.api.Player;
 import it.unibo.model.api.ResourceManager;
 
diff --git a/src/main/java/it/unibo/controller/api/TurnController.java b/src/main/java/it/unibo/controller/turn/TurnController.java
similarity index 94%
rename from src/main/java/it/unibo/controller/api/TurnController.java
rename to src/main/java/it/unibo/controller/turn/TurnController.java
index 2cfcc3d..c13a6c6 100644
--- a/src/main/java/it/unibo/controller/api/TurnController.java
+++ b/src/main/java/it/unibo/controller/turn/TurnController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.turn;
 
 import org.apache.commons.lang3.tuple.Pair;
 
diff --git a/src/main/java/it/unibo/controller/impl/TurnControllerImpl.java b/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java
similarity index 92%
rename from src/main/java/it/unibo/controller/impl/TurnControllerImpl.java
rename to src/main/java/it/unibo/controller/turn/TurnControllerImpl.java
index 9fc72d2..0eb7f81 100644
--- a/src/main/java/it/unibo/controller/impl/TurnControllerImpl.java
+++ b/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java
@@ -1,8 +1,7 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.turn;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import it.unibo.controller.api.TurnController;
 import it.unibo.model.api.Player;
 import it.unibo.model.api.TurnManager;
 
diff --git a/src/main/java/it/unibo/view/AppViewImpl.java b/src/main/java/it/unibo/view/AppViewImpl.java
index 68ca55d..930ae47 100644
--- a/src/main/java/it/unibo/view/AppViewImpl.java
+++ b/src/main/java/it/unibo/view/AppViewImpl.java
@@ -14,8 +14,8 @@
 import java.util.List;
 import java.util.Map;
 
-import it.unibo.controller.api.MainController;
-import it.unibo.controller.impl.MainControllerImpl;
+import it.unibo.controller.main.MainController;
+import it.unibo.controller.main.MainControllerImpl;
 
 /**
  * Application.
diff --git a/src/main/java/it/unibo/view/BankView.java b/src/main/java/it/unibo/view/BankView.java
index d8e6c27..01a478a 100644
--- a/src/main/java/it/unibo/view/BankView.java
+++ b/src/main/java/it/unibo/view/BankView.java
@@ -1,6 +1,6 @@
 package it.unibo.view;
 
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.layout.HBox;
 
 /**
diff --git a/src/main/java/it/unibo/view/BoardView.java b/src/main/java/it/unibo/view/BoardView.java
index 14eca7e..69a727e 100644
--- a/src/main/java/it/unibo/view/BoardView.java
+++ b/src/main/java/it/unibo/view/BoardView.java
@@ -6,7 +6,7 @@
 import java.util.HashMap;
 
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.Group;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
diff --git a/src/main/java/it/unibo/view/CurrentPlayerView.java b/src/main/java/it/unibo/view/CurrentPlayerView.java
index 6514e05..9908cee 100644
--- a/src/main/java/it/unibo/view/CurrentPlayerView.java
+++ b/src/main/java/it/unibo/view/CurrentPlayerView.java
@@ -1,7 +1,7 @@
 package it.unibo.view;
 
 import it.unibo.common.card.CardType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
diff --git a/src/main/java/it/unibo/view/LogView.java b/src/main/java/it/unibo/view/LogView.java
index 341b2d1..5e073af 100644
--- a/src/main/java/it/unibo/view/LogView.java
+++ b/src/main/java/it/unibo/view/LogView.java
@@ -1,6 +1,6 @@
 package it.unibo.view;
 
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
diff --git a/src/main/java/it/unibo/view/PlayersView.java b/src/main/java/it/unibo/view/PlayersView.java
index 94ded49..dc4bb15 100644
--- a/src/main/java/it/unibo/view/PlayersView.java
+++ b/src/main/java/it/unibo/view/PlayersView.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
diff --git a/src/main/java/it/unibo/view/PropertyView.java b/src/main/java/it/unibo/view/PropertyView.java
index 5120bff..8d55fcf 100644
--- a/src/main/java/it/unibo/view/PropertyView.java
+++ b/src/main/java/it/unibo/view/PropertyView.java
@@ -7,7 +7,7 @@
 
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.property.PropertyType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
diff --git a/src/main/java/it/unibo/view/RoadView.java b/src/main/java/it/unibo/view/RoadView.java
index b6fe256..0c812d2 100644
--- a/src/main/java/it/unibo/view/RoadView.java
+++ b/src/main/java/it/unibo/view/RoadView.java
@@ -6,7 +6,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import it.unibo.common.road.RoadPosition;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
diff --git a/src/main/java/it/unibo/view/RobberView.java b/src/main/java/it/unibo/view/RobberView.java
index 88f88d3..3c6fcec 100644
--- a/src/main/java/it/unibo/view/RobberView.java
+++ b/src/main/java/it/unibo/view/RobberView.java
@@ -6,7 +6,7 @@
 import java.util.stream.Stream;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
diff --git a/src/main/java/it/unibo/view/TileView.java b/src/main/java/it/unibo/view/TileView.java
index 72388a6..4954037 100644
--- a/src/main/java/it/unibo/view/TileView.java
+++ b/src/main/java/it/unibo/view/TileView.java
@@ -6,7 +6,7 @@
 
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.event.EventHandler;
 import javafx.geometry.VPos;
 import javafx.scene.Group;
diff --git a/src/main/java/it/unibo/view/TradeView.java b/src/main/java/it/unibo/view/TradeView.java
index 12cd736..481e5ef 100644
--- a/src/main/java/it/unibo/view/TradeView.java
+++ b/src/main/java/it/unibo/view/TradeView.java
@@ -6,7 +6,7 @@
 import java.util.stream.Stream;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;