diff --git a/src/main/java/Drawing/CisternDraw.java b/src/main/java/Drawing/CisternDraw.java
index d413b52..eb08615 100644
--- a/src/main/java/Drawing/CisternDraw.java
+++ b/src/main/java/Drawing/CisternDraw.java
@@ -1,8 +1,9 @@
-package main.java.Drawing;
-
-import main.java.Controll.ViewGame;
+package main.java.drawing;
 
 import javax.swing.*;
+
+import main.java.control.ViewGame;
+
 import java.awt.*;
 
 /**
diff --git a/src/main/java/Drawing/Drawable.java b/src/main/java/Drawing/Drawable.java
index 3e85acb..c4c5ce5 100644
--- a/src/main/java/Drawing/Drawable.java
+++ b/src/main/java/Drawing/Drawable.java
@@ -1,4 +1,4 @@
-package main.java.Drawing;
+package main.java.drawing;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/Drawing/MechanicDraw.java b/src/main/java/Drawing/MechanicDraw.java
index 18771b4..256b7fd 100644
--- a/src/main/java/Drawing/MechanicDraw.java
+++ b/src/main/java/Drawing/MechanicDraw.java
@@ -1,14 +1,14 @@
-package main.java.Drawing;
+package main.java.drawing;
 
-import main.java.Controll.Controller;
-import main.java.Controll.ViewGame;
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.ActiveFields.Spring;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Players.Mechanic;
-import main.java.Players.Player;
+import main.java.control.Controller;
+import main.java.control.ViewGame;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
+import main.java.fields.activefields.Spring;
+import main.java.players.Mechanic;
+import main.java.players.Player;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/Drawing/PipeDraw.java b/src/main/java/Drawing/PipeDraw.java
index 5128688..7e366a9 100644
--- a/src/main/java/Drawing/PipeDraw.java
+++ b/src/main/java/Drawing/PipeDraw.java
@@ -1,8 +1,9 @@
-package main.java.Drawing;
-
-import main.java.Controll.ViewGame;
+package main.java.drawing;
 
 import javax.swing.*;
+
+import main.java.control.ViewGame;
+
 import java.awt.*;
 
 /**
diff --git a/src/main/java/Drawing/PumpDraw.java b/src/main/java/Drawing/PumpDraw.java
index 5095b44..6a1743f 100644
--- a/src/main/java/Drawing/PumpDraw.java
+++ b/src/main/java/Drawing/PumpDraw.java
@@ -1,7 +1,7 @@
-package main.java.Drawing;
+package main.java.drawing;
 
-import main.java.Controll.ViewGame;
-import main.java.Fields.ActiveFields.Pump;
+import main.java.control.ViewGame;
+import main.java.fields.activefields.Pump;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/Drawing/SaboteurDraw.java b/src/main/java/Drawing/SaboteurDraw.java
index 3376a18..0400953 100644
--- a/src/main/java/Drawing/SaboteurDraw.java
+++ b/src/main/java/Drawing/SaboteurDraw.java
@@ -1,14 +1,14 @@
-package main.java.Drawing;
+package main.java.drawing;
 
-import main.java.Controll.Controller;
-import main.java.Controll.ViewGame;
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.ActiveFields.Spring;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.Players.Saboteur;
+import main.java.control.Controller;
+import main.java.control.ViewGame;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
+import main.java.fields.activefields.Spring;
+import main.java.players.Player;
+import main.java.players.Saboteur;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/Drawing/SpringDraw.java b/src/main/java/Drawing/SpringDraw.java
index 618f027..7a47545 100644
--- a/src/main/java/Drawing/SpringDraw.java
+++ b/src/main/java/Drawing/SpringDraw.java
@@ -1,8 +1,9 @@
-package main.java.Drawing;
-
-import main.java.Controll.ViewGame;
+package main.java.drawing;
 
 import javax.swing.*;
+
+import main.java.control.ViewGame;
+
 import java.awt.*;
 
 public class SpringDraw extends Drawable {
diff --git a/src/main/java/Enums/Fluid.java b/src/main/java/Enums/Fluid.java
index 491fc06..c046226 100644
--- a/src/main/java/Enums/Fluid.java
+++ b/src/main/java/Enums/Fluid.java
@@ -1,4 +1,4 @@
-package main.java.Enums;
+package main.java.enums;
 
 public enum Fluid {
     DRY, STICKY, SLIPPERY
diff --git a/src/main/java/Fields/ActiveFields/ActiveFields.java b/src/main/java/Fields/ActiveFields/ActiveFields.java
index 2343fe9..a9bc09c 100644
--- a/src/main/java/Fields/ActiveFields/ActiveFields.java
+++ b/src/main/java/Fields/ActiveFields/ActiveFields.java
@@ -1,8 +1,8 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.players.Player;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Fields/ActiveFields/Cistern.java b/src/main/java/Fields/ActiveFields/Cistern.java
index afb7105..f6fedff 100644
--- a/src/main/java/Fields/ActiveFields/Cistern.java
+++ b/src/main/java/Fields/ActiveFields/Cistern.java
@@ -1,9 +1,9 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Controll.Controller;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 import java.util.Random;
diff --git a/src/main/java/Fields/ActiveFields/Pump.java b/src/main/java/Fields/ActiveFields/Pump.java
index f99ec78..ca1fa5e 100644
--- a/src/main/java/Fields/ActiveFields/Pump.java
+++ b/src/main/java/Fields/ActiveFields/Pump.java
@@ -1,9 +1,9 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Controll.Controller;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 import java.util.Random;
diff --git a/src/main/java/Fields/ActiveFields/Spring.java b/src/main/java/Fields/ActiveFields/Spring.java
index 053a9bb..822e46b 100644
--- a/src/main/java/Fields/ActiveFields/Spring.java
+++ b/src/main/java/Fields/ActiveFields/Spring.java
@@ -1,9 +1,9 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Controll.Controller;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Fields/Field.java b/src/main/java/Fields/Field.java
index 2d6f83e..21830c1 100644
--- a/src/main/java/Fields/Field.java
+++ b/src/main/java/Fields/Field.java
@@ -1,9 +1,9 @@
-package main.java.Fields;
+package main.java.fields;
 
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Interfaces.Steppable;
-import main.java.Players.Player;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
+import main.java.interfaces.Steppable;
+import main.java.players.Player;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Fields/Pipe.java b/src/main/java/Fields/Pipe.java
index b164842..2f05131 100644
--- a/src/main/java/Fields/Pipe.java
+++ b/src/main/java/Fields/Pipe.java
@@ -1,11 +1,11 @@
-package main.java.Fields;
+package main.java.fields;
 
-import main.java.Controll.Controller;
-import main.java.Enums.Fluid;
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.enums.Fluid;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/Interfaces/Steppable.java b/src/main/java/Interfaces/Steppable.java
index 3442c81..d7b10b2 100644
--- a/src/main/java/Interfaces/Steppable.java
+++ b/src/main/java/Interfaces/Steppable.java
@@ -1,4 +1,4 @@
-package main.java.Interfaces;
+package main.java.interfaces;
 
 /**
  * Steppable interface.
diff --git a/src/main/java/Players/Mechanic.java b/src/main/java/Players/Mechanic.java
index cce3b3c..394e192 100644
--- a/src/main/java/Players/Mechanic.java
+++ b/src/main/java/Players/Mechanic.java
@@ -1,9 +1,9 @@
-package main.java.Players;
+package main.java.players;
 
-import main.java.Controll.Controller;
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.Pipe;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
 
 
 /**
diff --git a/src/main/java/Players/Player.java b/src/main/java/Players/Player.java
index 346801a..d890501 100644
--- a/src/main/java/Players/Player.java
+++ b/src/main/java/Players/Player.java
@@ -1,8 +1,8 @@
-package main.java.Players;
+package main.java.players;
 
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Pump;
 
 /**
  * Abstract class for the players.
diff --git a/src/main/java/Players/Saboteur.java b/src/main/java/Players/Saboteur.java
index 4a81e93..f91abd1 100644
--- a/src/main/java/Players/Saboteur.java
+++ b/src/main/java/Players/Saboteur.java
@@ -1,6 +1,6 @@
-package main.java.Players;
+package main.java.players;
 
-import main.java.Controll.Controller;
+import main.java.control.Controller;
 
 
 /**
diff --git a/src/main/java/StringResource/StringResourceController.java b/src/main/java/StringResource/StringResourceController.java
index b4c3a70..a6608b5 100644
--- a/src/main/java/StringResource/StringResourceController.java
+++ b/src/main/java/StringResource/StringResourceController.java
@@ -1,9 +1,9 @@
-package main.java.StringResource;
-
-import main.java.Controll.Controller;
+package main.java.stringresource;
 
 import java.util.List;
 
+import main.java.control.Controller;
+
 public final class StringResourceController {
     private StringResourceController(){}
     public static final String FALSE = "false";
diff --git a/src/main/java/Controll/Controller.java b/src/main/java/control/Controller.java
similarity index 98%
rename from src/main/java/Controll/Controller.java
rename to src/main/java/control/Controller.java
index f7febc8..a916460 100644
--- a/src/main/java/Controll/Controller.java
+++ b/src/main/java/control/Controller.java
@@ -1,18 +1,18 @@
-package main.java.Controll;
-
-import main.java.Drawing.*;
-import main.java.Enums.Fluid;
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.ActiveFields.Spring;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Interfaces.Steppable;
-import main.java.Players.Mechanic;
-import main.java.Players.Player;
-import main.java.Players.Saboteur;
-import main.java.StringResource.StringResourceController;
+package main.java.control;
+
+import main.java.drawing.*;
+import main.java.enums.Fluid;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
+import main.java.fields.activefields.Spring;
+import main.java.interfaces.Steppable;
+import main.java.players.Mechanic;
+import main.java.players.Player;
+import main.java.players.Saboteur;
+import main.java.stringresource.StringResourceController;
 
 import java.io.*;
 import java.nio.file.Path;
diff --git a/src/main/java/Controll/Menu.java b/src/main/java/control/Menu.java
similarity index 99%
rename from src/main/java/Controll/Menu.java
rename to src/main/java/control/Menu.java
index 7f46b30..5bfa76b 100644
--- a/src/main/java/Controll/Menu.java
+++ b/src/main/java/control/Menu.java
@@ -1,4 +1,4 @@
-package main.java.Controll;
+package main.java.control;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/src/main/java/Controll/ViewGame.java b/src/main/java/control/ViewGame.java
similarity index 98%
rename from src/main/java/Controll/ViewGame.java
rename to src/main/java/control/ViewGame.java
index ae9fb40..6bc3c7c 100644
--- a/src/main/java/Controll/ViewGame.java
+++ b/src/main/java/control/ViewGame.java
@@ -1,9 +1,9 @@
-package main.java.Controll;
+package main.java.control;
 
-import main.java.Drawing.Drawable;
-import main.java.Drawing.PipeDraw;
-import main.java.Enums.Fluid;
-import main.java.Fields.Pipe;
+import main.java.drawing.Drawable;
+import main.java.drawing.PipeDraw;
+import main.java.enums.Fluid;
+import main.java.fields.Pipe;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/Controll/WaterCounter.java b/src/main/java/control/WaterCounter.java
similarity index 96%
rename from src/main/java/Controll/WaterCounter.java
rename to src/main/java/control/WaterCounter.java
index 93bf0e1..97e7a25 100644
--- a/src/main/java/Controll/WaterCounter.java
+++ b/src/main/java/control/WaterCounter.java
@@ -1,10 +1,10 @@
-package main.java.Controll;
-
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.Pipe;
+package main.java.control;
 
 import java.util.ArrayList;
 
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+
 import static java.lang.Math.abs;
 
 /**
diff --git a/test/main/java/Controll/WaterCounterTest.java b/test/main/java/Controll/WaterCounterTest.java
index 4131eeb..65ec957 100644
--- a/test/main/java/Controll/WaterCounterTest.java
+++ b/test/main/java/Controll/WaterCounterTest.java
@@ -5,8 +5,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
-import main.java.Fields.ActiveFields.Cistern;
+import main.java.control.WaterCounter;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
 
 class WaterCounterTest {
 	private WaterCounter waterCounter;
diff --git a/test/main/java/Fields/ActiveFields/CisternTest.java b/test/main/java/Fields/ActiveFields/CisternTest.java
index eb86477..66a54b9 100644
--- a/test/main/java/Fields/ActiveFields/CisternTest.java
+++ b/test/main/java/Fields/ActiveFields/CisternTest.java
@@ -5,7 +5,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
 
 class CisternTest {
 	private Cistern cistern;
diff --git a/test/main/java/Fields/ActiveFields/PumpTest.java b/test/main/java/Fields/ActiveFields/PumpTest.java
index ab8e4fa..f1746b4 100644
--- a/test/main/java/Fields/ActiveFields/PumpTest.java
+++ b/test/main/java/Fields/ActiveFields/PumpTest.java
@@ -7,7 +7,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Pump;
 
 class PumpTest {
 	private Pump pump;
diff --git a/test/main/java/Fields/ActiveFields/SpringTest.java b/test/main/java/Fields/ActiveFields/SpringTest.java
index 7d57b0a..2bf4663 100644
--- a/test/main/java/Fields/ActiveFields/SpringTest.java
+++ b/test/main/java/Fields/ActiveFields/SpringTest.java
@@ -7,8 +7,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
-import main.java.Players.Mechanic;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Spring;
+import main.java.players.Mechanic;
 
 class SpringTest {
 	private Spring spring;
diff --git a/test/main/java/Fields/PipeTest.java b/test/main/java/Fields/PipeTest.java
index c53e1c7..e56aecc 100644
--- a/test/main/java/Fields/PipeTest.java
+++ b/test/main/java/Fields/PipeTest.java
@@ -7,12 +7,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Controll.Controller;
-import main.java.Enums.Fluid;
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Players.Mechanic;
-import main.java.Players.Player;
+import main.java.control.Controller;
+import main.java.enums.Fluid;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
+import main.java.players.Mechanic;
+import main.java.players.Player;
 
 class PipeTest {
 	private Pipe pipe;
diff --git a/test/main/java/Players/MechanicTest.java b/test/main/java/Players/MechanicTest.java
index eeef774..5eea536 100644
--- a/test/main/java/Players/MechanicTest.java
+++ b/test/main/java/Players/MechanicTest.java
@@ -5,9 +5,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.ActiveFields.Pump;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
+import main.java.players.Mechanic;
 
 class MechanicTest {
 	private Mechanic mechanic;
diff --git a/test/main/java/Players/SaboteurTest.java b/test/main/java/Players/SaboteurTest.java
index 7823155..0574875 100644
--- a/test/main/java/Players/SaboteurTest.java
+++ b/test/main/java/Players/SaboteurTest.java
@@ -5,9 +5,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Enums.Fluid;
-import main.java.Fields.Pipe;
-import main.java.Fields.ActiveFields.Pump;
+import main.java.enums.Fluid;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Pump;
+import main.java.players.Saboteur;
 
 class SaboteurTest {
 	private Saboteur saboteur;
diff --git a/test/main/java/ResponseTimeSampler.java b/test/main/java/ResponseTimeSampler.java
index a825481..c2d96c0 100644
--- a/test/main/java/ResponseTimeSampler.java
+++ b/test/main/java/ResponseTimeSampler.java
@@ -1,12 +1,13 @@
 package main.java;
 
-import main.java.Controll.Menu;
-import main.java.Controll.ViewGame;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
 import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
 import org.apache.jmeter.samplers.SampleResult;
 
+import main.java.control.Menu;
+import main.java.control.ViewGame;
+
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/test/main/java/StepDefs.java b/test/main/java/StepDefs.java
index ffb9214..7572fae 100644
--- a/test/main/java/StepDefs.java
+++ b/test/main/java/StepDefs.java
@@ -1,9 +1,9 @@
 package main.java;
 
-import main.java.Controll.Controller;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
+import main.java.control.Controller;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.players.Player;
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;