diff --git a/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java b/src/main/java/com/gmail/nossr50/spout/SpoutListener.java
similarity index 92%
rename from src/main/java/com/gmail/nossr50/listeners/SpoutListener.java
rename to src/main/java/com/gmail/nossr50/spout/SpoutListener.java
index db2abc13a..fcc291ed3 100644
--- a/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java
+++ b/src/main/java/com/gmail/nossr50/spout/SpoutListener.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.listeners;
+package com.gmail.nossr50.spout;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -12,12 +12,10 @@ import org.getspout.spoutapi.player.SpoutPlayer;
 
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.buttons.McmmoButton;
-import com.gmail.nossr50.datatypes.popups.Menu;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.spout.SpoutConfig;
-import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.spout.buttons.McmmoButton;
 import com.gmail.nossr50.spout.huds.SpoutHud;
+import com.gmail.nossr50.spout.popups.Menu;
 import com.gmail.nossr50.util.Users;
 
 public class SpoutListener implements Listener {
diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
index 71b64e223..e39d31ac4 100644
--- a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
+++ b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
@@ -21,7 +21,6 @@ import org.getspout.spoutapi.player.SpoutPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.listeners.SpoutListener;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.Skills;
diff --git a/src/main/java/com/gmail/nossr50/datatypes/buttons/McmmoButton.java b/src/main/java/com/gmail/nossr50/spout/buttons/McmmoButton.java
similarity index 90%
rename from src/main/java/com/gmail/nossr50/datatypes/buttons/McmmoButton.java
rename to src/main/java/com/gmail/nossr50/spout/buttons/McmmoButton.java
index fbc70671b..b9002cfbc 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/buttons/McmmoButton.java
+++ b/src/main/java/com/gmail/nossr50/spout/buttons/McmmoButton.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes.buttons;
+package com.gmail.nossr50.spout.buttons;
 
 import org.getspout.spoutapi.gui.GenericButton;
 
diff --git a/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java b/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java
index 006bcc122..41c98a200 100644
--- a/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java
+++ b/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java
@@ -6,10 +6,10 @@ import org.getspout.spoutapi.SpoutManager;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.popups.Menu;
-import com.gmail.nossr50.datatypes.popups.XpBar;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.spout.SpoutConfig;
+import com.gmail.nossr50.spout.popups.Menu;
+import com.gmail.nossr50.spout.popups.XpBar;
 
 public class SpoutHud {
     private Player player;
diff --git a/src/main/java/com/gmail/nossr50/datatypes/popups/Menu.java b/src/main/java/com/gmail/nossr50/spout/popups/Menu.java
similarity index 94%
rename from src/main/java/com/gmail/nossr50/datatypes/popups/Menu.java
rename to src/main/java/com/gmail/nossr50/spout/popups/Menu.java
index 092dea590..503f3559a 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/popups/Menu.java
+++ b/src/main/java/com/gmail/nossr50/spout/popups/Menu.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes.popups;
+package com.gmail.nossr50.spout.popups;
 
 import org.getspout.spoutapi.gui.GenericLabel;
 import org.getspout.spoutapi.gui.GenericPopup;
@@ -7,9 +7,9 @@ import org.getspout.spoutapi.player.SpoutPlayer;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.buttons.McmmoButton;
-import com.gmail.nossr50.datatypes.buttons.McmmoButton.Slot;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.spout.buttons.McmmoButton;
+import com.gmail.nossr50.spout.buttons.McmmoButton.Slot;
 import com.gmail.nossr50.spout.huds.HudType;
 import com.gmail.nossr50.spout.huds.SpoutHud;
 
diff --git a/src/main/java/com/gmail/nossr50/datatypes/popups/XpBar.java b/src/main/java/com/gmail/nossr50/spout/popups/XpBar.java
similarity index 99%
rename from src/main/java/com/gmail/nossr50/datatypes/popups/XpBar.java
rename to src/main/java/com/gmail/nossr50/spout/popups/XpBar.java
index 1eb10a3c7..926685553 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/popups/XpBar.java
+++ b/src/main/java/com/gmail/nossr50/spout/popups/XpBar.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes.popups;
+package com.gmail.nossr50.spout.popups;
 
 import org.getspout.spoutapi.gui.Color;
 import org.getspout.spoutapi.gui.GenericGradient;