diff --git a/speedbridge2-common/build.gradle.kts b/gradle-wrapper.properties similarity index 100% rename from speedbridge2-common/build.gradle.kts rename to gradle-wrapper.properties diff --git a/settings.gradle.kts b/settings.gradle.kts index 66857bba..f3cad431 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,2 @@ rootProject.name = "SpeedBridge2" -include("speedbridge2-common") -include("speedbridge2-spigot-api") -include("speedbridge2-spigot-plugin") +include("spigot") diff --git a/speedbridge2-spigot-api/build.gradle.kts b/speedbridge2-spigot-api/build.gradle.kts deleted file mode 100644 index e69de29b..00000000 diff --git a/speedbridge2-spigot-plugin/build.gradle.kts b/spigot/build.gradle.kts similarity index 97% rename from speedbridge2-spigot-plugin/build.gradle.kts rename to spigot/build.gradle.kts index 0d2ebbd1..68a87851 100644 --- a/speedbridge2-spigot-plugin/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -3,8 +3,6 @@ plugins { } dependencies { - implementation(project(":speedbridge2-common")) - compileOnly("org.xerial:sqlite-jdbc:3.36.0.3") compileOnly("com.sk89q:worldedit:6.0.0-SNAPSHOT") diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/SpeedBridge.java b/spigot/src/main/java/io/tofpu/speedbridge2/SpeedBridge.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/SpeedBridge.java rename to spigot/src/main/java/io/tofpu/speedbridge2/SpeedBridge.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/AbstractLampRegistry.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/AbstractLampRegistry.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/AbstractLampRegistry.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/AbstractLampRegistry.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/CommandManager.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/CommandManager.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/CommandManager.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/CommandManager.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/NameAndUUID.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/NameAndUUID.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/NameAndUUID.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/NameAndUUID.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/AbstractCommandConditionWrapper.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/AbstractCommandConditionWrapper.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/AbstractCommandConditionWrapper.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/AbstractCommandConditionWrapper.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/LampConditionRegistry.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/LampConditionRegistry.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/LampConditionRegistry.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/LampConditionRegistry.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictConsoleCondition.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictConsoleCondition.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictConsoleCondition.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictConsoleCondition.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictDummyModelCondition.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictDummyModelCondition.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictDummyModelCondition.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictDummyModelCondition.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictSetupCondition.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictSetupCondition.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictSetupCondition.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/RestrictSetupCondition.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictConsole.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictConsole.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictConsole.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictConsole.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictDummyModel.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictDummyModel.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictDummyModel.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictDummyModel.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictSetup.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictSetup.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictSetup.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/condition/annotation/RestrictSetup.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/context/AbstractLampContext.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/context/AbstractLampContext.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/context/AbstractLampContext.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/context/AbstractLampContext.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/context/GameIslandContext.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/context/GameIslandContext.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/context/GameIslandContext.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/context/GameIslandContext.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/context/LampContextRegistry.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/context/LampContextRegistry.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/context/LampContextRegistry.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/context/LampContextRegistry.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/AbstractLampParser.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/parser/AbstractLampParser.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/AbstractLampParser.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/parser/AbstractLampParser.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/IslandParser.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/parser/IslandParser.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/IslandParser.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/parser/IslandParser.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/LampParseRegistry.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/parser/LampParseRegistry.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/LampParseRegistry.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/parser/LampParseRegistry.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/NameAndUUIDParser.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/parser/NameAndUUIDParser.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/NameAndUUIDParser.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/parser/NameAndUUIDParser.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/PlayerUUIDParser.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/parser/PlayerUUIDParser.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/PlayerUUIDParser.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/parser/PlayerUUIDParser.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/annotation/PlayerUUID.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/parser/annotation/PlayerUUID.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/parser/annotation/PlayerUUID.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/parser/annotation/PlayerUUID.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/CommandCompletion.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/CommandCompletion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/CommandCompletion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/CommandCompletion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/HelpCommandGenerator.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/HelpCommandGenerator.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/HelpCommandGenerator.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/HelpCommandGenerator.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/SpeedBridgeCommand.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/DestroyableLand.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/DestroyableLand.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/DestroyableLand.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/DestroyableLand.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/EmptyBridgePlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/EmptyBridgePlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/EmptyBridgePlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/EmptyBridgePlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/GameIsland2.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/GameIsland2.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/GameIsland2.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/GameIsland2.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/SpeedBridgeDebugCommand.java b/spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/SpeedBridgeDebugCommand.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/SpeedBridgeDebugCommand.java rename to spigot/src/main/java/io/tofpu/speedbridge2/command/subcommand/debug/SpeedBridgeDebugCommand.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/GameListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/GameListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/GameListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/GameListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/game/GameInteractionListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/game/GameInteractionListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/game/GameInteractionListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/game/GameInteractionListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/game/GameProtectionListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/game/GameProtectionListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/game/GameProtectionListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/game/GameProtectionListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/general/GeneralPluginListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/general/GeneralPluginListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/general/GeneralPluginListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/general/GeneralPluginListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/general/PlayerConnectionListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/general/PlayerConnectionListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/general/PlayerConnectionListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/general/PlayerConnectionListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/island/IslandProtectionListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/island/IslandProtectionListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/island/IslandProtectionListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/island/IslandProtectionListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/island/IslandRegionListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/island/IslandRegionListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/island/IslandRegionListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/island/IslandRegionListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/EventWrapper.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/EventWrapper.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/EventWrapper.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/EventWrapper.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/SpeedBridgeListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/SpeedBridgeListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/SpeedBridgeListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/SpeedBridgeListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockBreakEventWrapper.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockBreakEventWrapper.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockBreakEventWrapper.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockBreakEventWrapper.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockPlaceEventWrapper.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockPlaceEventWrapper.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockPlaceEventWrapper.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/BlockPlaceEventWrapper.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/PlayerInteractEventWrapper.java b/spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/PlayerInteractEventWrapper.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/PlayerInteractEventWrapper.java rename to spigot/src/main/java/io/tofpu/speedbridge2/listener/wrapper/wrappers/PlayerInteractEventWrapper.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/blockmenu/BlockMenuManager.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/blockmenu/BlockMenuManager.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/blockmenu/BlockMenuManager.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/blockmenu/BlockMenuManager.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/blockmenu/holder/BlockMenuHolder.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/blockmenu/holder/BlockMenuHolder.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/blockmenu/holder/BlockMenuHolder.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/blockmenu/holder/BlockMenuHolder.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/blockmenu/listener/BlockMenuListener.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/blockmenu/listener/BlockMenuListener.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/blockmenu/listener/BlockMenuListener.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/blockmenu/listener/BlockMenuListener.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/Message.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/Message.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/Message.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/Message.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/PlayerNameCache.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/PlayerNameCache.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/PlayerNameCache.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/PlayerNameCache.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/PluginExecutor.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/PluginExecutor.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/PluginExecutor.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/PluginExecutor.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/ItemConfiguration.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/ItemConfiguration.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/ItemConfiguration.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/ItemConfiguration.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/PluginConfiguration.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/PluginConfiguration.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/PluginConfiguration.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/PluginConfiguration.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/BlockMenuCategory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/BlockMenuCategory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/BlockMenuCategory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/BlockMenuCategory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GameCategory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GameCategory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GameCategory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GameCategory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GeneralCategory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GeneralCategory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GeneralCategory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/GeneralCategory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LeaderboardCategory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LeaderboardCategory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LeaderboardCategory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LeaderboardCategory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LobbyCategory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LobbyCategory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LobbyCategory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/category/LobbyCategory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/manager/ConfigurationManager.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/manager/ConfigurationManager.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/manager/ConfigurationManager.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/manager/ConfigurationManager.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/AbstractItemActionSerializer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/AbstractItemActionSerializer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/AbstractItemActionSerializer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/AbstractItemActionSerializer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemMetaSerializer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemMetaSerializer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemMetaSerializer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemMetaSerializer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemStackSerializer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemStackSerializer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemStackSerializer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/ItemStackSerializer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/LocationSerializer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/LocationSerializer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/LocationSerializer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/LocationSerializer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/MaterialSerializer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/MaterialSerializer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/MaterialSerializer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/MaterialSerializer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/UmbrellaItemSerializer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/UmbrellaItemSerializer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/UmbrellaItemSerializer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/config/serializer/UmbrellaItemSerializer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/DatabaseManager.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/DatabaseManager.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/DatabaseManager.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/DatabaseManager.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/Databases.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/Databases.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/Databases.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/Databases.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/Database.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/Database.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/Database.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/Database.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseQuery.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseQuery.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseQuery.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseQuery.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseSet.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseSet.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseSet.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseSet.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseTable.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseTable.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseTable.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/database/wrapper/DatabaseTable.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterBase.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterBase.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterBase.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterBase.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolder.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolder.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolder.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolder.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolderImpl.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolderImpl.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolderImpl.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/MessagePresenterHolderImpl.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessagePairPresenter.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessagePairPresenter.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessagePairPresenter.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessagePairPresenter.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessageTreePresenter.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessageTreePresenter.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessageTreePresenter.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/presenter/type/MessageTreePresenter.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/RunCommandItemAction.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/RunCommandItemAction.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/RunCommandItemAction.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/RunCommandItemAction.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/SerializableUmbrellaItem.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/SerializableUmbrellaItem.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/SerializableUmbrellaItem.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/umbrella/SerializableUmbrellaItem.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/BridgeUtil.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/BridgeUtil.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/BridgeUtil.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/BridgeUtil.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/DatabaseUtil.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/DatabaseUtil.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/DatabaseUtil.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/DatabaseUtil.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/FileUtil.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/FileUtil.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/FileUtil.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/FileUtil.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/IgnoreMessage.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/IgnoreMessage.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/IgnoreMessage.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/IgnoreMessage.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/MessageUtil.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/MessageUtil.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/MessageUtil.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/MessageUtil.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/ReflectionUtil.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/ReflectionUtil.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/ReflectionUtil.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/ReflectionUtil.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/UmbrellaUtil.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/UmbrellaUtil.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/UmbrellaUtil.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/UmbrellaUtil.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/UpdateChecker.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/UpdateChecker.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/util/UpdateChecker.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/util/UpdateChecker.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/ConfigurateFile.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/ConfigurateFile.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/ConfigurateFile.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/ConfigurateFile.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/FileConfigurationType.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/FileConfigurationType.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/FileConfigurationType.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/common/wrapper/FileConfigurationType.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandDatabase.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandDatabase.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandDatabase.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandDatabase.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandFactory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandFactory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandFactory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandFactory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandHandler.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandHandler.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandHandler.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandHandler.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandRepository.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandRepository.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandRepository.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandRepository.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandService.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandService.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/IslandService.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/IslandService.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/arena/ArenaManager.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/arena/ArenaManager.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/arena/ArenaManager.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/arena/ArenaManager.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandDatabaseExceptionWrapper.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandDatabaseExceptionWrapper.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandDatabaseExceptionWrapper.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandDatabaseExceptionWrapper.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandLoadFailureException.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandLoadFailureException.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandLoadFailureException.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/exception/IslandLoadFailureException.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/EmptyIsland.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/EmptyIsland.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/EmptyIsland.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/EmptyIsland.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/GameIsland.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/GameIsland.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/GameIsland.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/GameIsland.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/Island.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/Island.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/Island.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/Island.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuild.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuild.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuild.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuild.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuilder.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuilder.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuilder.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/IslandBuilder.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/land/IslandLand.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/land/IslandLand.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/land/IslandLand.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/land/IslandLand.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandBuildSetup.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandBuildSetup.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandBuildSetup.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandBuildSetup.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetup.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetup.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetup.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetup.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupFactory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupFactory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupFactory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupFactory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupHandler.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupHandler.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupHandler.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetupHandler.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/umbrella/IslandSetupUmbrella.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/umbrella/IslandSetupUmbrella.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/umbrella/IslandSetupUmbrella.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/umbrella/IslandSetupUmbrella.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/umbrella/GameIslandUmbrella.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/umbrella/GameIslandUmbrella.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/island/object/umbrella/GameIslandUmbrella.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/umbrella/GameIslandUmbrella.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/IslandBoard.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/IslandBoard.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/IslandBoard.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/IslandBoard.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/Leaderboard.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/Leaderboard.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/Leaderboard.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/Leaderboard.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/LeaderboardMap.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/LeaderboardMap.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/LeaderboardMap.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/LeaderboardMap.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/BoardLoader.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/BoardLoader.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/BoardLoader.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/BoardLoader.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/IslandLoader.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/IslandLoader.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/IslandLoader.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/IslandLoader.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/PlayerPositionLoader.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/PlayerPositionLoader.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/PlayerPositionLoader.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/loader/PlayerPositionLoader.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/BoardPlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/BoardPlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/BoardPlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/BoardPlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/IslandBoardPlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/IslandBoardPlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/IslandBoardPlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/leaderboard/object/IslandBoardPlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerDatabase.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerDatabase.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerDatabase.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerDatabase.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerFactory.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerFactory.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerFactory.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerFactory.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerHandler.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerHandler.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerHandler.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerHandler.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerService.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerService.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/PlayerService.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/PlayerService.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/ResetType.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/ResetType.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/ResetType.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/ResetType.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDatabaseExceptionWrapper.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDatabaseExceptionWrapper.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDatabaseExceptionWrapper.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDatabaseExceptionWrapper.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDeletionFailureException.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDeletionFailureException.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDeletionFailureException.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerDeletionFailureException.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerLoadFailureException.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerLoadFailureException.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerLoadFailureException.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerLoadFailureException.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateFailureException.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateFailureException.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateFailureException.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateFailureException.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateNameFailureException.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateNameFailureException.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateNameFailureException.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/exception/PlayerUpdateNameFailureException.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/loader/PlayerLoader.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/loader/PlayerLoader.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/loader/PlayerLoader.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/loader/PlayerLoader.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/BridgePlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/BridgePlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/BridgePlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/BridgePlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/CommonBridgePlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/CommonBridgePlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/CommonBridgePlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/CommonBridgePlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/DummyBridgePlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/DummyBridgePlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/DummyBridgePlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/DummyBridgePlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/GamePlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/GamePlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/GamePlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/GamePlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/SenderBridgePlayer.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/SenderBridgePlayer.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/SenderBridgePlayer.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/SenderBridgePlayer.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockChoice.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockChoice.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockChoice.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockChoice.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockDatabase.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockDatabase.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockDatabase.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/block/BlockDatabase.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/score/Score.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/score/Score.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/score/Score.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/score/Score.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/score/ScoreDatabase.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/score/ScoreDatabase.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/score/ScoreDatabase.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/score/ScoreDatabase.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/session/SessionScore.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/session/SessionScore.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/session/SessionScore.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/session/SessionScore.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/setup/SetupMeta.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/setup/SetupMeta.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/setup/SetupMeta.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/setup/SetupMeta.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStat.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStat.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStat.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStat.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStatType.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStatType.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStatType.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/PlayerStatType.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/StatsDatabase.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/StatsDatabase.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/StatsDatabase.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/StatsDatabase.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/type/SimplePlayerStat.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/type/SimplePlayerStat.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/type/SimplePlayerStat.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/player/object/stat/type/SimplePlayerStat.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/PluginExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/PluginExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/PluginExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/PluginExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/AbstractExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/AbstractExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/AbstractExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/AbstractExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/ExpansionHandler.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/ExpansionHandler.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/ExpansionHandler.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/ExpansionHandler.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BestScoreExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BestScoreExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BestScoreExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BestScoreExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BlocksExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BlocksExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BlocksExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/BlocksExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/IslandSlotExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/IslandSlotExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/IslandSlotExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/IslandSlotExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/LeaderboardExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/LeaderboardExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/LeaderboardExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/LeaderboardExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/PositionExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/PositionExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/PositionExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/PositionExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TimerExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TimerExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TimerExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TimerExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TotalStatsExpansion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TotalStatsExpansion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TotalStatsExpansion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/placeholderapi/expansion/expansions/TotalStatsExpansion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/CuboidRegion.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/CuboidRegion.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/CuboidRegion.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/CuboidRegion.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/Vector.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/Vector.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/Vector.java rename to spigot/src/main/java/io/tofpu/speedbridge2/model/support/worldedit/Vector.java diff --git a/speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/plugin/SpeedBridgePlugin.java b/spigot/src/main/java/io/tofpu/speedbridge2/plugin/SpeedBridgePlugin.java similarity index 100% rename from speedbridge2-spigot-plugin/src/main/java/io/tofpu/speedbridge2/plugin/SpeedBridgePlugin.java rename to spigot/src/main/java/io/tofpu/speedbridge2/plugin/SpeedBridgePlugin.java diff --git a/speedbridge2-spigot-plugin/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml similarity index 100% rename from speedbridge2-spigot-plugin/src/main/resources/plugin.yml rename to spigot/src/main/resources/plugin.yml