refactoring for organization

src/main/java/eu/mhsl/craftattack/spawn/Main.java

@@ -1,38 +1,29 @@
 package eu.mhsl.craftattack.spawn;
 
-import eu.mhsl.craftattack.spawn.command.WorldMuseumVillagerCommand;
+import eu.mhsl.craftattack.spawn.worldmuseum.WorldMueseumMain;
-import eu.mhsl.craftattack.spawn.listener.PlayerEntityInteractListener;
-import eu.mhsl.craftattack.spawn.util.VillagerSpawner;
-import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.Objects;
-
 public final class Main extends JavaPlugin {
     private static Main instance;
 
     @Override
     public void onEnable() {
 //        init
-        saveDefaultConfig();
-        VillagerSpawner.spawnVillager();
         instance = this;
+        saveDefaultConfig();
 
-//        register Messaging-Channels
+//        load parts
-        this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
+        WorldMueseumMain.onEnable();
 
-//        register Commands
-        Objects.requireNonNull(this.getCommand("worldMuseum-villager")).setExecutor(new WorldMuseumVillagerCommand());
 
-//        register listeners
-        Bukkit.getPluginManager().registerEvents(new PlayerEntityInteractListener(), this);
 
 
 
     }
     @Override
     public void onDisable() {
-        VillagerSpawner.killVillager();
+        WorldMueseumMain.onDisable();
+
     }
 
     public static Main getInstance() {

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/WorldMueseumMain.java

@@ -0,0 +1,39 @@
+package eu.mhsl.craftattack.spawn.worldmuseum;
+
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.worldmuseum.command.WorldMuseumVillagerCommand;
+import eu.mhsl.craftattack.spawn.worldmuseum.listener.PlayerEntityInteractListener;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.VillagerSpawner;
+import org.bukkit.Bukkit;
+
+import java.util.Objects;
+
+public class WorldMueseumMain {
+
+    public static void onEnable() {
+        Main main = getInstance();
+
+        VillagerSpawner.spawnVillager();
+
+
+//        register Messaging-Channels
+        main.getServer().getMessenger().registerOutgoingPluginChannel(main, "BungeeCord");
+
+
+
+//        register Commands
+        Objects.requireNonNull(main.getCommand("worldMuseum-villager")).setExecutor(new WorldMuseumVillagerCommand());
+
+//        register listeners
+        Bukkit.getPluginManager().registerEvents(new PlayerEntityInteractListener(), main);
+    }
+
+    public static void onDisable() {
+        VillagerSpawner.killVillager();
+    }
+
+    public static Main getInstance() {
+        return Main.getInstance();
+    }
+
+}

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/command/WorldMuseumVillagerCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.command;
+package eu.mhsl.craftattack.spawn.worldmuseum.command;
 
-import eu.mhsl.craftattack.spawn.util.ConfigUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.ConfigUtil;
-import eu.mhsl.craftattack.spawn.util.VillagerSpawner;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.VillagerSpawner;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerDisconnectListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.listener;
+package eu.mhsl.craftattack.spawn.worldmuseum.listener;
 
-import eu.mhsl.craftattack.spawn.util.PlayerOnlineUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.PlayerOnlineUtil;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerEntityInteractListener.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.listener;
+package eu.mhsl.craftattack.spawn.worldmuseum.listener;
 
-import eu.mhsl.craftattack.spawn.util.ConfigUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.ConfigUtil;
-import eu.mhsl.craftattack.spawn.util.PlayerOnlineUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.PlayerOnlineUtil;
-import eu.mhsl.craftattack.spawn.util.PluginMessage;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.PluginMessage;
-import eu.mhsl.craftattack.spawn.util.VillagerSpawner;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.VillagerSpawner;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/ConfigUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PlayerOnlineUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import org.bukkit.entity.Player;
 import java.util.ArrayList;

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PluginMessage.java

@@ -1,12 +1,13 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.worldmuseum.WorldMueseumMain;
 import org.bukkit.entity.Player;
 
 public class PluginMessage {
-    private final Main plugin = Main.getInstance();
+    private final Main plugin = WorldMueseumMain.getInstance();
     public void connect(Player player, String server) {
         ByteArrayDataOutput output = ByteStreams.newDataOutput();
         output.writeUTF("Connect");

src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/VillagerSpawner.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;