diff --git a/src/de/craftinc/gates/Plugin.java b/src/de/craftinc/gates/Plugin.java
index 9271e1f..f54ebbc 100644
--- a/src/de/craftinc/gates/Plugin.java
+++ b/src/de/craftinc/gates/Plugin.java
@@ -5,7 +5,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 
+import de.craftinc.gates.gates.Gate;
 import de.craftinc.gates.listeners.PlayerMoveListener;
+import de.craftinc.gates.gates.GatesManager;
 import net.milkbowl.vault.permission.Permission;
 
 import org.bukkit.command.Command;
diff --git a/src/de/craftinc/gates/commands/BaseCommand.java b/src/de/craftinc/gates/commands/BaseCommand.java
index 4c63268..e7143a3 100644
--- a/src/de/craftinc/gates/commands/BaseCommand.java
+++ b/src/de/craftinc/gates/commands/BaseCommand.java
@@ -7,8 +7,8 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import de.craftinc.gates.Gate;
-import de.craftinc.gates.GatesManager;
+import de.craftinc.gates.gates.Gate;
+import de.craftinc.gates.gates.GatesManager;
 import de.craftinc.gates.Plugin;
 import de.craftinc.gates.util.TextUtil;
 
diff --git a/src/de/craftinc/gates/commands/CommandCreate.java b/src/de/craftinc/gates/commands/CommandCreate.java
index 87e0192..2994092 100644
--- a/src/de/craftinc/gates/commands/CommandCreate.java
+++ b/src/de/craftinc/gates/commands/CommandCreate.java
@@ -3,8 +3,8 @@ package de.craftinc.gates.commands;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 
-import de.craftinc.gates.Gate;
-import de.craftinc.gates.GatesManager;
+import de.craftinc.gates.gates.Gate;
+import de.craftinc.gates.gates.GatesManager;
 import de.craftinc.gates.Plugin;
 
 
diff --git a/src/de/craftinc/gates/commands/CommandList.java b/src/de/craftinc/gates/commands/CommandList.java
index ccd3dfb..95ea0ea 100644
--- a/src/de/craftinc/gates/commands/CommandList.java
+++ b/src/de/craftinc/gates/commands/CommandList.java
@@ -8,7 +8,7 @@ import java.util.List;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import de.craftinc.gates.Gate;
+import de.craftinc.gates.gates.Gate;
 import de.craftinc.gates.Plugin;
 import de.craftinc.gates.util.TextUtil;
 
diff --git a/src/de/craftinc/gates/commands/CommandRename.java b/src/de/craftinc/gates/commands/CommandRename.java
index 269776a..0c3ebdb 100644
--- a/src/de/craftinc/gates/commands/CommandRename.java
+++ b/src/de/craftinc/gates/commands/CommandRename.java
@@ -2,7 +2,7 @@ package de.craftinc.gates.commands;
 
 import org.bukkit.ChatColor;
 
-import de.craftinc.gates.GatesManager;
+import de.craftinc.gates.gates.GatesManager;
 import de.craftinc.gates.Plugin;
 
 
diff --git a/src/de/craftinc/gates/Gate.java b/src/de/craftinc/gates/gates/Gate.java
similarity index 98%
rename from src/de/craftinc/gates/Gate.java
rename to src/de/craftinc/gates/gates/Gate.java
index 5329608..85570ad 100644
--- a/src/de/craftinc/gates/Gate.java
+++ b/src/de/craftinc/gates/gates/Gate.java
@@ -1,7 +1,8 @@
-package de.craftinc.gates;
+package de.craftinc.gates.gates;
 
+import de.craftinc.gates.Plugin;
 import de.craftinc.gates.util.FloodUtil;
-import de.craftinc.gates.util.LocationUtil;
+import de.craftinc.gates.gates.persistence.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
diff --git a/src/de/craftinc/gates/GatesManager.java b/src/de/craftinc/gates/gates/GatesManager.java
similarity index 98%
rename from src/de/craftinc/gates/GatesManager.java
rename to src/de/craftinc/gates/gates/GatesManager.java
index 11054be..57aa8bf 100644
--- a/src/de/craftinc/gates/GatesManager.java
+++ b/src/de/craftinc/gates/gates/GatesManager.java
@@ -1,4 +1,4 @@
-package de.craftinc.gates;
+package de.craftinc.gates.gates;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -7,6 +7,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 
+import de.craftinc.gates.Plugin;
+import de.craftinc.gates.gates.persistence.MigrationUtil;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.configuration.file.FileConfiguration;
diff --git a/src/de/craftinc/gates/util/LocationUtil.java b/src/de/craftinc/gates/gates/persistence/LocationUtil.java
similarity index 98%
rename from src/de/craftinc/gates/util/LocationUtil.java
rename to src/de/craftinc/gates/gates/persistence/LocationUtil.java
index ec8d1c4..2273527 100644
--- a/src/de/craftinc/gates/util/LocationUtil.java
+++ b/src/de/craftinc/gates/gates/persistence/LocationUtil.java
@@ -1,4 +1,4 @@
-package de.craftinc.gates.util;
+package de.craftinc.gates.gates.persistence;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/de/craftinc/gates/MigrationUtil.java b/src/de/craftinc/gates/gates/persistence/MigrationUtil.java
similarity index 90%
rename from src/de/craftinc/gates/MigrationUtil.java
rename to src/de/craftinc/gates/gates/persistence/MigrationUtil.java
index e744efc..1efdb3a 100644
--- a/src/de/craftinc/gates/MigrationUtil.java
+++ b/src/de/craftinc/gates/gates/persistence/MigrationUtil.java
@@ -1,6 +1,6 @@
-package de.craftinc.gates;
+package de.craftinc.gates.gates.persistence;
 
-import de.craftinc.gates.Gate;
+import de.craftinc.gates.gates.Gate;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/de/craftinc/gates/listeners/PlayerMoveListener.java b/src/de/craftinc/gates/listeners/PlayerMoveListener.java
index 6c66bef..d2ee3c1 100644
--- a/src/de/craftinc/gates/listeners/PlayerMoveListener.java
+++ b/src/de/craftinc/gates/listeners/PlayerMoveListener.java
@@ -11,8 +11,8 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-import de.craftinc.gates.Gate;
-import de.craftinc.gates.GatesManager;
+import de.craftinc.gates.gates.Gate;
+import de.craftinc.gates.gates.GatesManager;
 import de.craftinc.gates.Plugin;