From b0f8852198148772f19bd85b5f880380c62fc60e Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Tue, 11 Jun 2019 22:25:07 -0400
Subject: [PATCH] Bump to 7.0.0. Rename -legacy to -bukkit.

---
 build.gradle                                              | 8 ++++----
 settings.gradle                                           | 2 +-
 {worldguard-legacy => worldguard-bukkit}/build.gradle     | 0
 .../contrib/blacklist_table.sql                           | 0
 .../contrib/region_manual_update_20110325.sql             | 0
 .../worldguard/bukkit/BukkitConfigurationManager.java     | 0
 .../com/sk89q/worldguard/bukkit/BukkitDebugHandler.java   | 0
 .../com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java  | 0
 .../java/com/sk89q/worldguard/bukkit/BukkitPlayer.java    | 0
 .../sk89q/worldguard/bukkit/BukkitRegionContainer.java    | 0
 .../com/sk89q/worldguard/bukkit/BukkitStringMatcher.java  | 0
 .../main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java | 0
 .../sk89q/worldguard/bukkit/BukkitWorldConfiguration.java | 0
 .../sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java | 0
 .../java/com/sk89q/worldguard/bukkit/ProtectionQuery.java | 0
 .../com/sk89q/worldguard/bukkit/WorldGuardPlugin.java     | 0
 .../java/com/sk89q/worldguard/bukkit/cause/Cause.java     | 0
 .../bukkit/chest/BukkitSignChestProtection.java           | 0
 .../java/com/sk89q/worldguard/bukkit/event/BulkEvent.java | 0
 .../com/sk89q/worldguard/bukkit/event/DelegateEvent.java  | 0
 .../com/sk89q/worldguard/bukkit/event/DelegateEvents.java | 0
 .../com/sk89q/worldguard/bukkit/event/Handleable.java     | 0
 .../worldguard/bukkit/event/block/AbstractBlockEvent.java | 0
 .../worldguard/bukkit/event/block/BreakBlockEvent.java    | 0
 .../worldguard/bukkit/event/block/PlaceBlockEvent.java    | 0
 .../worldguard/bukkit/event/block/UseBlockEvent.java      | 0
 .../worldguard/bukkit/event/debug/CancelAttempt.java      | 0
 .../sk89q/worldguard/bukkit/event/debug/CancelLogger.java | 0
 .../worldguard/bukkit/event/debug/CancelLogging.java      | 0
 .../bukkit/event/debug/LoggingBlockBreakEvent.java        | 0
 .../bukkit/event/debug/LoggingBlockPlaceEvent.java        | 0
 .../event/debug/LoggingEntityDamageByEntityEvent.java     | 0
 .../bukkit/event/debug/LoggingPlayerInteractEvent.java    | 0
 .../bukkit/event/entity/AbstractEntityEvent.java          | 0
 .../worldguard/bukkit/event/entity/DamageEntityEvent.java | 0
 .../bukkit/event/entity/DestroyEntityEvent.java           | 0
 .../worldguard/bukkit/event/entity/SpawnEntityEvent.java  | 0
 .../worldguard/bukkit/event/entity/UseEntityEvent.java    | 0
 .../worldguard/bukkit/event/inventory/UseItemEvent.java   | 0
 .../bukkit/event/player/ProcessPlayerEvent.java           | 0
 .../worldguard/bukkit/internal/TargetMatcherSet.java      | 0
 .../com/sk89q/worldguard/bukkit/internal/WGMetadata.java  | 0
 .../worldguard/bukkit/listener/AbstractListener.java      | 0
 .../worldguard/bukkit/listener/BlacklistListener.java     | 0
 .../bukkit/listener/BlockStateAsBlockFunction.java        | 0
 .../bukkit/listener/BlockedPotionsListener.java           | 0
 .../bukkit/listener/BuildPermissionListener.java          | 0
 .../bukkit/listener/ChestProtectionListener.java          | 0
 .../worldguard/bukkit/listener/DebuggingListener.java     | 0
 .../bukkit/listener/EventAbstractionListener.java         | 0
 .../worldguard/bukkit/listener/InvincibilityListener.java | 0
 .../worldguard/bukkit/listener/PlayerModesListener.java   | 0
 .../worldguard/bukkit/listener/PlayerMoveListener.java    | 0
 .../worldguard/bukkit/listener/RegionFlagsListener.java   | 0
 .../bukkit/listener/RegionProtectionListener.java         | 0
 .../bukkit/listener/WorldGuardBlockListener.java          | 0
 .../bukkit/listener/WorldGuardCommandBookListener.java    | 0
 .../bukkit/listener/WorldGuardEntityListener.java         | 0
 .../bukkit/listener/WorldGuardHangingListener.java        | 0
 .../bukkit/listener/WorldGuardPlayerListener.java         | 0
 .../bukkit/listener/WorldGuardServerListener.java         | 0
 .../bukkit/listener/WorldGuardVehicleListener.java        | 0
 .../bukkit/listener/WorldGuardWeatherListener.java        | 0
 .../bukkit/listener/WorldGuardWorldListener.java          | 0
 .../worldguard/bukkit/listener/WorldRulesListener.java    | 0
 .../bukkit/listener/debounce/BlockPistonExtendKey.java    | 0
 .../bukkit/listener/debounce/BlockPistonRetractKey.java   | 0
 .../bukkit/listener/debounce/EventDebounce.java           | 0
 .../listener/debounce/legacy/AbstractEventDebounce.java   | 0
 .../debounce/legacy/BlockEntityEventDebounce.java         | 0
 .../debounce/legacy/EntityEntityEventDebounce.java        | 0
 .../debounce/legacy/InventoryMoveItemEventDebounce.java   | 0
 .../bukkit/protection/events/DisallowedPVPEvent.java      | 0
 .../protection/events/flags/FlagContextCreateEvent.java   | 0
 .../worldguard/bukkit/session/BukkitSessionManager.java   | 0
 .../java/com/sk89q/worldguard/bukkit/util/Blocks.java     | 0
 .../java/com/sk89q/worldguard/bukkit/util/Entities.java   | 0
 .../java/com/sk89q/worldguard/bukkit/util/Events.java     | 0
 .../com/sk89q/worldguard/bukkit/util/HandlerTracer.java   | 0
 .../com/sk89q/worldguard/bukkit/util/InteropUtils.java    | 0
 .../java/com/sk89q/worldguard/bukkit/util/Materials.java  | 0
 .../bukkit/util/logging/ClassSourceValidator.java         | 0
 .../sk89q/worldguard/bukkit/util/report/CancelReport.java | 0
 .../worldguard/bukkit/util/report/PerformanceReport.java  | 0
 .../sk89q/worldguard/bukkit/util/report/PluginReport.java | 0
 .../worldguard/bukkit/util/report/SchedulerReport.java    | 0
 .../sk89q/worldguard/bukkit/util/report/ServerReport.java | 0
 .../worldguard/bukkit/util/report/ServicesReport.java     | 0
 .../sk89q/worldguard/bukkit/util/report/WorldReport.java  | 0
 .../src/main/resources/defaults/blacklist.txt             | 0
 .../src/main/resources/defaults/config.yml                | 0
 .../src/main/resources/defaults/config_world.yml          | 0
 .../resources/migrations/region/mysql/V1__Initial.sql     | 0
 .../migrations/region/mysql/V2__Bug_fix_and_UUID.sql      | 0
 .../resources/migrations/region/sqlite/V1__Initial.sql    | 0
 .../src/main/resources/plugin.yml                         | 0
 96 files changed, 5 insertions(+), 5 deletions(-)
 rename {worldguard-legacy => worldguard-bukkit}/build.gradle (100%)
 rename {worldguard-legacy => worldguard-bukkit}/contrib/blacklist_table.sql (100%)
 rename {worldguard-legacy => worldguard-bukkit}/contrib/region_manual_update_20110325.sql (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/resources/defaults/blacklist.txt (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/resources/defaults/config.yml (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/resources/defaults/config_world.yml (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/resources/migrations/region/mysql/V1__Initial.sql (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/resources/migrations/region/sqlite/V1__Initial.sql (100%)
 rename {worldguard-legacy => worldguard-bukkit}/src/main/resources/plugin.yml (100%)

diff --git a/build.gradle b/build.gradle
index ec9dfc7f..86052d65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@
 
 allprojects {
     group = 'com.sk89q.worldguard'
-    version = '7.0.0-SNAPSHOT'
+    version = '7.0.0'
 }
 
 if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl = "http://localhost"
@@ -84,10 +84,10 @@
     repositories {
         mavenLocal()
         mavenCentral()
-        maven { url "http://repo.spongepowered.org/maven/" }
+        maven { url "https://repo.spongepowered.org/maven/" }
         maven { url "https://hub.spigotmc.org/nexus/content/groups/public" }
-        maven { url "http://maven.sk89q.com/repo/" }
-        maven { url "http://repo.maven.apache.org/maven2" }
+        maven { url "https://maven.sk89q.com/repo/" }
+        maven { url "https://repo.maven.apache.org/maven2" }
     }
 
     if (JavaVersion.current().isJava8Compatible()) {
diff --git a/settings.gradle b/settings.gradle
index bad689fe..2b53ed70 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = 'worldguard'
 
-include 'worldguard-core', 'worldguard-legacy'
+include 'worldguard-core', 'worldguard-bukkit'
diff --git a/worldguard-legacy/build.gradle b/worldguard-bukkit/build.gradle
similarity index 100%
rename from worldguard-legacy/build.gradle
rename to worldguard-bukkit/build.gradle
diff --git a/worldguard-legacy/contrib/blacklist_table.sql b/worldguard-bukkit/contrib/blacklist_table.sql
similarity index 100%
rename from worldguard-legacy/contrib/blacklist_table.sql
rename to worldguard-bukkit/contrib/blacklist_table.sql
diff --git a/worldguard-legacy/contrib/region_manual_update_20110325.sql b/worldguard-bukkit/contrib/region_manual_update_20110325.sql
similarity index 100%
rename from worldguard-legacy/contrib/region_manual_update_20110325.sql
rename to worldguard-bukkit/contrib/region_manual_update_20110325.sql
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java
similarity index 100%
rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java
rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java
diff --git a/worldguard-legacy/src/main/resources/defaults/blacklist.txt b/worldguard-bukkit/src/main/resources/defaults/blacklist.txt
similarity index 100%
rename from worldguard-legacy/src/main/resources/defaults/blacklist.txt
rename to worldguard-bukkit/src/main/resources/defaults/blacklist.txt
diff --git a/worldguard-legacy/src/main/resources/defaults/config.yml b/worldguard-bukkit/src/main/resources/defaults/config.yml
similarity index 100%
rename from worldguard-legacy/src/main/resources/defaults/config.yml
rename to worldguard-bukkit/src/main/resources/defaults/config.yml
diff --git a/worldguard-legacy/src/main/resources/defaults/config_world.yml b/worldguard-bukkit/src/main/resources/defaults/config_world.yml
similarity index 100%
rename from worldguard-legacy/src/main/resources/defaults/config_world.yml
rename to worldguard-bukkit/src/main/resources/defaults/config_world.yml
diff --git a/worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql b/worldguard-bukkit/src/main/resources/migrations/region/mysql/V1__Initial.sql
similarity index 100%
rename from worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql
rename to worldguard-bukkit/src/main/resources/migrations/region/mysql/V1__Initial.sql
diff --git a/worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql b/worldguard-bukkit/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql
similarity index 100%
rename from worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql
rename to worldguard-bukkit/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql
diff --git a/worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql b/worldguard-bukkit/src/main/resources/migrations/region/sqlite/V1__Initial.sql
similarity index 100%
rename from worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql
rename to worldguard-bukkit/src/main/resources/migrations/region/sqlite/V1__Initial.sql
diff --git a/worldguard-legacy/src/main/resources/plugin.yml b/worldguard-bukkit/src/main/resources/plugin.yml
similarity index 100%
rename from worldguard-legacy/src/main/resources/plugin.yml
rename to worldguard-bukkit/src/main/resources/plugin.yml