diff --git a/src/de/teamteamteam/spacescooter/entity/Entity.java b/src/de/teamteamteam/spacescooter/entity/Entity.java
index ab65b85..51029c6 100644
--- a/src/de/teamteamteam/spacescooter/entity/Entity.java
+++ b/src/de/teamteamteam/spacescooter/entity/Entity.java
@@ -4,6 +4,8 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
+import de.teamteamteam.spacescooter.entity.spi.Paintable;
+import de.teamteamteam.spacescooter.entity.spi.Updateable;
 import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.utility.GameConfig;
 import de.teamteamteam.spacescooter.utility.Loader;
diff --git a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
index 017cde5..70f2db6 100644
--- a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
@@ -7,6 +7,7 @@ import de.teamteamteam.spacescooter.entity.enemy.Enemy;
 import de.teamteamteam.spacescooter.entity.explosion.Explosion;
 import de.teamteamteam.spacescooter.entity.item.Items;
 import de.teamteamteam.spacescooter.entity.shot.Shot;
+import de.teamteamteam.spacescooter.entity.spi.Collidable;
 import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.utility.GameConfig;
 
diff --git a/src/de/teamteamteam/spacescooter/entity/Collidable.java b/src/de/teamteamteam/spacescooter/entity/spi/Collidable.java
similarity index 88%
rename from src/de/teamteamteam/spacescooter/entity/Collidable.java
rename to src/de/teamteamteam/spacescooter/entity/spi/Collidable.java
index 049b08c..0cc733d 100644
--- a/src/de/teamteamteam/spacescooter/entity/Collidable.java
+++ b/src/de/teamteamteam/spacescooter/entity/spi/Collidable.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.entity;
+package de.teamteamteam.spacescooter.entity.spi;
 
 import java.awt.Rectangle;
 
diff --git a/src/de/teamteamteam/spacescooter/entity/Hittable.java b/src/de/teamteamteam/spacescooter/entity/spi/Hittable.java
similarity index 92%
rename from src/de/teamteamteam/spacescooter/entity/Hittable.java
rename to src/de/teamteamteam/spacescooter/entity/spi/Hittable.java
index ab5f282..71a50e9 100644
--- a/src/de/teamteamteam/spacescooter/entity/Hittable.java
+++ b/src/de/teamteamteam/spacescooter/entity/spi/Hittable.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.entity;
+package de.teamteamteam.spacescooter.entity.spi;
 
 /**
  * Interface providing everything needed to handle taking damage.
diff --git a/src/de/teamteamteam/spacescooter/entity/Paintable.java b/src/de/teamteamteam/spacescooter/entity/spi/Paintable.java
similarity index 82%
rename from src/de/teamteamteam/spacescooter/entity/Paintable.java
rename to src/de/teamteamteam/spacescooter/entity/spi/Paintable.java
index 60fb2ac..bdf812d 100644
--- a/src/de/teamteamteam/spacescooter/entity/Paintable.java
+++ b/src/de/teamteamteam/spacescooter/entity/spi/Paintable.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.entity;
+package de.teamteamteam.spacescooter.entity.spi;
 
 import java.awt.Graphics2D;
 
diff --git a/src/de/teamteamteam/spacescooter/entity/Updateable.java b/src/de/teamteamteam/spacescooter/entity/spi/Updateable.java
similarity index 77%
rename from src/de/teamteamteam/spacescooter/entity/Updateable.java
rename to src/de/teamteamteam/spacescooter/entity/spi/Updateable.java
index 5853751..7da0ba4 100644
--- a/src/de/teamteamteam/spacescooter/entity/Updateable.java
+++ b/src/de/teamteamteam/spacescooter/entity/spi/Updateable.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.entity;
+package de.teamteamteam.spacescooter.entity.spi;
 
 /**
  * Interface providing the update method.