diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0de112327814f38cc33226e2697eeb9314b1e41
--- /dev/null
+++ b/src/main/java/model/Fire.java
@@ -0,0 +1,10 @@
+package model;
+
+import util.Position;
+
+import java.util.Set;
+
+public class Fire {
+    private final int initialFireCount;
+    private Set<Position> firePositions;
+}
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
new file mode 100644
index 0000000000000000000000000000000000000000..d8bdf882d20f64cda70ae46e1f4ef2b3977beafa
--- /dev/null
+++ b/src/main/java/model/FireFighter.java
@@ -0,0 +1,12 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public class FireFighter {
+
+    private final int initialFirefighterCount;
+    private List<Position> firefighterPositions;
+
+}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index c0bd67cc4f444a33c41551779b11f3d619412bef..f324d7dee477cb527f117a83c15028928eef9aa5 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -8,11 +8,7 @@ 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 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;