diff --git a/src/de/teamteamteam/spacescooter/gui/GameFrame.java b/src/de/teamteamteam/spacescooter/GameFrame.java
similarity index 98%
rename from src/de/teamteamteam/spacescooter/gui/GameFrame.java
rename to src/de/teamteamteam/spacescooter/GameFrame.java
index e2760ef..a4f576f 100644
--- a/src/de/teamteamteam/spacescooter/gui/GameFrame.java
+++ b/src/de/teamteamteam/spacescooter/GameFrame.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.gui;
+package de.teamteamteam.spacescooter;
 
 import java.awt.Graphics2D;
 import java.awt.Toolkit;
diff --git a/src/de/teamteamteam/spacescooter/Main.java b/src/de/teamteamteam/spacescooter/Main.java
index b1ffae2..0f5e702 100644
--- a/src/de/teamteamteam/spacescooter/Main.java
+++ b/src/de/teamteamteam/spacescooter/Main.java
@@ -2,7 +2,6 @@ package de.teamteamteam.spacescooter;
 
 import java.awt.EventQueue;
 
-import de.teamteamteam.spacescooter.gui.GameFrame;
 import de.teamteamteam.spacescooter.screen.LoadingScreen;
 import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.screen.SuperScreen;
diff --git a/src/de/teamteamteam/spacescooter/entity/HealthBar.java b/src/de/teamteamteam/spacescooter/gui/HealthBar.java
similarity index 84%
rename from src/de/teamteamteam/spacescooter/entity/HealthBar.java
rename to src/de/teamteamteam/spacescooter/gui/HealthBar.java
index de798a6..18b05f3 100644
--- a/src/de/teamteamteam/spacescooter/entity/HealthBar.java
+++ b/src/de/teamteamteam/spacescooter/gui/HealthBar.java
@@ -1,9 +1,11 @@
-package de.teamteamteam.spacescooter.entity;
+package de.teamteamteam.spacescooter.gui;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.util.List;
 
+import de.teamteamteam.spacescooter.entity.Entity;
+import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.screen.Screen;
 
 public class HealthBar extends Entity {
diff --git a/src/de/teamteamteam/spacescooter/screen/GameScreen.java b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
index e2f2c1e..744326c 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
@@ -10,11 +10,11 @@ import java.util.List;
 import de.teamteamteam.spacescooter.background.StarBackground;
 import de.teamteamteam.spacescooter.control.Keyboard;
 import de.teamteamteam.spacescooter.entity.Entity;
-import de.teamteamteam.spacescooter.entity.HealthBar;
 import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyFour;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyThree;
 import de.teamteamteam.spacescooter.entity.item.ItemChance;
+import de.teamteamteam.spacescooter.gui.HealthBar;
 
 /**
  * In this GameScreen, the actual gameplay takes place.
diff --git a/src/de/teamteamteam/spacescooter/thread/PaintThread.java b/src/de/teamteamteam/spacescooter/thread/PaintThread.java
index b8bc5ca..a9e4d5b 100644
--- a/src/de/teamteamteam/spacescooter/thread/PaintThread.java
+++ b/src/de/teamteamteam/spacescooter/thread/PaintThread.java
@@ -2,7 +2,7 @@ package de.teamteamteam.spacescooter.thread;
 
 import java.awt.EventQueue;
 
-import de.teamteamteam.spacescooter.gui.GameFrame;
+import de.teamteamteam.spacescooter.GameFrame;
 
 /**
  * This thread triggers the redrawing on the GameFrame.