src/main/java/model/Fire.java

+package model;
+
+import javafx.geometry.Pos;
+import util.Position;
+
+import java.util.Set;
+
+public class Fire {
+    private Position firePositions;
+    public Fire(Position position){
+          this.firePositions = position;
+    }
+    public Position getFirePositions(){
+        return this.firePositions;
+
+    }
+    public void setFirePositions(Position firePositions){
+        this.firePositions = firePositions;
+    }
+}

src/main/java/model/FireFighter.java

+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class FireFighter {
+
+    private Position firefighterPositions;
+
+    public FireFighter(Position firefighterPositions) {
+        this.firefighterPositions = firefighterPositions;
+
+    }
+
+    public void setFirefighterPosition(Position firefighterPositions) {
+            this.firefighterPositions = firefighterPositions;
+    }
+    public Position getFirefighterPosition() {
+        return firefighterPositions;
+    }
+}

src/main/java/model/FirefighterBoard.java

 package model;
 
 import util.Position;
+import util.TargetStrategy;
 
 import java.util.*;
 
@@ -11,8 +12,8 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   private final int initialFireCount;
   private final int initialFirefighterCount;
   private final TargetStrategy targetStrategy = new TargetStrategy();
-  private List<Position> firefighterPositions;
-  private Set<Position> firePositions;
+  private List<FireFighter> firefighter;
+  private Set<Fire> fire;
   private Map<Position, List<Position>> neighbors = new HashMap();
   private final Position[][] positions;
   private int step = 0;
@@ -40,12 +41,12 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   }
 
   public void initializeElements() {
-    firefighterPositions = new ArrayList<>();
-    firePositions = new HashSet<>();
+    firefighter= new ArrayList<>();
+    fire = new HashSet<>();
     for (int index = 0; index < initialFireCount; index++)
-      firePositions.add(randomPosition());
+      fire.add(new Fire(randomPosition()));
     for (int index = 0; index < initialFirefighterCount; index++)
-      firefighterPositions.add(randomPosition());
+      firefighter.add(new FireFighter(randomPosition()));
   }
 
   private Position randomPosition() {
@@ -55,10 +56,12 @@ 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.getFirePositions().equals(position))
        result.add(ModelElement.FIRE);
     return result;
   }
@@ -84,10 +87,12 @@ 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 : fire) {
         newFirePositions.addAll(neighbors.get(fire));
       }
-      firePositions.addAll(newFirePositions);
+      for(Position position : newFirePositions) {
+        fire.add(new Fire(position));
+      }
       modifiedPositions.addAll(newFirePositions);
     }
     return modifiedPositions;
@@ -102,7 +107,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   private List<Position> updateFirefighters() {
     List<Position> modifiedPosition = new ArrayList<>();
     List<Position> firefighterNewPositions = new ArrayList<>();
-    for (Position firefighterPosition : firefighterPositions) {
+    for (FireFighter firefighterPosition : firefighter) {
       Position newFirefighterPosition =
               targetStrategy.neighborClosestToFire(firefighterPosition,
                       firePositions, neighbors);

src/main/java/util/TargetStrategy.java

-package model;
+package util;
 
 import util.Position;