diff --git a/src/main/java/seng302/model/Yacht.java b/src/main/java/seng302/model/Yacht.java
index 9afe778a..84fa15ce 100644
--- a/src/main/java/seng302/model/Yacht.java
+++ b/src/main/java/seng302/model/Yacht.java
@@ -48,7 +48,7 @@ public class Yacht {
     private Integer legNumber = 0;
 
     //SERVER SIDE
-    static public final Double TURN_STEP = 1.0; //This should be in some utils class somewhere 2bh. Public for tests sake.
+    public static final Double TURN_STEP = 1.0; //This should be in some utils class somewhere 2bh. Public for tests sake.
     private Double lastHeading;
     private Boolean sailIn;
     private GeoPoint location;
diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java
index 180f85ca..a636cc4f 100644
--- a/src/main/java/seng302/visualiser/GameView.java
+++ b/src/main/java/seng302/visualiser/GameView.java
@@ -32,8 +32,8 @@ import seng302.visualiser.fxObjects.BoatObject;
 import seng302.visualiser.fxObjects.CourseBoundary;
 import seng302.visualiser.fxObjects.Gate;
 import seng302.visualiser.fxObjects.Marker;
-import seng302.v.map.Boundary;
-import seng302.v.map.CanvasMap;
+import seng302.visualiser.map.Boundary;
+import seng302.visualiser.map.CanvasMap;
 
 /**
  * Created by cir27 on 20/07/17.
@@ -135,7 +135,7 @@ public class GameView extends Pane {
                     }
                 }
 //                Platform.runLater(() ->
-//                    boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation())
+                    boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation());
 //                );
             }
         };
diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index a6df4f61..aa9dfd47 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -242,15 +242,15 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             }
         });
         // Adds the new data series to the sparkline (and set the colour of the series)
-        Platform.runLater(() -> {
+        Platform.runLater(() ->
             sparkLineData
                 .stream()
                 .filter(spark -> !raceSparkLine.getData().contains(spark))
                 .forEach(spark -> {
                     raceSparkLine.getData().add(spark);
                     spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()));
-                });
-        });
+                })
+        );
     }
 
     private void initialiseSparkLine() {
diff --git a/src/main/java/seng302/visualiser/fxObjects/BoatObject.java b/src/main/java/seng302/visualiser/fxObjects/BoatObject.java
index 3441ba2d..d2ab40c2 100644
--- a/src/main/java/seng302/visualiser/fxObjects/BoatObject.java
+++ b/src/main/java/seng302/visualiser/fxObjects/BoatObject.java
@@ -268,7 +268,7 @@ public class BoatObject extends Group {
      */
     public void setAsPlayer() {
         boatPoly.getPoints().setAll(
-          -BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75,
+            -BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75,
             0.0, -BOAT_HEIGHT / 1.75,
             BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75
         );
diff --git a/src/main/java/seng302/visualiser/fxObjects/Wake.java b/src/main/java/seng302/visualiser/fxObjects/Wake.java
index 4d339dc6..b8fec964 100644
--- a/src/main/java/seng302/visualiser/fxObjects/Wake.java
+++ b/src/main/java/seng302/visualiser/fxObjects/Wake.java
@@ -52,7 +52,7 @@ public class Wake extends Group {
             arc.setFill(new Color(0.0, 0.0, 0.0, 0.0));
             arcs[i] = arc;
             arc.getTransforms().setAll(
-                    new Rotate(1)
+                new Rotate(1)
             );
         }
         super.getChildren().addAll(arcs);
@@ -60,15 +60,15 @@ public class Wake extends Group {
 
     void setRotation (double rotation, double velocity) {
 //        if (Math.abs(rotations[0] - rotation) > 20) {
-          Platform.runLater(() -> {
-              rotate(rotation);
-              double rad = (14 / numWakes) + velocity;
-              for (Arc arc : arcs) {
-                  arc.setRadiusX(rad);
-                  arc.setRadiusY(rad);
-                  rad += (14 / numWakes) + (velocity / 2.5);
-              }
-          });
+        Platform.runLater(() -> {
+            rotate(rotation);
+            double rad = (14 / numWakes) + velocity;
+            for (Arc arc : arcs) {
+                arc.setRadiusX(rad);
+                arc.setRadiusY(rad);
+                rad += (14 / numWakes) + (velocity / 2.5);
+            }
+        });
 //        } else {
 //            rotations[0] = rotation;
 //            ((Rotate) arcs[0].getTransforms().get(0)).setAngle(rotation);
diff --git a/src/main/java/seng302/v/map/Boundary.java b/src/main/java/seng302/visualiser/map/Boundary.java
similarity index 96%
rename from src/main/java/seng302/v/map/Boundary.java
rename to src/main/java/seng302/visualiser/map/Boundary.java
index 68085ec7..21f2661d 100644
--- a/src/main/java/seng302/v/map/Boundary.java
+++ b/src/main/java/seng302/visualiser/map/Boundary.java
@@ -1,4 +1,4 @@
-package seng302.v.map;
+package seng302.visualiser.map;
 
 /**
  * The Boundary class represents a rectangle territorial boundary on a map. It
diff --git a/src/main/java/seng302/v/map/CanvasMap.java b/src/main/java/seng302/visualiser/map/CanvasMap.java
similarity index 98%
rename from src/main/java/seng302/v/map/CanvasMap.java
rename to src/main/java/seng302/visualiser/map/CanvasMap.java
index 10cd60c3..e79805e4 100644
--- a/src/main/java/seng302/v/map/CanvasMap.java
+++ b/src/main/java/seng302/visualiser/map/CanvasMap.java
@@ -1,4 +1,4 @@
-package seng302.v.map;
+package seng302.visualiser.map;
 
 import java.net.URL;
 import javafx.geometry.Point2D;
diff --git a/src/main/java/seng302/v/map/MercatorProjection.java b/src/main/java/seng302/visualiser/map/MercatorProjection.java
similarity index 98%
rename from src/main/java/seng302/v/map/MercatorProjection.java
rename to src/main/java/seng302/visualiser/map/MercatorProjection.java
index 28bd341f..5a7f7741 100644
--- a/src/main/java/seng302/v/map/MercatorProjection.java
+++ b/src/main/java/seng302/visualiser/map/MercatorProjection.java
@@ -1,4 +1,4 @@
-package seng302.v.map;
+package seng302.visualiser.map;
 
 import javafx.geometry.Point2D;
 import seng302.model.GeoPoint;
diff --git a/src/main/java/seng302/v/map/TestMapController.java b/src/main/java/seng302/visualiser/map/TestMapController.java
similarity index 95%
rename from src/main/java/seng302/v/map/TestMapController.java
rename to src/main/java/seng302/visualiser/map/TestMapController.java
index 520a1e3b..cd0b4c60 100644
--- a/src/main/java/seng302/v/map/TestMapController.java
+++ b/src/main/java/seng302/visualiser/map/TestMapController.java
@@ -1,4 +1,4 @@
-package seng302.v.map;
+package seng302.visualiser.map;
 
 import java.net.URL;
 import java.util.ResourceBundle;
diff --git a/src/main/resources/views/TestMapView.fxml b/src/main/resources/views/TestMapView.fxml
index 59787ea6..9334d94d 100644
--- a/src/main/resources/views/TestMapView.fxml
+++ b/src/main/resources/views/TestMapView.fxml
@@ -3,7 +3,7 @@
 
 <?import javafx.scene.canvas.Canvas?>
 <?import javafx.scene.layout.Pane?>
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: #ddd;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.v.map.TestMapController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: #ddd;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.map.TestMapController">
    <children>
       <Canvas fx:id="mapCanvas" height="960.0" width="1280.0" />
    </children>
diff --git a/src/test/java/seng302/visualiser/map/MercatorProjectionTest.java b/src/test/java/seng302/visualiser/map/MercatorProjectionTest.java
index 35262439..03dcaccd 100644
--- a/src/test/java/seng302/visualiser/map/MercatorProjectionTest.java
+++ b/src/test/java/seng302/visualiser/map/MercatorProjectionTest.java
@@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import seng302.model.GeoPoint;
-import seng302.v.map.MercatorProjection;
 
 /**
  * Unit test for Mercator Project class.