diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTPlugin.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/TTTPlugin.kt
index 272695d..9f6bfad 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTPlugin.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/TTTPlugin.kt
@@ -16,6 +16,8 @@ class TTTPlugin: JavaPlugin() {
         GameManager.initialize()
 
         TTTListener.register()
+
+        server.spawnRadius = 0
     }
 
     override fun onDisable() {
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/TTTItemListener.kt
similarity index 97%
rename from src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt
rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/TTTItemListener.kt
index 7a38527..953b029 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/TTTItemListener.kt
@@ -1,6 +1,5 @@
-package de.moritzruth.spigot_ttt
+package de.moritzruth.spigot_ttt.game.items
 
-import de.moritzruth.spigot_ttt.game.items.TTTItem
 import de.moritzruth.spigot_ttt.game.players.TTTPlayer
 import de.moritzruth.spigot_ttt.utils.isLeftClick
 import de.moritzruth.spigot_ttt.utils.isRightClick
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt
index 7f24f7e..93a646b 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt
@@ -1,7 +1,7 @@
 package de.moritzruth.spigot_ttt.game.items.impl
 
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameEndEvent
 import de.moritzruth.spigot_ttt.game.items.Buyable
 import de.moritzruth.spigot_ttt.game.items.Selectable
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt
index 25e39e1..a882406 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt
@@ -2,7 +2,7 @@ package de.moritzruth.spigot_ttt.game.items.impl
 
 import com.connorlinfoot.actionbarapi.ActionBarAPI
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameEndEvent
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.corpses.CorpseManager
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt
index acd4dc4..c3d772a 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt
@@ -1,6 +1,6 @@
 package de.moritzruth.spigot_ttt.game.items.impl
 
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.players.Role
 import de.moritzruth.spigot_ttt.game.players.roles
 import de.moritzruth.spigot_ttt.game.items.Buyable
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt
index bf857e4..48044a4 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt
@@ -2,7 +2,7 @@ package de.moritzruth.spigot_ttt.game.items.impl
 
 import com.connorlinfoot.actionbarapi.ActionBarAPI
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.corpses.TTTCorpse
 import de.moritzruth.spigot_ttt.game.players.*
 import de.moritzruth.spigot_ttt.game.items.Buyable
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt
index 63b7e60..80f275b 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt
@@ -1,6 +1,6 @@
 package de.moritzruth.spigot_ttt.game.items.impl
 
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.players.Role
 import de.moritzruth.spigot_ttt.game.players.TTTPlayer
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt
index 74328b4..52a112c 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt
@@ -1,6 +1,6 @@
 package de.moritzruth.spigot_ttt.game.items.impl
 
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.players.Role
 import de.moritzruth.spigot_ttt.game.players.roles
 import de.moritzruth.spigot_ttt.game.items.Buyable
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt
index e8cd2df..ebc2768 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt
@@ -1,7 +1,7 @@
 package de.moritzruth.spigot_ttt.game.items.impl
 
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameEndEvent
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.players.*
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt
index 3ccd3fb..3de83b6 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt
@@ -5,7 +5,7 @@ import com.comphenix.protocol.PacketType
 import com.comphenix.protocol.events.PacketAdapter
 import com.comphenix.protocol.events.PacketEvent
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameEndEvent
 import de.moritzruth.spigot_ttt.game.players.*
 import de.moritzruth.spigot_ttt.game.items.Buyable
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt
index 09ebaa6..8a42223 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt
@@ -1,7 +1,7 @@
 package de.moritzruth.spigot_ttt.game.items.impl
 
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameEndEvent
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.items.Buyable
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt
index 695cbff..f376916 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt
@@ -2,7 +2,7 @@ package de.moritzruth.spigot_ttt.game.items.impl
 
 import com.connorlinfoot.actionbarapi.ActionBarAPI
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.players.*
 import de.moritzruth.spigot_ttt.game.items.Buyable
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt
index faeb782..969d408 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt
@@ -1,7 +1,7 @@
 package de.moritzruth.spigot_ttt.game.items.impl.weapons
 
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.players.Role
 import de.moritzruth.spigot_ttt.game.players.TTTPlayer
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt
index 7790af3..b04aa3e 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt
@@ -1,7 +1,7 @@
 package de.moritzruth.spigot_ttt.game.items.impl.weapons
 
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.players.DamageInfo
 import de.moritzruth.spigot_ttt.game.players.DeathReason
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt
index b0e9483..e60794c 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt
@@ -1,7 +1,7 @@
 package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
 
 import de.moritzruth.spigot_ttt.Resourcepack
-import de.moritzruth.spigot_ttt.TTTItemListener
+import de.moritzruth.spigot_ttt.game.items.TTTItemListener
 import de.moritzruth.spigot_ttt.game.GameEndEvent
 import de.moritzruth.spigot_ttt.game.GameManager
 import de.moritzruth.spigot_ttt.game.GamePhase