Revert "Revert "Revert "Comit to Uncommit"""

This reverts commit 30122d23d8.

src/alisolarflare/components/flairdoor/FlairDoorModule.java

@@ -0,0 +1,15 @@
+package alisolarflare.components.flairdoor;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import alisolarflare.Module;
+import alisolarflare.components.flairdoor.commands.FlairMe;
+import alisolarflare.components.flairdoor.listeners.PortalListener;
+
+public class FlairDoorModule extends Module {
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerCommand(plugin, new FlairMe());
+		registerListener(plugin, new PortalListener(plugin));
+	}
+}

src/alisolarflare/components/flairdoor/Module_FlairDoor.java

@@ -1,13 +0,0 @@
-package alisolarflare.components.flairdoor;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.Module;
-
-public class Module_FlairDoor extends Module {
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerCommand(plugin, new Command_FlairMe());
-		registerListener(plugin, new Listener_Portal(plugin));
-	}
-}

src/alisolarflare/components/flairdoor/commands/FlairMe.java

@@ -1,14 +1,15 @@
-package alisolarflare.components.flairdoor;
+package alisolarflare.components.flairdoor.commands;
 
 import org.bukkit.command.CommandSender;
 
+import alisolarflare.components.flairdoor.listeners.PortalListener;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_FlairMe extends TBMCCommandBase {
+public class FlairMe extends TBMCCommandBase {
 
 	@Override
 	public boolean OnCommand(CommandSender sender, String label, String[] args) {
-		Listener_Portal.playersToBeFlaired.add(sender.getName());
+		PortalListener.playersToBeFlaired.add(sender.getName());
 		sender.sendMessage("Setup Successful! Walk through a portal to get your flair");
 
 		return false;

src/alisolarflare/components/flairdoor/listeners/PortalListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flairdoor;
+package alisolarflare.components.flairdoor.listeners;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,13 +18,13 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 
-public class Listener_Portal implements Listener{
+public class PortalListener implements Listener{
 	public static List<String> playersToBeFlaired = new ArrayList<String>();
 	public JavaPlugin plugin;
 
 	Essentials essentials;
 	
-	public Listener_Portal(JavaPlugin plugin) {
+	public PortalListener(JavaPlugin plugin) {
 		this.plugin = plugin;
 		this.essentials = ((Essentials) Bukkit.getPluginManager().getPlugin("Essentials"));
 	}

src/alisolarflare/components/gpowers/GPowerMemory.java

@@ -6,7 +6,7 @@ import java.util.UUID;
 
 import org.bukkit.entity.Player;
 
-public class Memory_GPower{
+public class GPowerMemory{
 	public Map<UUID, poweredPlayer> poweredPlayerList = new HashMap<UUID, poweredPlayer>();
 	
 	public void configurePlayer(Player player, String colour, boolean powerIsActive){

src/alisolarflare/components/gpowers/GPowerModule.java

@@ -0,0 +1,23 @@
+package alisolarflare.components.gpowers;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import alisolarflare.Module;
+import alisolarflare.components.gpowers.commands.GPower;
+import alisolarflare.components.gpowers.commands.PowerDown;
+import alisolarflare.components.gpowers.commands.PowerUp;
+import alisolarflare.components.gpowers.listeners.gPowerListener;
+
+public class GPowerModule extends Module {
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		GPowerMemory gPowerMemory = new GPowerMemory();
+		registerCommand(plugin, new GPower(gPowerMemory));
+		registerCommand(plugin, new PowerUp(gPowerMemory));
+		registerCommand(plugin, new PowerDown(gPowerMemory));
+
+		registerListener(plugin, new gPowerListener(plugin, gPowerMemory));
+	}
+
+}

src/alisolarflare/components/gpowers/Listener_PowerLooper.java

@@ -1,11 +0,0 @@
-package alisolarflare.components.gpowers;
-
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class Listener_PowerLooper implements Listener{
-	
-	public Listener_PowerLooper(JavaPlugin plugin, Memory_GPower gPowerMemory){
-		new Task_PowerApplier(plugin.getServer(), gPowerMemory.poweredPlayerList).runTaskTimer(plugin, 190, 190);
-	}		
-}

src/alisolarflare/components/gpowers/Module_GPower.java

@@ -1,19 +0,0 @@
-package alisolarflare.components.gpowers;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.Module;
-
-public class Module_GPower extends Module {
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		Memory_GPower gPowerMemory = new Memory_GPower();
-		registerCommand(plugin, new Command_GPower(gPowerMemory));
-		registerCommand(plugin, new Command_PowerUp(gPowerMemory));
-		registerCommand(plugin, new Command_PowerDown(gPowerMemory));
-
-		registerListener(plugin, new Listener_PowerLooper(plugin, gPowerMemory));
-	}
-
-}

src/alisolarflare/components/gpowers/commands/GPower.java

@@ -1,15 +1,16 @@
-package alisolarflare.components.gpowers;
+package alisolarflare.components.gpowers.commands;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import alisolarflare.components.gpowers.GPowerMemory;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_GPower extends TBMCCommandBase {
+public class GPower extends TBMCCommandBase {
 
-	private Memory_GPower gPowerMemory;
+	private GPowerMemory gPowerMemory;
 
-	public Command_GPower(Memory_GPower gPowerMemory) {
+	public GPower(GPowerMemory gPowerMemory) {
 		this.gPowerMemory = gPowerMemory;
 	}
 

src/alisolarflare/components/gpowers/commands/PowerDown.java

@@ -1,15 +1,16 @@
-package alisolarflare.components.gpowers;
+package alisolarflare.components.gpowers.commands;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import alisolarflare.components.gpowers.GPowerMemory;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_PowerDown extends TBMCCommandBase {
+public class PowerDown extends TBMCCommandBase {
 
-	private Memory_GPower gPowerMemory;
+	private GPowerMemory gPowerMemory;
 
-	public Command_PowerDown(Memory_GPower gPowerMemory) {
+	public PowerDown(GPowerMemory gPowerMemory) {
 		this.gPowerMemory = gPowerMemory;
 	}
 

src/alisolarflare/components/gpowers/commands/PowerUp.java

@@ -1,15 +1,16 @@
-package alisolarflare.components.gpowers;
+package alisolarflare.components.gpowers.commands;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import alisolarflare.components.gpowers.GPowerMemory;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_PowerUp extends TBMCCommandBase {
+public class PowerUp extends TBMCCommandBase {
 
-	private Memory_GPower gPowerMemory;
+	private GPowerMemory gPowerMemory;
 
-	public Command_PowerUp(Memory_GPower gPowerMemory) {
+	public PowerUp(GPowerMemory gPowerMemory) {
 		this.gPowerMemory = gPowerMemory;
 	}
 

src/alisolarflare/components/gpowers/listeners/gPowerApplyingTask.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers;
+package alisolarflare.components.gpowers.listeners;
 
 import java.util.Map;
 import java.util.UUID;
@@ -10,14 +10,14 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import alisolarflare.components.gpowers.Memory_GPower.poweredPlayer;
+import alisolarflare.components.gpowers.GPowerMemory.poweredPlayer;
 
-public class Task_PowerApplier extends BukkitRunnable{
+public class gPowerApplyingTask extends BukkitRunnable{
 	
 	private Server server;
 	private Map<UUID, poweredPlayer> poweredPlayerList;
 
-	public Task_PowerApplier(Server server, Map<UUID, poweredPlayer> poweredPlayerList) {
+	public gPowerApplyingTask(Server server, Map<UUID, poweredPlayer> poweredPlayerList) {
 		this.server = server;
 		this.poweredPlayerList = poweredPlayerList;
 	}

src/alisolarflare/components/gpowers/listeners/gPowerListener.java

@@ -0,0 +1,13 @@
+package alisolarflare.components.gpowers.listeners;
+
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import alisolarflare.components.gpowers.GPowerMemory;
+
+public class gPowerListener implements Listener{
+	
+	public gPowerListener(JavaPlugin plugin, GPowerMemory gPowerMemory){
+		new gPowerApplyingTask(plugin.getServer(), gPowerMemory.poweredPlayerList).runTaskTimer(plugin, 190, 190);
+	}		
+}

src/alisolarflare/components/links/AliLinkModule.java

@@ -0,0 +1,33 @@
+package alisolarflare.components.links;
+
+import java.util.List;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import alisolarflare.Module;
+import alisolarflare.components.links.commands.PressAliLink;
+import alisolarflare.components.links.commands.SetAliLink;
+import alisolarflare.components.links.entities.Link;
+
+public class AliLinkModule extends Module {
+	private SetAliLink setAliLink;
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		setAliLink = new SetAliLink(plugin);
+		
+		registerCommand(plugin, new PressAliLink(plugin, setAliLink));
+		registerCommand(plugin, setAliLink);
+
+	}
+
+	public void saveLinkList(JavaPlugin plugin) {
+		plugin.getConfig().set("aliLinkList", setAliLink.linkList);
+	}
+
+	@SuppressWarnings("unchecked")
+	public List<Link> loadLinkList(JavaPlugin plugin) {
+		return (List<Link>) plugin.getConfig().getList("aliLinkList");
+	}
+
+}

src/alisolarflare/components/links/Module_AliLink.java

@@ -1,30 +0,0 @@
-package alisolarflare.components.links;
-
-import java.util.List;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.Module;
-
-public class Module_AliLink extends Module {
-	private Command_SetAliLink setAliLink;
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		setAliLink = new Command_SetAliLink(plugin);
-		
-		registerCommand(plugin, new Command_PressAliLink(plugin, setAliLink));
-		registerCommand(plugin, setAliLink);
-
-	}
-
-	public void saveLinkList(JavaPlugin plugin) {
-		plugin.getConfig().set("aliLinkList", setAliLink.linkList);
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Memory_Link> loadLinkList(JavaPlugin plugin) {
-		return (List<Memory_Link>) plugin.getConfig().getList("aliLinkList");
-	}
-
-}

src/alisolarflare/components/links/commands/PressAliLink.java

@@ -1,15 +1,16 @@
-package alisolarflare.components.links;
+package alisolarflare.components.links.commands;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import alisolarflare.components.links.entities.Link;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_PressAliLink extends TBMCCommandBase {
+public class PressAliLink extends TBMCCommandBase {
 	private JavaPlugin plugin;
-	private Command_SetAliLink setAliLink;
+	private SetAliLink setAliLink;
 
-	public Command_PressAliLink(JavaPlugin plugin, Command_SetAliLink setAliLink) {
+	public PressAliLink(JavaPlugin plugin, SetAliLink setAliLink) {
 		this.plugin = plugin;
 		this.setAliLink = setAliLink;
 	}
@@ -23,7 +24,7 @@ public class Command_PressAliLink extends TBMCCommandBase {
 			sender.sendMessage("You must specify a link frequency");
 			sender.sendMessage("/pressalilink [frequency]");
 		}
-		for (Memory_Link link : setAliLink.linkList) {
+		for (Link link : setAliLink.linkList) {
 			for (String inputlink : args) {
 				if (inputlink.equals(link.frequency)) {
 					link.press(plugin);

src/alisolarflare/components/links/commands/SetAliLink.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.links;
+package alisolarflare.components.links.commands;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,19 +9,21 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import alisolarflare.components.links.AliLinkModule;
+import alisolarflare.components.links.entities.Link;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
 /**
- * This class manages the command /SetAliLink <frequency> [x] [y] [z]. This command creates an Ali-Link, a location in a world that when called on by {@link Command_PressAliLink}, creates a temporary redstone
+ * This class manages the command /SetAliLink <frequency> [x] [y] [z]. This command creates an Ali-Link, a location in a world that when called on by {@link PressAliLink}, creates a temporary redstone
  * block, enabling wireless redstone
  * 
- * @see Command_PressAliLink
+ * @see PressAliLink
  * @author Alisolarflare
  *
  */
-public class Command_SetAliLink extends TBMCCommandBase {
+public class SetAliLink extends TBMCCommandBase {
-	public List<Memory_Link> linkList = new ArrayList<Memory_Link>();
+	public List<Link> linkList = new ArrayList<Link>();
-	Module_AliLink subplugin;
+	AliLinkModule subplugin;
 	private JavaPlugin plugin;
 
 	/**
@@ -30,7 +32,7 @@ public class Command_SetAliLink extends TBMCCommandBase {
 	 * @param plugin
 	 *            The plugin that contains the configuration file of SetAliLink
 	 */
-	public Command_SetAliLink(JavaPlugin plugin) {
+	public SetAliLink(JavaPlugin plugin) {
 		this.plugin = plugin;
 		load();
 	}
@@ -60,7 +62,7 @@ public class Command_SetAliLink extends TBMCCommandBase {
 		Player player = (Player) sender;
 		if (args.length < 4) {
 			player.sendMessage("short");
-			linkList.add(new Memory_Link(args[0], player.getLocation()));
+			linkList.add(new Link(args[0], player.getLocation()));
 			save(player);
 			player.sendMessage("end");
 			return false;
@@ -68,13 +70,13 @@ public class Command_SetAliLink extends TBMCCommandBase {
 		if (StringUtils.isNumericSpace(args[1]) && StringUtils.isNumericSpace(args[2])
 				&& StringUtils.isNumericSpace(args[3])) {
 			player.sendMessage("CUUUSTOM");
-			linkList.add(new Memory_Link(args[0], new Location(player.getWorld(), Double.parseDouble(args[1]),
+			linkList.add(new Link(args[0], new Location(player.getWorld(), Double.parseDouble(args[1]),
 					Double.parseDouble(args[2]), Double.parseDouble(args[3]))));
 			save(player);
 			player.sendMessage("FINISHED");
 		} else {
 			player.sendMessage("UNCUSTOOM");
-			linkList.add(new Memory_Link(args[0], player.getLocation()));
+			linkList.add(new Link(args[0], player.getLocation()));
 			save(player);
 			player.sendMessage("UNFINISHED");
 			return false;
@@ -104,9 +106,9 @@ public class Command_SetAliLink extends TBMCCommandBase {
 	@SuppressWarnings("unchecked")
 	private void load() {
 		try {
-			linkList = (List<Memory_Link>) plugin.getConfig().getList("aliLinkList");
+			linkList = (List<Link>) plugin.getConfig().getList("aliLinkList");
 			if (linkList == null || linkList.isEmpty()) {
-				linkList = new ArrayList<Memory_Link>();
+				linkList = new ArrayList<Link>();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

src/alisolarflare/components/links/entities/Link.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.links;
+package alisolarflare.components.links.entities;
 
 import java.io.Serializable;
 
@@ -6,7 +6,9 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.plugin.java.JavaPlugin;
 
-public class Memory_Link implements Serializable{
+import alisolarflare.components.links.tasks.UnpressTask;
+
+public class Link implements Serializable{
 	/**
 	 * 
 	 */
@@ -18,7 +20,7 @@ public class Memory_Link implements Serializable{
 	public String z;
 	
 	
-	public Memory_Link(String frequency, Location location){
+	public Link(String frequency, Location location){
 		this.frequency = frequency;
 		this.world = location.getWorld().getName();
 		this.x = "" + location.getBlockX();
@@ -33,7 +35,7 @@ public class Memory_Link implements Serializable{
 	public void press(JavaPlugin plugin) {
 		Location location = new Location(plugin.getServer().getWorld(world), Integer.parseInt(x), Integer.parseInt(y), Integer.parseInt(z));
 		location.getBlock().setType(Material.REDSTONE_BLOCK);
-		Task_UnpressTask unPressTask = new Task_UnpressTask(location);
+		UnpressTask unPressTask = new UnpressTask(location);
 		unPressTask.runTaskTimer(plugin, 2, 1);
 	}
 }

src/alisolarflare/components/links/serializer/Deserializer.java

@@ -0,0 +1,42 @@
+package alisolarflare.components.links.serializer;
+
+
+import java.io.FileInputStream;
+import java.io.ObjectInputStream;
+import java.util.List;
+
+import alisolarflare.components.links.entities.Link;
+
+/**
+ * @deprecated
+ * @author Alisolarflare
+ *
+ */
+public class Deserializer{
+
+	public static void main (String args[]) {
+
+		//Deserializer deserializer = new Deserializer();
+		//List<Link> aliLink = deserializer.loadLink(aliLink);
+		//System.out.println(aliLink);
+	}
+	
+	/**@deprecated*/
+	@SuppressWarnings("unchecked")
+	public List<Link> loadLinkList(){
+		List<Link> aliLinkList;
+		try{
+
+			FileInputStream fin = new FileInputStream("AliLinkList.ser");
+			ObjectInputStream ois = new ObjectInputStream(fin);
+			aliLinkList = (List<Link>) ois.readObject();
+			ois.close();
+
+			return aliLinkList;
+
+		}catch(Exception ex){
+			ex.printStackTrace();
+			return null;
+		}
+	}
+}

src/alisolarflare/components/links/serializer/Serializer.java

@@ -0,0 +1,38 @@
+package alisolarflare.components.links.serializer;
+
+
+import java.io.FileOutputStream;
+import java.io.ObjectOutputStream;
+import java.util.List;
+
+import alisolarflare.components.links.entities.Link;
+
+/**
+ * @deprecated
+ * @author Alisolarflare
+ *
+ */
+public class Serializer {
+
+	public static void main (String args[]) {
+
+		//Serializer serializer = new Serializer();
+		//serializer.saveLink(plugin, frequency, location)
+	}
+	/**@deprecated*/
+	public void saveLinkList(List<Link> aliLinkList){
+		//saves link
+		
+		try{
+
+			FileOutputStream fout = new FileOutputStream("AliLinkList.ser");
+			ObjectOutputStream oos = new ObjectOutputStream(fout);
+			oos.writeObject(aliLinkList);
+			oos.close();
+			System.out.println("Done");
+
+		}catch(Exception ex){
+			ex.printStackTrace();
+		}
+	}
+}

src/alisolarflare/components/links/tasks/UnpressTask.java

@@ -1,12 +1,12 @@
-package alisolarflare.components.links;
+package alisolarflare.components.links.tasks;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.scheduler.BukkitRunnable;
 
-public class Task_UnpressTask extends BukkitRunnable {
+public class UnpressTask extends BukkitRunnable {
 	private Location location;
-	public Task_UnpressTask(Location location){
+	public UnpressTask(Location location){
 		this.location = location;
 	}
 	

src/alisolarflare/creativeboundaries/CreativeBoundariesModule.java

@@ -0,0 +1,30 @@
+package alisolarflare.creativeboundaries;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import alisolarflare.Module;
+import alisolarflare.creativeboundaries.commands.Cbgm0;
+import alisolarflare.creativeboundaries.commands.Cbgm1;
+import alisolarflare.creativeboundaries.commands.SetDickmode;
+import alisolarflare.creativeboundaries.listeners.ItemRestrictionListener;
+import alisolarflare.creativeboundaries.listeners.PlotChangeListener;
+
+
+public class CreativeBoundariesModule extends Module{
+	public boolean dickmode;
+	public List<Player> cbCreatives = new ArrayList<Player>();
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerCommand(plugin, new Cbgm1(this));
+		registerCommand(plugin, new Cbgm0(this));
+		registerCommand(plugin, new SetDickmode(this));
+		
+		registerListener(plugin, new PlotChangeListener(this));
+		//registerListener(plugin, new ItemRestrictionListener(this));
+	}
+	
+}

src/alisolarflare/creativeboundaries/Module_CreativeBoundaries.java

@@ -1,25 +0,0 @@
-package alisolarflare.creativeboundaries;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.Module;
-
-
-public class Module_CreativeBoundaries extends Module{
-	public boolean dickmode;
-	public List<Player> cbCreatives = new ArrayList<Player>();
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerCommand(plugin, new Command_Cbgm1(this));
-		registerCommand(plugin, new Command_Cbgm0(this));
-		registerCommand(plugin, new Command_SetDickmode(this));
-		
-		registerListener(plugin, new Listener_PlotChange(this));
-		//registerListener(plugin, new ItemRestrictionListener(this));
-	}
-	
-}

src/alisolarflare/creativeboundaries/commands/Cbgm0.java

@@ -1,16 +1,17 @@
-package alisolarflare.creativeboundaries;
+package alisolarflare.creativeboundaries.commands;
 
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import alisolarflare.creativeboundaries.CreativeBoundariesModule;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_Cbgm0 extends TBMCCommandBase{
+public class Cbgm0 extends TBMCCommandBase{
 	
-	private Module_CreativeBoundaries module;
+	private CreativeBoundariesModule module;
 
-	public Command_Cbgm0(Module_CreativeBoundaries module) {
+	public Cbgm0(CreativeBoundariesModule module) {
 		this.module = module;
 	}
 

src/alisolarflare/creativeboundaries/commands/Cbgm1.java

@@ -1,4 +1,4 @@
-package alisolarflare.creativeboundaries;
+package alisolarflare.creativeboundaries.commands;
 
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
@@ -10,13 +10,14 @@ import com.palmergames.bukkit.towny.object.Town;
 import com.palmergames.bukkit.towny.object.TownBlock;
 import com.palmergames.bukkit.towny.object.TownyUniverse;
 
+import alisolarflare.creativeboundaries.CreativeBoundariesModule;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_Cbgm1 extends TBMCCommandBase {
+public class Cbgm1 extends TBMCCommandBase {
 
-	private Module_CreativeBoundaries module;
+	private CreativeBoundariesModule module;
 
-	public Command_Cbgm1(Module_CreativeBoundaries module) {
+	public Cbgm1(CreativeBoundariesModule module) {
 		this.module = module;
 	}
 

src/alisolarflare/creativeboundaries/commands/SetDickmode.java

@@ -1,13 +1,14 @@
-package alisolarflare.creativeboundaries;
+package alisolarflare.creativeboundaries.commands;
 
 import org.bukkit.command.CommandSender;
 
+import alisolarflare.creativeboundaries.CreativeBoundariesModule;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_SetDickmode extends TBMCCommandBase{
+public class SetDickmode extends TBMCCommandBase{
-	private Module_CreativeBoundaries module;
+	private CreativeBoundariesModule module;
 
-	public Command_SetDickmode(Module_CreativeBoundaries module){
+	public SetDickmode(CreativeBoundariesModule module){
 		this.module = module;
 	}
 

src/alisolarflare/creativeboundaries/listeners/ItemRestrictionListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.creativeboundaries;
+package alisolarflare.creativeboundaries.listeners;
 
 import java.util.List;
 
@@ -7,11 +7,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryCreativeEvent;
 
-public class Listener_ItemRestriction implements Listener {
+import alisolarflare.creativeboundaries.CreativeBoundariesModule;
 
-	private Module_CreativeBoundaries module;
+public class ItemRestrictionListener implements Listener {
 
-	public Listener_ItemRestriction(Module_CreativeBoundaries module) {
+	private CreativeBoundariesModule module;
+
+	public ItemRestrictionListener(CreativeBoundariesModule module) {
 		this.module = module;
 	}
 	

src/alisolarflare/creativeboundaries/listeners/PlotChangeListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.creativeboundaries;
+package alisolarflare.creativeboundaries.listeners;
 
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -12,9 +12,11 @@ import com.palmergames.bukkit.towny.object.Town;
 import com.palmergames.bukkit.towny.object.TownBlock;
 import com.palmergames.bukkit.towny.object.TownyUniverse;
 
-public class Listener_PlotChange implements Listener{
+import alisolarflare.creativeboundaries.CreativeBoundariesModule;
-	public Module_CreativeBoundaries module;
+
-	public Listener_PlotChange(Module_CreativeBoundaries module){
+public class PlotChangeListener implements Listener{
+	public CreativeBoundariesModule module;
+	public PlotChangeListener(CreativeBoundariesModule module){
 		this.module = module;
 	}
 	@EventHandler

src/alisolarflare/easyuhc/EasyUHCModule.java

@@ -0,0 +1,24 @@
+package alisolarflare.easyuhc;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import alisolarflare.Module;
+import alisolarflare.easyuhc.commands.ActivatePowers;
+import alisolarflare.easyuhc.commands.SetupWorldBorders;
+import alisolarflare.easyuhc.commands.SpreadPlayers;
+import alisolarflare.easyuhc.commands.StartTimer;
+import alisolarflare.easyuhc.commands.StartUHC;
+import alisolarflare.easyuhc.commands.TeleportToUHC;
+
+public class EasyUHCModule extends Module{
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerCommand(plugin, new ActivatePowers());
+		registerCommand(plugin, new SetupWorldBorders());
+		registerCommand(plugin, new SetupWorldBorders());
+		registerCommand(plugin, new SpreadPlayers());
+		registerCommand(plugin, new StartTimer());
+		registerCommand(plugin, new StartUHC());
+		registerCommand(plugin, new TeleportToUHC());
+	}
+}

src/alisolarflare/easyuhc/Module_EasyUHC.java

@@ -1,18 +0,0 @@
-package alisolarflare.easyuhc;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.Module;
-
-public class Module_EasyUHC extends Module{
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerCommand(plugin, new Command_ActivatePowers());
-		registerCommand(plugin, new Command_SetupWorldBorders());
-		registerCommand(plugin, new Command_SetupWorldBorders());
-		registerCommand(plugin, new Command_SpreadPlayers());
-		registerCommand(plugin, new Command_StartTimer());
-		registerCommand(plugin, new Command_StartUHC());
-		registerCommand(plugin, new Command_TeleportToUHC());
-	}
-}

src/alisolarflare/easyuhc/commands/ActivatePowers.java

@@ -1,10 +1,10 @@
-package alisolarflare.easyuhc;
+package alisolarflare.easyuhc.commands;
 
 import org.bukkit.command.CommandSender;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_ActivatePowers extends TBMCCommandBase{
+public class ActivatePowers extends TBMCCommandBase{
 	
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {

src/alisolarflare/easyuhc/commands/SetupWorldBorders.java

@@ -1,10 +1,10 @@
-package alisolarflare.easyuhc;
+package alisolarflare.easyuhc.commands;
 
 import org.bukkit.command.CommandSender;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_SetupWorldBorders extends TBMCCommandBase {
+public class SetupWorldBorders extends TBMCCommandBase {
 	
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {

src/alisolarflare/easyuhc/commands/ShrinkWorldBorders.java

@@ -1,10 +1,10 @@
-package alisolarflare.easyuhc;
+package alisolarflare.easyuhc.commands;
 
 import org.bukkit.command.CommandSender;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_ShrinkWorldBorders extends TBMCCommandBase {
+public class ShrinkWorldBorders extends TBMCCommandBase {
 
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {

src/alisolarflare/easyuhc/commands/SpreadPlayers.java

@@ -1,10 +1,10 @@
-package alisolarflare.easyuhc;
+package alisolarflare.easyuhc.commands;
 
 import org.bukkit.command.CommandSender;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_SpreadPlayers extends TBMCCommandBase{
+public class SpreadPlayers extends TBMCCommandBase{
 
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {

src/alisolarflare/easyuhc/commands/StartTimer.java

@@ -1,10 +1,10 @@
-package alisolarflare.easyuhc;
+package alisolarflare.easyuhc.commands;
 
 import org.bukkit.command.CommandSender;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_StartTimer extends TBMCCommandBase{
+public class StartTimer extends TBMCCommandBase{
 
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {

src/alisolarflare/easyuhc/commands/StartUHC.java

@@ -1,10 +1,10 @@
-package alisolarflare.easyuhc;
+package alisolarflare.easyuhc.commands;
 
 import org.bukkit.command.CommandSender;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_StartUHC extends TBMCCommandBase{
+public class StartUHC extends TBMCCommandBase{
 
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {

src/alisolarflare/easyuhc/commands/TeleportToUHC.java

@@ -1,10 +1,10 @@
-package alisolarflare.easyuhc;
+package alisolarflare.easyuhc.commands;
 
 import org.bukkit.command.CommandSender;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
-public class Command_TeleportToUHC extends TBMCCommandBase{
+public class TeleportToUHC extends TBMCCommandBase{
 
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {

src/alisolarflare/magic/MagicModule.java

@@ -3,6 +3,9 @@ package alisolarflare.magic;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import alisolarflare.Module;
+import alisolarflare.magic.tricks.AliArrowListener;
+import alisolarflare.magic.tricks.BoomBowDeathListener;
+import alisolarflare.magic.tricks.BoomBowListener;
 
 public class MagicModule extends Module{
 

src/alisolarflare/magic/tricks/AliArrowListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.magic;
+package alisolarflare.magic.tricks;
 
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.EntityType;

src/alisolarflare/magic/tricks/AliArrowTask.java

@@ -1,4 +1,4 @@
-package alisolarflare.magic;
+package alisolarflare.magic.tricks;
 
 import org.bukkit.Particle;
 import org.bukkit.entity.Arrow;

src/alisolarflare/magic/tricks/BoomBowDeathListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.magic;
+package alisolarflare.magic.tricks;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/alisolarflare/magic/tricks/BoomBowListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.magic;
+package alisolarflare.magic.tricks;
 
 import org.bukkit.GameMode;
 import org.bukkit.Location;

src/alisolarflare/magic/tricks/BoomBowRule.java

@@ -1,4 +1,4 @@
-package alisolarflare.magic;
+package alisolarflare.magic.tricks;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/alisolarflare/magic/tricks/BoomDecayTask.java

@@ -1,4 +1,4 @@
-package alisolarflare.magic;
+package alisolarflare.magic.tricks;
 
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;