Minor Spout refactoring

src/main/java/com/gmail/nossr50/listeners/SpoutListener.java → 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 {

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;

src/main/java/com/gmail/nossr50/datatypes/buttons/McmmoButton.java → 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;
 

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;

src/main/java/com/gmail/nossr50/datatypes/popups/Menu.java → 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;
 

src/main/java/com/gmail/nossr50/datatypes/popups/XpBar.java → 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;