Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java

src/main/java/cat/hack3/codingtests/marsrover/Coordinates.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 public record Coordinates(int latitude, int longitude) {
 

src/main/java/cat/hack3/codingtests/marsrover/Direction.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 public enum Direction {
     NORTH, SOUTH, EAST, WEST;

src/main/java/cat/hack3/codingtests/marsrover/MapIncrementalPositionResolver.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 public class MapIncrementalPositionResolver {
 

src/main/java/cat/hack3/codingtests/marsrover/MarsMap.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 import java.util.List;
 import java.util.logging.Logger;

src/main/java/cat/hack3/codingtests/marsrover/MarsRover.java

@@ -1,4 +1,4 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 import java.util.logging.Logger;
 

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.core.MarsRover;
+import cat.hack3.codingtests.marsrover.MarsRover;
 
 import java.util.Scanner;
 

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.core.Direction;
+import cat.hack3.codingtests.marsrover.Direction;
 
 import java.util.Scanner;
 

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.core.MarsRover;
+import cat.hack3.codingtests.marsrover.MarsRover;
 
 import java.util.Scanner;
 

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.core.Coordinates;
+import cat.hack3.codingtests.marsrover.Coordinates;
-import cat.hack3.codingtests.marsrover.core.Direction;
+import cat.hack3.codingtests.marsrover.Direction;
-import cat.hack3.codingtests.marsrover.core.MarsMap;
+import cat.hack3.codingtests.marsrover.MarsMap;
-import cat.hack3.codingtests.marsrover.core.MarsRover;
+import cat.hack3.codingtests.marsrover.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 final Scanner reader;
+    private Scanner reader;
     private final DirectionRetriever directionRetriever;
 
 

src/test/java/cat/hack3/codingtests/marsrover/MarsRoverTest.java

@@ -1,11 +1,11 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.util.stream.IntStream;
 
-import static cat.hack3.codingtests.marsrover.core.Direction.*;
+import static cat.hack3.codingtests.marsrover.Direction.*;
 import static org.testng.Assert.assertEquals;
 
 public class MarsRoverTest {

src/test/java/cat/hack3/codingtests/marsrover/MarsRoverWithObstaclesTest.java

@@ -1,10 +1,10 @@
-package cat.hack3.codingtests.marsrover.core;
+package cat.hack3.codingtests.marsrover;
 
 import org.testng.annotations.BeforeMethod;
 
 import java.util.List;
 
-import static cat.hack3.codingtests.marsrover.core.Direction.SOUTH;
+import static cat.hack3.codingtests.marsrover.Direction.SOUTH;
 
 public class MarsRoverWithObstaclesTest {