using packages

src/main/java/model/Board.java

 package model;
 
-import util.Neighbour;
+import model.Extinguisher.Extinguisher;
+import model.Obstacle.Obstacle;
 import util.Position;
 
 import java.util.List;

src/main/java/model/Cloud.java → src/main/java/model/Extinguisher/Cloud.java

-package model;
+package model.Extinguisher;
 
+import model.Board;
+import model.Extinguisher.Extinguisher;
+import model.ModelElement;
 import util.Neighbour;
 import util.Position;
 

src/main/java/model/Extinguisher.java → src/main/java/model/Extinguisher/Extinguisher.java

-package model;
+package model.Extinguisher;
 
+import model.Board;
+import model.Element;
+import model.ModelElement;
 import util.Neighbour;
 import util.Position;
 import util.TargetStrategy;

src/main/java/model/FireFighter.java → src/main/java/model/Extinguisher/FireFighter.java

-package model;
+package model.Extinguisher;
 
+import model.Board;
+import model.ModelElement;
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
 import util.Neighbour;
 import util.Position;
 

src/main/java/model/MotorizedFireFighter.java → src/main/java/model/Extinguisher/MotorizedFireFighter.java

-package model;
+package model.Extinguisher;
 
+import model.Board;
+
+import model.ModelElement;
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
 import util.Neighbour;
 import util.Position;
 

src/main/java/model/Fire.java

 package model;
 
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
+import model.Obstacle.Road;
 import util.Neighbour;
 import util.Position;
 

src/main/java/model/FirefighterBoard.java

 package model;
 
+import model.Extinguisher.Cloud;
+import model.Extinguisher.Extinguisher;
+import model.Extinguisher.FireFighter;
+import model.Obstacle.Obstacle;
 import util.Position;
 
 import java.util.*;

src/main/java/model/ModelElement.java

 package model;
 
+import model.Extinguisher.Cloud;
+import model.Extinguisher.Extinguisher;
+import model.Extinguisher.FireFighter;
+import model.Extinguisher.MotorizedFireFighter;
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
+import model.Obstacle.Road;
+import model.Obstacle.Rocaille;
 import util.Position;
 
 import java.util.ArrayList;
@@ -8,7 +16,7 @@ import java.util.List;
 public enum ModelElement {
 
   FIREFIGHTER(5),
-  FIRE(10),
+  FIRE(20),
   CLOUD(10),
   ROAD(5),
   MOUNTAIN(5),

src/main/java/model/Montain.java → src/main/java/model/Obstacle/Montain.java

-package model;
+package model.Obstacle;
 
+import model.ModelElement;
+import model.Obstacle.Obstacle;
 import util.Position;
 
 public class Montain extends Obstacle {

src/main/java/model/Obstacle.java → src/main/java/model/Obstacle/Obstacle.java

-package model;
+package model.Obstacle;
 
+import model.Board;
+import model.Element;
+import model.ModelElement;
 import util.Position;
 
 import java.util.ArrayList;

src/main/java/model/Road.java → src/main/java/model/Obstacle/Road.java

-package model;
+package model.Obstacle;
 
+import model.ModelElement;
+import model.Obstacle.Obstacle;
 import util.Position;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Road extends Obstacle {
 
 

src/main/java/model/Rocaille.java → src/main/java/model/Obstacle/Rocaille.java

-package model;
+package model.Obstacle;
 
+import model.ModelElement;
+import model.Obstacle.Obstacle;
 import util.Position;
 
 public class Rocaille extends Obstacle {