changed project heirarchy

src/main/java/model/Fire.java → src/main/java/model/firefighter/elements/Fire.java

-package model;
-
+package model.firefighter.elements;
+
+import model.*;
+import model.elementTokens.Printable;
+import model.elementTokens.Updatable;
+import model.elementTokens.ZoneDependent;
+import model.firefighter.behaviors.FireBehavior;
+import model.firefighter.factories.FireFactory;
+import model.firefighter.ModelElement;
 import util.Position;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
 
 public abstract class Fire implements Element, Updatable, Printable, ZoneDependent {
-    int counter;
-    int delay;
+    public int counter;
+    public int delay;
     ModelElement type;
     Position position;
     static Behavior behavior=new FireBehavior();

src/main/java/model/FireFighter.java → src/main/java/model/firefighter/elements/FireFighter.java

-package model;
+package model.firefighter.elements;
 
+import model.*;
+import model.elementTokens.Printable;
+import model.elementTokens.Updatable;
+import model.firefighter.behaviors.FireFighterBehavior;
+import model.firefighter.ModelElement;
 import util.Position;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public abstract class FireFighter implements Element, Updatable, Printable {
-        int speed;
+        public int speed;
         ModelElement type;
         Position position;
 static Behavior behavior=new FireFighterBehavior();

src/main/java/model/Forest.java → src/main/java/model/firefighter/elements/Forest.java

-package model;
+package model.firefighter.elements;
 
+import model.Element;
+import model.firefighter.ModelElement;
 import util.Position;
 
 public class Forest extends Land implements Element {

src/main/java/model/Land.java → src/main/java/model/firefighter/elements/Land.java

-package model;
+package model.firefighter.elements;
 
+import model.Behavior;
+import model.Element;
+import model.elementTokens.Printable;
+import model.firefighter.ModelElement;
 import util.Position;
 
 public abstract class Land implements Element, Printable {

src/main/java/model/MotorizedFireFighter.java → src/main/java/model/firefighter/elements/MotorizedFireFighter.java

-package model;
+package model.firefighter.elements;
 
+import model.elementTokens.Updatable;
+import model.firefighter.ModelElement;
 import util.Position;
 
 public class MotorizedFireFighter extends FireFighter implements Updatable {

src/main/java/model/Mountain.java → src/main/java/model/firefighter/elements/Mountain.java

-package model;
+package model.firefighter.elements;
 
 import model.Element;
+import model.firefighter.ModelElement;
 import util.Position;
 
-import java.util.List;
-
 public class Mountain extends Land implements Element {
     public Mountain(Position position) {
         super(position);

src/main/java/model/QuickFire.java → src/main/java/model/firefighter/elements/QuickFire.java

-package model;
+package model.firefighter.elements;
 
+import model.elementTokens.Updatable;
+import model.firefighter.ModelElement;
 import util.Position;
 
 public class QuickFire extends Fire implements Updatable {

src/main/java/model/Road.java → src/main/java/model/firefighter/elements/Road.java

-package model;
+package model.firefighter.elements;
 
+import model.elementTokens.ConnexElement;
+import model.Element;
+import model.ElementFactory;
+import model.firefighter.ModelElement;
+import model.firefighter.factories.RoadFactory;
 import util.Position;
 
 public class Road extends Land implements Element, ConnexElement {

src/main/java/model/Rock.java → src/main/java/model/firefighter/elements/Rock.java

-package model;
+package model.firefighter.elements;
 
+import model.*;
+import model.elementTokens.ChargeTarget;
+import model.elementTokens.Printable;
+import model.elementTokens.Updatable;
+import model.firefighter.ModelElement;
+import model.firefighter.behaviors.RockBehavior;
 import util.Position;
 
 import java.util.List;

src/main/java/model/StandardFire.java → src/main/java/model/firefighter/elements/StandardFire.java

-package model;
+package model.firefighter.elements;
 
+import model.firefighter.ModelElement;
 import util.Position;
 
 public class StandardFire extends Fire{

src/main/java/model/StandardFireFighter.java → src/main/java/model/firefighter/elements/StandardFireFighter.java

-package model;
+package model.firefighter.elements;
 
+import model.firefighter.ModelElement;
 import util.Position;
 
 public class StandardFireFighter extends FireFighter{

src/main/java/model/FireFactory.java → src/main/java/model/firefighter/factories/FireFactory.java

-package model;
+package model.firefighter.factories;
 
+import model.BoardData;
+import model.Element;
+import model.ElementFactory;
+import model.firefighter.ModelElement;
+import model.firefighter.elements.StandardFire;
 import util.Position;
 
 import java.util.HashMap;

src/main/java/model/RoadFactory.java → src/main/java/model/firefighter/factories/RoadFactory.java

-package model;
+package model.firefighter.factories;
 
+import model.BoardData;
+import model.Element;
+import model.ElementFactory;
+import model.firefighter.elements.Road;
 import util.Position;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Random;
 
 public class RoadFactory implements ElementFactory {
@@ -14,8 +15,8 @@ public class RoadFactory implements ElementFactory{
         int[][] dir={{0,1},{0,-1},{1,0},{-1,0},{1,1},{1,-1},{-1,1},{-1,-1}};
         int[] currentDirection1,currentDirection2;
         do{
-            currentDirection1 = dir[random.nextInt(8)];
-            currentDirection2 = dir[random.nextInt(8)];
+            currentDirection1 = dir[random.nextInt(4)];//put to 8 to enable diagonals
+            currentDirection2 = dir[random.nextInt(4)];//put to 8 to enable diagonals
         }while(currentDirection1==currentDirection2);
 
         for (int i = position.row(),j= position.column();

src/main/java/model/ChargerBehavior.java → src/main/java/model/genericBehavior/ChargerBehavior.java

-package model;
+package model.genericBehavior;
 
-import util.Position;
+import model.Behavior;
+import model.elementTokens.ChargeTarget;
 
 import java.util.List;
 

src/main/java/model/RemoverBehavior.java → src/main/java/model/genericBehavior/RemoverBehavior.java

-package model;
+package model.genericBehavior;
 
+import model.Behavior;
+import model.BoardData;
 import util.Position;
 
 import java.util.List;

src/main/java/model/TangibleBehavior.java → src/main/java/model/genericBehavior/TangibleBehavior.java

-package model;
+package model.genericBehavior;
 
+import model.Behavior;
+import model.BoardData;
 import util.Position;
 
 import java.util.List;

src/main/java/view/ViewElement.java

@@ -2,6 +2,7 @@ package view;
 
 import javafx.scene.paint.Color;
 import model.*;
+import model.firefighter.elements.*;
 import util.Position;
 
 import java.lang.reflect.InvocationTargetException;

src/test/java/model/FFBoardTest.java

 package model;
 
+import model.firefighter.FFBoard;
+import model.firefighter.ModelElement;
 import org.junit.jupiter.api.Test;
 import util.Position;