diff --git a/src/main/java/it/unibo/bombardero/cell/Bomb.java b/src/main/java/it/unibo/bombardero/bomb/api/Bomb.java
similarity index 96%
rename from src/main/java/it/unibo/bombardero/cell/Bomb.java
rename to src/main/java/it/unibo/bombardero/bomb/api/Bomb.java
index c9ad255b..916926b9 100644
--- a/src/main/java/it/unibo/bombardero/cell/Bomb.java
+++ b/src/main/java/it/unibo/bombardero/bomb/api/Bomb.java
@@ -1,8 +1,9 @@
-package it.unibo.bombardero.cell;
+package it.unibo.bombardero.bomb.api;
 
 import java.util.Set;
 import java.util.Map.Entry;
 
+import it.unibo.bombardero.cell.Cell;
 import it.unibo.bombardero.cell.Flame.FlameType;
 import it.unibo.bombardero.map.api.GameMap;
 import it.unibo.bombardero.map.api.GenPair;
diff --git a/src/main/java/it/unibo/bombardero/cell/BombFactory.java b/src/main/java/it/unibo/bombardero/bomb/api/BombFactory.java
similarity index 95%
rename from src/main/java/it/unibo/bombardero/cell/BombFactory.java
rename to src/main/java/it/unibo/bombardero/bomb/api/BombFactory.java
index 1034d0c9..edfbc458 100644
--- a/src/main/java/it/unibo/bombardero/cell/BombFactory.java
+++ b/src/main/java/it/unibo/bombardero/bomb/api/BombFactory.java
@@ -1,4 +1,4 @@
-package it.unibo.bombardero.cell;
+package it.unibo.bombardero.bomb.api;
 
 import it.unibo.bombardero.map.api.GenPair;
 
diff --git a/src/main/java/it/unibo/bombardero/cell/BasicBomb.java b/src/main/java/it/unibo/bombardero/bomb/impl/BasicBomb.java
similarity index 97%
rename from src/main/java/it/unibo/bombardero/cell/BasicBomb.java
rename to src/main/java/it/unibo/bombardero/bomb/impl/BasicBomb.java
index 895249bc..c08d69a4 100644
--- a/src/main/java/it/unibo/bombardero/cell/BasicBomb.java
+++ b/src/main/java/it/unibo/bombardero/bomb/impl/BasicBomb.java
@@ -1,4 +1,4 @@
-package it.unibo.bombardero.cell;
+package it.unibo.bombardero.bomb.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -9,6 +9,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import it.unibo.bombardero.bomb.api.Bomb;
+import it.unibo.bombardero.cell.AbstractCell;
 import it.unibo.bombardero.cell.Flame.FlameType;
 import it.unibo.bombardero.character.Direction;
 import it.unibo.bombardero.map.api.Functions;
diff --git a/src/main/java/it/unibo/bombardero/cell/BombFactoryImpl.java b/src/main/java/it/unibo/bombardero/bomb/impl/BombFactoryImpl.java
similarity index 92%
rename from src/main/java/it/unibo/bombardero/cell/BombFactoryImpl.java
rename to src/main/java/it/unibo/bombardero/bomb/impl/BombFactoryImpl.java
index e7cb0378..82d320a7 100644
--- a/src/main/java/it/unibo/bombardero/cell/BombFactoryImpl.java
+++ b/src/main/java/it/unibo/bombardero/bomb/impl/BombFactoryImpl.java
@@ -1,6 +1,8 @@
-package it.unibo.bombardero.cell;
+package it.unibo.bombardero.bomb.impl;
 
-import it.unibo.bombardero.cell.Bomb.BombType;
+import it.unibo.bombardero.bomb.api.Bomb;
+import it.unibo.bombardero.bomb.api.BombFactory;
+import it.unibo.bombardero.bomb.api.Bomb.BombType;
 import it.unibo.bombardero.character.Character;
 import it.unibo.bombardero.map.api.Functions;
 import it.unibo.bombardero.map.api.GameMap;
diff --git a/src/main/java/it/unibo/bombardero/cell/powerUp/api/PowerUpType.java b/src/main/java/it/unibo/bombardero/cell/powerUp/api/PowerUpType.java
index 026855a0..2826494b 100644
--- a/src/main/java/it/unibo/bombardero/cell/powerUp/api/PowerUpType.java
+++ b/src/main/java/it/unibo/bombardero/cell/powerUp/api/PowerUpType.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import it.unibo.bombardero.cell.Bomb.BombType;
+import it.unibo.bombardero.bomb.api.Bomb.BombType;
 
 /**
  * Enumeration representing the different types of power-ups in the game.
diff --git a/src/main/java/it/unibo/bombardero/character/Character.java b/src/main/java/it/unibo/bombardero/character/Character.java
index ed115cf1..5e1ac89b 100644
--- a/src/main/java/it/unibo/bombardero/character/Character.java
+++ b/src/main/java/it/unibo/bombardero/character/Character.java
@@ -7,9 +7,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import it.unibo.bombardero.cell.Bomb;
-import it.unibo.bombardero.cell.Bomb.BombType;
-import it.unibo.bombardero.cell.BombFactory;
+import it.unibo.bombardero.bomb.api.Bomb;
+import it.unibo.bombardero.bomb.api.BombFactory;
+import it.unibo.bombardero.bomb.api.Bomb.BombType;
 import it.unibo.bombardero.cell.powerup.api.PowerUpType;
 import it.unibo.bombardero.core.api.GameManager;
 import it.unibo.bombardero.map.api.GenPair;
diff --git a/src/main/java/it/unibo/bombardero/character/Enemy.java b/src/main/java/it/unibo/bombardero/character/Enemy.java
index 0e14a130..03e9b50e 100644
--- a/src/main/java/it/unibo/bombardero/character/Enemy.java
+++ b/src/main/java/it/unibo/bombardero/character/Enemy.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import it.unibo.bombardero.cell.BombFactory;
+import it.unibo.bombardero.bomb.api.BombFactory;
 import it.unibo.bombardero.cell.powerup.api.PowerUpType;
 import it.unibo.bombardero.character.ai.api.EnemyState;
 import it.unibo.bombardero.character.ai.impl.EnemyGraphReasonerImpl;
diff --git a/src/main/java/it/unibo/bombardero/character/Player.java b/src/main/java/it/unibo/bombardero/character/Player.java
index 4afcfa41..21b557a6 100644
--- a/src/main/java/it/unibo/bombardero/character/Player.java
+++ b/src/main/java/it/unibo/bombardero/character/Player.java
@@ -1,6 +1,6 @@
 package it.unibo.bombardero.character;
 
-import it.unibo.bombardero.cell.BombFactory;
+import it.unibo.bombardero.bomb.api.BombFactory;
 import it.unibo.bombardero.cell.powerup.impl.PowerUpImpl;
 import it.unibo.bombardero.core.api.GameManager;
 import it.unibo.bombardero.map.api.Functions;
diff --git a/src/main/java/it/unibo/bombardero/core/impl/BasicBombarderoGameManager.java b/src/main/java/it/unibo/bombardero/core/impl/BasicBombarderoGameManager.java
index acaef37f..9acfdbd8 100644
--- a/src/main/java/it/unibo/bombardero/core/impl/BasicBombarderoGameManager.java
+++ b/src/main/java/it/unibo/bombardero/core/impl/BasicBombarderoGameManager.java
@@ -6,9 +6,9 @@
 import java.util.Map;
 import java.util.Optional;
 
-import it.unibo.bombardero.cell.Bomb;
-import it.unibo.bombardero.cell.BombFactory;
-import it.unibo.bombardero.cell.BombFactoryImpl;
+import it.unibo.bombardero.bomb.api.Bomb;
+import it.unibo.bombardero.bomb.api.BombFactory;
+import it.unibo.bombardero.bomb.impl.BombFactoryImpl;
 import it.unibo.bombardero.cell.Cell;
 import it.unibo.bombardero.cell.FlameImpl;
 import it.unibo.bombardero.character.Character;
diff --git a/src/main/java/it/unibo/bombardero/map/api/GameMap.java b/src/main/java/it/unibo/bombardero/map/api/GameMap.java
index 63359750..0126ded3 100644
--- a/src/main/java/it/unibo/bombardero/map/api/GameMap.java
+++ b/src/main/java/it/unibo/bombardero/map/api/GameMap.java
@@ -3,7 +3,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import it.unibo.bombardero.cell.Bomb;
+import it.unibo.bombardero.bomb.api.Bomb;
 import it.unibo.bombardero.cell.Cell;
 import it.unibo.bombardero.cell.Flame;
 import it.unibo.bombardero.cell.powerup.api.PowerUpType;
diff --git a/src/main/java/it/unibo/bombardero/map/impl/GameMapImpl.java b/src/main/java/it/unibo/bombardero/map/impl/GameMapImpl.java
index 0cbbdec1..4288790b 100644
--- a/src/main/java/it/unibo/bombardero/map/impl/GameMapImpl.java
+++ b/src/main/java/it/unibo/bombardero/map/impl/GameMapImpl.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import it.unibo.bombardero.cell.Bomb;
+import it.unibo.bombardero.bomb.api.Bomb;
 import it.unibo.bombardero.cell.Cell;
 import it.unibo.bombardero.cell.Cell.CellType;
 import it.unibo.bombardero.cell.Flame;
diff --git a/src/test/java/it/bombardero/ControllerForTesting.java b/src/test/java/it/bombardero/ControllerForTesting.java
index 56e227b6..96e286f8 100644
--- a/src/test/java/it/bombardero/ControllerForTesting.java
+++ b/src/test/java/it/bombardero/ControllerForTesting.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import it.unibo.bombardero.cell.BombFactoryImpl;
+import it.unibo.bombardero.bomb.impl.BombFactoryImpl;
 import it.unibo.bombardero.cell.Cell;
 import it.unibo.bombardero.character.Character;
 import it.unibo.bombardero.character.Enemy;
diff --git a/src/test/java/it/bombardero/MyBomb.java b/src/test/java/it/bombardero/MyBomb.java
index 8b0c0ffc..2d3aaf8f 100644
--- a/src/test/java/it/bombardero/MyBomb.java
+++ b/src/test/java/it/bombardero/MyBomb.java
@@ -4,7 +4,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import it.unibo.bombardero.cell.Bomb;
+import it.unibo.bombardero.bomb.api.Bomb;
 import it.unibo.bombardero.cell.Flame.FlameType;
 import it.unibo.bombardero.map.api.GameMap;
 import it.unibo.bombardero.map.api.GenPair;
diff --git a/src/test/java/it/bombardero/MyGameManager.java b/src/test/java/it/bombardero/MyGameManager.java
index 793a75af..9ee4b8a5 100644
--- a/src/test/java/it/bombardero/MyGameManager.java
+++ b/src/test/java/it/bombardero/MyGameManager.java
@@ -1,6 +1,6 @@
 package it.bombardero;
 
-import it.unibo.bombardero.cell.BombFactoryImpl;
+import it.unibo.bombardero.bomb.impl.BombFactoryImpl;
 import it.unibo.bombardero.character.Character;
 import it.unibo.bombardero.character.Enemy;
 import it.unibo.bombardero.character.Player;