src/main/java/model/Fire.java

+package model;
+
+import util.Position;
+
+import java.util.Set;
+
+public class Fire {
+
+    private Position firePositions;
+
+    public Fire(Position position){
+        this.firePositions = position;
+    }
+
+    public void setFirePosition(Position postion){
+        this.firePositions = postion;
+    }
+
+    public Position getFirePosition() {
+        return firePositions;
+    }
+}

src/main/java/model/FireFighter.java

+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class FireFighter {
+
+
+    private Position FireFighterPosition;
+
+    public FireFighter(Position position){
+        this.FireFighterPosition = position;
+    }
+
+
+    public void setFireFighterPosition(Position postion){
+        this.FireFighterPosition = postion;
+    }
+
+    public Position getFireFighterPosition() {
+        return FireFighterPosition;
+    }
+}

src/main/java/model/FirefighterBoard.java

@@ -8,11 +8,11 @@ import java.util.*;
 public class FirefighterBoard implements Board<List<ModelElement>> {
   private final int columnCount;
   private final int rowCount;
-  private final int initialFireCount;
   private final int initialFirefighterCount;
+  private final int initialFireCount;
+  private List<FireFighter> firefighter;
+  private Set<Fire> fire;
   private final TargetStrategy targetStrategy = new TargetStrategy();
-  private List<Position> firefighterPositions;
-  private Set<Position> firePositions;
   private Map<Position, List<Position>> neighbors = new HashMap();
   private final Position[][] positions;
   private int step = 0;
@@ -40,12 +40,14 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   }
 
   public void initializeElements() {
-    firefighterPositions = new ArrayList<>();
-    firePositions = new HashSet<>();
-    for (int index = 0; index < initialFireCount; index++)
-      firePositions.add(randomPosition());
+    firefighter = new ArrayList<>();
+    fire = new HashSet<>();
+    for (int index = 0; index < initialFireCount; index++){
+      fire.add(new Fire(randomPosition()));
+    }
+
     for (int index = 0; index < initialFirefighterCount; index++)
-      firefighterPositions.add(randomPosition());
+      firefighter.add(new FireFighter(randomPosition()));
   }
 
   private Position randomPosition() {
@@ -55,11 +57,15 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   @Override
   public List<ModelElement> getState(Position position) {
     List<ModelElement> result = new ArrayList<>();
-    for (Position firefighterPosition : firefighterPositions)
-      if (firefighterPosition.equals(position))
+    for (FireFighter firefighter : firefighter)
+      if (firefighter.getFireFighterPosition().equals(position))
         result.add(ModelElement.FIREFIGHTER);
-    if (firePositions.contains(position))
+
+      for(Fire fire : fire){
+        if(fire.getFirePosition().equals(position)){
           result.add(ModelElement.FIRE);
+        }
+      }
     return result;
   }
 
@@ -84,7 +90,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
     List<Position> modifiedPositions = new ArrayList<>();
     if (step % 2 == 0) {
       List<Position> newFirePositions = new ArrayList<>();
-      for (Position fire : firePositions) {
+      for (Fire fire : fires) {
         newFirePositions.addAll(neighbors.get(fire));
       }
       firePositions.addAll(newFirePositions);