diff --git a/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java b/src/main/java/cat/hack3/codingtests/marsrover/core/Coordinates.java
similarity index 90%
rename from src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java
rename to src/main/java/cat/hack3/codingtests/marsrover/core/Coordinates.java
index 0a56364..7801d1a 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/core/Coordinates.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover;
+package cat.hack3.codingtests.marsrover.core;
 
 public record Coordinates(int latitude, int longitude) {
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/Direction.java b/src/main/java/cat/hack3/codingtests/marsrover/core/Direction.java
similarity index 94%
rename from src/main/java/cat/hack3/codingtests/marsrover/Direction.java
rename to src/main/java/cat/hack3/codingtests/marsrover/core/Direction.java
index d321510..2d18660 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/Direction.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/core/Direction.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover;
+package cat.hack3.codingtests.marsrover.core;
 
 public enum Direction {
     NORTH, SOUTH, EAST, WEST;
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java b/src/main/java/cat/hack3/codingtests/marsrover/core/MapIncrementalPositionResolver.java
similarity index 94%
rename from src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java
rename to src/main/java/cat/hack3/codingtests/marsrover/core/MapIncrementalPositionResolver.java
index 710f7d5..3bd3c18 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/core/MapIncrementalPositionResolver.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover;
+package cat.hack3.codingtests.marsrover.core;
 
 public class MapIncrementalPositionResolver {
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java b/src/main/java/cat/hack3/codingtests/marsrover/core/MarsMap.java
similarity index 98%
rename from src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java
rename to src/main/java/cat/hack3/codingtests/marsrover/core/MarsMap.java
index ee8cd20..5452c9c 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/core/MarsMap.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover;
+package cat.hack3.codingtests.marsrover.core;
 
 import java.util.logging.Logger;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java b/src/main/java/cat/hack3/codingtests/marsrover/core/MarsRover.java
similarity index 96%
rename from src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java
rename to src/main/java/cat/hack3/codingtests/marsrover/core/MarsRover.java
index ff2507e..92e8d91 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/core/MarsRover.java
@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover;
+package cat.hack3.codingtests.marsrover.core;
 
 import java.util.logging.Logger;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java
index 90c72e9..d87d33d 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/ClientCommandInterface.java
@@ -1,6 +1,6 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.MarsRover;
+import cat.hack3.codingtests.marsrover.core.MarsRover;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java
index e936d89..f614c3d 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/DirectionRetriever.java
@@ -1,6 +1,6 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.Direction;
+import cat.hack3.codingtests.marsrover.core.Direction;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java
index 082fc2d..2314abe 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverCommandsPerformer.java
@@ -1,6 +1,6 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.MarsRover;
+import cat.hack3.codingtests.marsrover.core.MarsRover;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java
index 9d4ac44..3c49213 100644
--- a/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java
+++ b/src/main/java/cat/hack3/codingtests/marsrover/ui/RoverInitializer.java
@@ -1,9 +1,9 @@
 package cat.hack3.codingtests.marsrover.ui;
 
-import cat.hack3.codingtests.marsrover.Coordinates;
-import cat.hack3.codingtests.marsrover.Direction;
-import cat.hack3.codingtests.marsrover.MarsMap;
-import cat.hack3.codingtests.marsrover.MarsRover;
+import cat.hack3.codingtests.marsrover.core.Coordinates;
+import cat.hack3.codingtests.marsrover.core.Direction;
+import cat.hack3.codingtests.marsrover.core.MarsMap;
+import cat.hack3.codingtests.marsrover.core.MarsRover;
 
 import java.util.InputMismatchException;
 import java.util.Scanner;
@@ -11,7 +11,7 @@ import java.util.Scanner;
 import static cat.hack3.codingtests.marsrover.ui.UICommons.output;
 
 public class RoverInitializer {
-    private Scanner reader;
+    private final Scanner reader;
     private final DirectionRetriever directionRetriever;
 
 
diff --git a/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java b/src/test/java/cat/hack3/codingtests/marsrover/core/MarsRoverTest.java
similarity index 97%
rename from src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java
rename to src/test/java/cat/hack3/codingtests/marsrover/core/MarsRoverTest.java
index 2e755d8..5d6861b 100644
--- a/src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java
+++ b/src/test/java/cat/hack3/codingtests/marsrover/core/MarsRoverTest.java
@@ -1,11 +1,11 @@
-package cat.hack3.codingtests.marsrover;
+package cat.hack3.codingtests.marsrover.core;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.util.stream.IntStream;
 
-import static cat.hack3.codingtests.marsrover.Direction.*;
+import static cat.hack3.codingtests.marsrover.core.Direction.*;
 import static org.testng.Assert.assertEquals;
 
 public class MarsRoverTest {