diff --git a/bukkit0/build.gradle b/bukkit/build.gradle
similarity index 54%
rename from bukkit0/build.gradle
rename to bukkit/build.gradle
index 9da4a980..f455940d 100644
--- a/bukkit0/build.gradle
+++ b/bukkit/build.gradle
@@ -17,4 +17,34 @@ dependencies {
     compile 'com.sk89q.worldedit:worldedit-bukkit:6.1.4-SNAPSHOT'
     compile 'com.sk89q.worldedit:worldedit-core:6.1.4-SNAPSHOT'
     compile 'com.thevoxelbox.voxelsniper:voxelsniper:5.171.0'
-}
\ No newline at end of file
+    compile 'org.bukkit.craftbukkit.v1_9R2:craftbukkitv1_9R2:1.9.4'
+    compile 'org.bukkit.craftbukkit:Craftbukkit:1.7.10'
+    compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
+}
+
+processResources {
+    from('src/main/resources') {
+        include 'plugin.yml'
+        expand(
+                name: project.parent.name,
+                version: project.parent.version
+        )
+    }
+}
+
+apply plugin: 'com.github.johnrengelman.shadow'
+// We only want the shadow jar produced
+jar.enabled = false
+shadowJar {
+    dependencies {
+        include(dependency(':core'))
+    }
+    archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
+    destinationDir = file '../target'
+}
+shadowJar.doLast {
+    task ->
+        ant.checksum file: task.archivePath
+}
+
+build.dependsOn(shadowJar);
\ No newline at end of file
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/ABukkitMain.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitMain.java
similarity index 52%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/ABukkitMain.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitMain.java
index e9cccb5b..5048e878 100644
--- a/bukkit0/src/main/java/com/boydti/fawe/bukkit/ABukkitMain.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitMain.java
@@ -1,6 +1,13 @@
 package com.boydti.fawe.bukkit;
 
 import com.boydti.fawe.Fawe;
+import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
+import com.boydti.fawe.bukkit.v0.BukkitQueue_All;
+import com.boydti.fawe.bukkit.v1_10.BukkitQueue_1_10;
+import com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11;
+import com.boydti.fawe.bukkit.v1_7.BukkitQueue17;
+import com.boydti.fawe.bukkit.v1_8.BukkitQueue18R3;
+import com.boydti.fawe.bukkit.v1_9.BukkitQueue_1_9_R1;
 import com.boydti.fawe.object.FaweQueue;
 import com.sk89q.worldedit.world.World;
 import java.lang.reflect.Field;
@@ -13,7 +20,7 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
-public abstract class ABukkitMain extends JavaPlugin {
+public class BukkitMain extends JavaPlugin {
 
     static {
         {   // Disable AWE as otherwise both fail to load
@@ -49,12 +56,62 @@ public abstract class ABukkitMain extends JavaPlugin {
         }
     }
 
+    private Version version = Version.NONE;
+
     @Override
     public void onEnable() {
         FaweBukkit imp = new FaweBukkit(this);
+        for (Version v : Version.values()) {
+            try {
+                BukkitQueue_0.checkVersion(v.name());
+                this.version = v;
+                break;
+            } catch (IllegalStateException e) {}
+        }
     }
 
-    public abstract FaweQueue getQueue(World world);
+    private enum Version {
+        v1_7_R4,
+        v1_8_R3,
+        v1_9_R2,
+        v1_10_R1,
+        v1_11_R1,
+        NONE,
+    }
 
-    public abstract FaweQueue getQueue(String world);
+    public FaweQueue getQueue(World world) {
+        switch (version) {
+            case v1_7_R4:
+                return new BukkitQueue17(world);
+            case v1_8_R3:
+                return new BukkitQueue18R3(world);
+            case v1_9_R2:
+                return new BukkitQueue_1_9_R1(world);
+            case v1_10_R1:
+                return new BukkitQueue_1_10(world);
+            case v1_11_R1:
+                return new BukkitQueue_1_11(world);
+            default:
+            case NONE:
+                return new BukkitQueue_All(world);
+        }
+    }
+
+    public FaweQueue getQueue(String world) {
+        switch (version) {
+            case v1_7_R4:
+                return new BukkitQueue17(world);
+            case v1_8_R3:
+                return new BukkitQueue18R3(world);
+            case v1_9_R2:
+                return new BukkitQueue_1_9_R1(world);
+            case v1_10_R1:
+                return new BukkitQueue_1_10(world);
+            case v1_11_R1:
+                return new BukkitQueue_1_11(world);
+            default:
+            case NONE:
+                return new BukkitQueue_All(world);
+        }
+    }
 }
\ No newline at end of file
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitTaskMan.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitTaskMan.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitTaskMan.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitTaskMan.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
similarity index 99%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
index 189523f5..e352f92f 100644
--- a/bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
@@ -42,7 +42,7 @@ import org.primesoft.blockshub.BlocksHubBukkit;
 
 public class FaweBukkit implements IFawe, Listener {
 
-    private final ABukkitMain plugin;
+    private final BukkitMain plugin;
     private VaultUtil vault;
     private WorldEditPlugin worldedit;
 
@@ -57,7 +57,7 @@ public class FaweBukkit implements IFawe, Listener {
         return this.worldedit;
     }
 
-    public FaweBukkit(ABukkitMain plugin) {
+    public FaweBukkit(BukkitMain plugin) {
         this.plugin = plugin;
         try {
             Fawe.set(this);
@@ -248,7 +248,7 @@ public class FaweBukkit implements IFawe, Listener {
         return new BukkitQueue_All(world);
     }
 
-    public ABukkitMain getPlugin() {
+    public BukkitMain getPlugin() {
         return plugin;
     }
 
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/Metrics.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/Metrics.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/Metrics.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/Metrics.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/VaultUtil.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/VaultUtil.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/VaultUtil.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/VaultUtil.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMaskManager.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMaskManager.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMaskManager.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMaskManager.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsOneFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsOneFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsOneFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsOneFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/GriefPreventionFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/GriefPreventionFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/GriefPreventionFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/GriefPreventionFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/TownyFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/TownyFeature.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/TownyFeature.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/TownyFeature.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
similarity index 99%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
index a1646046..b794f58e 100644
--- a/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
@@ -73,7 +73,7 @@ public abstract class BukkitQueue_0<CHUNK, CHUNKSECTIONS, SECTION> extends NMSMa
         return false;
     }
 
-    public void checkVersion(String supported) {
+    public static void checkVersion(String supported) {
         String version = Bukkit.getServer().getClass().getPackage().getName();
         if (!version.contains(supported)) {
             Fawe.debug("This version of FAWE is for: " + supported);
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java
diff --git a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java
similarity index 100%
rename from bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java
diff --git a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
similarity index 88%
rename from bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
index 26bcbb55..dd1ed29f 100644
--- a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
@@ -24,33 +24,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutorCompletionService;
-import net.minecraft.server.v1_10_R1.Block;
-import net.minecraft.server.v1_10_R1.BlockPosition;
-import net.minecraft.server.v1_10_R1.ChunkSection;
-import net.minecraft.server.v1_10_R1.DataBits;
-import net.minecraft.server.v1_10_R1.DataPaletteBlock;
-import net.minecraft.server.v1_10_R1.Entity;
-import net.minecraft.server.v1_10_R1.EntityPlayer;
-import net.minecraft.server.v1_10_R1.EntityTracker;
-import net.minecraft.server.v1_10_R1.EntityTypes;
-import net.minecraft.server.v1_10_R1.EnumDifficulty;
-import net.minecraft.server.v1_10_R1.EnumGamemode;
-import net.minecraft.server.v1_10_R1.EnumSkyBlock;
-import net.minecraft.server.v1_10_R1.IBlockData;
-import net.minecraft.server.v1_10_R1.IDataManager;
-import net.minecraft.server.v1_10_R1.MinecraftServer;
-import net.minecraft.server.v1_10_R1.NBTTagCompound;
-import net.minecraft.server.v1_10_R1.NibbleArray;
-import net.minecraft.server.v1_10_R1.PacketPlayOutMapChunk;
-import net.minecraft.server.v1_10_R1.PlayerChunk;
-import net.minecraft.server.v1_10_R1.PlayerChunkMap;
-import net.minecraft.server.v1_10_R1.ServerNBTManager;
-import net.minecraft.server.v1_10_R1.TileEntity;
-import net.minecraft.server.v1_10_R1.WorldData;
-import net.minecraft.server.v1_10_R1.WorldManager;
-import net.minecraft.server.v1_10_R1.WorldServer;
-import net.minecraft.server.v1_10_R1.WorldSettings;
-import net.minecraft.server.v1_10_R1.WorldType;
+import net.minecraft.server.v1_10_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -276,32 +250,28 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
         if (!chunk.isLoaded()) {
             return;
         }
-        try {
-            net.minecraft.server.v1_10_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
-            WorldServer w = (WorldServer) nmsChunk.getWorld();
-            PlayerChunkMap chunkMap = w.getPlayerChunkMap();
-            PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
-            if (playerChunk == null) {
-                return;
-            }
-            if (playerChunk.c.isEmpty()) {
-                return;
-            }
-            // Send chunks
-            int mask = fc.getBitMask();
-            if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
-                PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
-                for (EntityPlayer player : playerChunk.c) {
-                    player.playerConnection.sendPacket(packet);
-                }
-                mask = 255;
-            }
-            PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
+        net.minecraft.server.v1_10_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
+        WorldServer w = (WorldServer) nmsChunk.getWorld();
+        PlayerChunkMap chunkMap = w.getPlayerChunkMap();
+        PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
+        if (playerChunk == null) {
+            return;
+        }
+        if (playerChunk.c.isEmpty()) {
+            return;
+        }
+        // Send chunks
+        int mask = fc.getBitMask();
+        if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
+            PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
             for (EntityPlayer player : playerChunk.c) {
                 player.playerConnection.sendPacket(packet);
             }
-        } catch (Throwable e) {
-            e.printStackTrace();
+            mask = 255;
+        }
+        PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
+        for (EntityPlayer player : playerChunk.c) {
+            player.playerConnection.sendPacket(packet);
         }
     }
 
@@ -541,6 +511,6 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
 
     @Override
     public BukkitChunk_1_10 getFaweChunk(int x, int z) {
-        return new com.boydti.fawe.bukkit.v1_10.BukkitChunk_1_10(this, x, z);
+        return new BukkitChunk_1_10(this, x, z);
     }
 }
diff --git a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java
similarity index 92%
rename from bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java
index 11da9e86..f1ba0989 100644
--- a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java
@@ -30,25 +30,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
-import net.minecraft.server.v1_10_R1.BiomeBase;
-import net.minecraft.server.v1_10_R1.BlockPosition;
-import net.minecraft.server.v1_10_R1.EntityTypes;
-import net.minecraft.server.v1_10_R1.NBTBase;
-import net.minecraft.server.v1_10_R1.NBTTagByte;
-import net.minecraft.server.v1_10_R1.NBTTagByteArray;
-import net.minecraft.server.v1_10_R1.NBTTagCompound;
-import net.minecraft.server.v1_10_R1.NBTTagDouble;
-import net.minecraft.server.v1_10_R1.NBTTagEnd;
-import net.minecraft.server.v1_10_R1.NBTTagFloat;
-import net.minecraft.server.v1_10_R1.NBTTagInt;
-import net.minecraft.server.v1_10_R1.NBTTagIntArray;
-import net.minecraft.server.v1_10_R1.NBTTagList;
-import net.minecraft.server.v1_10_R1.NBTTagLong;
-import net.minecraft.server.v1_10_R1.NBTTagShort;
-import net.minecraft.server.v1_10_R1.NBTTagString;
-import net.minecraft.server.v1_10_R1.TileEntity;
-import net.minecraft.server.v1_10_R1.World;
-import net.minecraft.server.v1_10_R1.WorldServer;
+import net.minecraft.server.v1_10_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
similarity index 100%
rename from bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
diff --git a/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
similarity index 95%
rename from bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
index 7e768b2d..0bf9538e 100644
--- a/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
@@ -250,32 +250,28 @@ public class BukkitQueue_1_11 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
         if (!chunk.isLoaded()) {
             return;
         }
-        try {
-            net.minecraft.server.v1_11_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
-            WorldServer w = (WorldServer) nmsChunk.getWorld();
-            PlayerChunkMap chunkMap = w.getPlayerChunkMap();
-            PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
-            if (playerChunk == null) {
-                return;
-            }
-            if (playerChunk.c.isEmpty()) {
-                return;
-            }
-            // Send chunks
-            int mask = fc.getBitMask();
-            if (mask == 0 || mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
-                PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
-                for (EntityPlayer player : playerChunk.c) {
-                    player.playerConnection.sendPacket(packet);
-                }
-                mask = 255;
-            }
-            PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
+        net.minecraft.server.v1_11_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
+        WorldServer w = (WorldServer) nmsChunk.getWorld();
+        PlayerChunkMap chunkMap = w.getPlayerChunkMap();
+        PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
+        if (playerChunk == null) {
+            return;
+        }
+        if (playerChunk.c.isEmpty()) {
+            return;
+        }
+        // Send chunks
+        int mask = fc.getBitMask();
+        if (mask == 0 || mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
+            PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
             for (EntityPlayer player : playerChunk.c) {
                 player.playerConnection.sendPacket(packet);
             }
-        } catch (Throwable e) {
-            e.printStackTrace();
+            mask = 255;
+        }
+        PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
+        for (EntityPlayer player : playerChunk.c) {
+            player.playerConnection.sendPacket(packet);
         }
     }
 
diff --git a/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java
similarity index 95%
rename from bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java
index be1c7a79..e6fb0d8c 100644
--- a/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java
@@ -71,23 +71,23 @@ public final class FaweAdapter_1_11 implements BukkitImplAdapter
     }
 
     @Nullable
-    private static String getEntityId(net.minecraft.server.v1_11_R1.Entity entity)
+    private static String getEntityId(Entity entity)
     {
         return EntityTypes.b(entity);
     }
 
     @Nullable
-    private static net.minecraft.server.v1_11_R1.Entity createEntityFromId(String id, World world)
+    private static Entity createEntityFromId(String id, World world)
     {
         return EntityTypes.a(new MinecraftKey(id), world);
     }
 
-    private static void readTagIntoEntity(NBTTagCompound tag, net.minecraft.server.v1_11_R1.Entity entity)
+    private static void readTagIntoEntity(NBTTagCompound tag, Entity entity)
     {
         entity.f(tag);
     }
 
-    private static void readEntityIntoTag(net.minecraft.server.v1_11_R1.Entity entity, NBTTagCompound tag)
+    private static void readEntityIntoTag(Entity entity, NBTTagCompound tag)
     {
         entity.e(tag);
     }
@@ -169,7 +169,7 @@ public final class FaweAdapter_1_11 implements BukkitImplAdapter
         Preconditions.checkNotNull(entity);
 
         CraftEntity craftEntity = (CraftEntity)entity;
-        net.minecraft.server.v1_11_R1.Entity mcEntity = craftEntity.getHandle();
+        Entity mcEntity = craftEntity.getHandle();
 
         String id = getEntityId(mcEntity);
         if (id != null) {
@@ -190,7 +190,7 @@ public final class FaweAdapter_1_11 implements BukkitImplAdapter
         CraftWorld craftWorld = (CraftWorld)location.getWorld();
         WorldServer worldServer = craftWorld.getHandle();
 
-        net.minecraft.server.v1_11_R1.Entity createdEntity = createEntityFromId(state.getTypeId(), craftWorld.getHandle());
+        Entity createdEntity = createEntityFromId(state.getTypeId(), craftWorld.getHandle());
         if (createdEntity != null)
         {
             CompoundTag nativeTag = state.getNbtData();
diff --git a/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
similarity index 100%
rename from bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
diff --git a/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
similarity index 93%
rename from bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
index 6014f6f6..bbc50993 100644
--- a/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
@@ -22,29 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import net.minecraft.server.v1_7_R4.Block;
-import net.minecraft.server.v1_7_R4.ChunkCoordIntPair;
-import net.minecraft.server.v1_7_R4.ChunkPosition;
-import net.minecraft.server.v1_7_R4.ChunkSection;
-import net.minecraft.server.v1_7_R4.Entity;
-import net.minecraft.server.v1_7_R4.EntityPlayer;
-import net.minecraft.server.v1_7_R4.EntityTracker;
-import net.minecraft.server.v1_7_R4.EntityTypes;
-import net.minecraft.server.v1_7_R4.EnumDifficulty;
-import net.minecraft.server.v1_7_R4.EnumGamemode;
-import net.minecraft.server.v1_7_R4.EnumSkyBlock;
-import net.minecraft.server.v1_7_R4.LongHashMap;
-import net.minecraft.server.v1_7_R4.MinecraftServer;
-import net.minecraft.server.v1_7_R4.NBTTagCompound;
-import net.minecraft.server.v1_7_R4.NibbleArray;
-import net.minecraft.server.v1_7_R4.PacketPlayOutMapChunk;
-import net.minecraft.server.v1_7_R4.PlayerChunkMap;
-import net.minecraft.server.v1_7_R4.ServerNBTManager;
-import net.minecraft.server.v1_7_R4.TileEntity;
-import net.minecraft.server.v1_7_R4.WorldManager;
-import net.minecraft.server.v1_7_R4.WorldServer;
-import net.minecraft.server.v1_7_R4.WorldSettings;
-import net.minecraft.server.v1_7_R4.WorldType;
+import net.minecraft.server.v1_7_R4.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
diff --git a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java
similarity index 100%
rename from bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java
diff --git a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
similarity index 93%
rename from bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
index edefd5f9..3da8ae61 100644
--- a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
@@ -23,29 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import net.minecraft.server.v1_8_R3.Block;
-import net.minecraft.server.v1_8_R3.BlockPosition;
-import net.minecraft.server.v1_8_R3.ChunkSection;
-import net.minecraft.server.v1_8_R3.Entity;
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.EntityTracker;
-import net.minecraft.server.v1_8_R3.EntityTypes;
-import net.minecraft.server.v1_8_R3.EnumDifficulty;
-import net.minecraft.server.v1_8_R3.EnumSkyBlock;
-import net.minecraft.server.v1_8_R3.LongHashMap;
-import net.minecraft.server.v1_8_R3.MinecraftServer;
-import net.minecraft.server.v1_8_R3.NBTTagCompound;
-import net.minecraft.server.v1_8_R3.NibbleArray;
-import net.minecraft.server.v1_8_R3.Packet;
-import net.minecraft.server.v1_8_R3.PacketPlayOutMapChunk;
-import net.minecraft.server.v1_8_R3.PlayerChunkMap;
-import net.minecraft.server.v1_8_R3.ServerNBTManager;
-import net.minecraft.server.v1_8_R3.TileEntity;
-import net.minecraft.server.v1_8_R3.WorldData;
-import net.minecraft.server.v1_8_R3.WorldManager;
-import net.minecraft.server.v1_8_R3.WorldServer;
-import net.minecraft.server.v1_8_R3.WorldSettings;
-import net.minecraft.server.v1_8_R3.WorldType;
+import net.minecraft.server.v1_8_R3.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -305,8 +283,10 @@ public class BukkitQueue18R3 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkS
                     player.playerConnection.sendPacket(tilePacket);
                 }
             }
-        } catch (Throwable e) {
-            MainUtil.handleError(e);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
         }
     }
 
diff --git a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
similarity index 100%
rename from bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
diff --git a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
similarity index 89%
rename from bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
index 47ec0f6e..b5abaabb 100644
--- a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
@@ -23,32 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import net.minecraft.server.v1_9_R2.Block;
-import net.minecraft.server.v1_9_R2.BlockPosition;
-import net.minecraft.server.v1_9_R2.ChunkSection;
-import net.minecraft.server.v1_9_R2.DataBits;
-import net.minecraft.server.v1_9_R2.DataPaletteBlock;
-import net.minecraft.server.v1_9_R2.Entity;
-import net.minecraft.server.v1_9_R2.EntityPlayer;
-import net.minecraft.server.v1_9_R2.EntityTracker;
-import net.minecraft.server.v1_9_R2.EntityTypes;
-import net.minecraft.server.v1_9_R2.EnumDifficulty;
-import net.minecraft.server.v1_9_R2.EnumSkyBlock;
-import net.minecraft.server.v1_9_R2.IBlockData;
-import net.minecraft.server.v1_9_R2.IDataManager;
-import net.minecraft.server.v1_9_R2.MinecraftServer;
-import net.minecraft.server.v1_9_R2.NBTTagCompound;
-import net.minecraft.server.v1_9_R2.NibbleArray;
-import net.minecraft.server.v1_9_R2.PacketPlayOutMapChunk;
-import net.minecraft.server.v1_9_R2.PlayerChunk;
-import net.minecraft.server.v1_9_R2.PlayerChunkMap;
-import net.minecraft.server.v1_9_R2.ServerNBTManager;
-import net.minecraft.server.v1_9_R2.TileEntity;
-import net.minecraft.server.v1_9_R2.WorldData;
-import net.minecraft.server.v1_9_R2.WorldManager;
-import net.minecraft.server.v1_9_R2.WorldServer;
-import net.minecraft.server.v1_9_R2.WorldSettings;
-import net.minecraft.server.v1_9_R2.WorldType;
+import net.minecraft.server.v1_9_R2.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -142,32 +117,28 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Chu
         if (!chunk.isLoaded()) {
             return;
         }
-        try {
-            net.minecraft.server.v1_9_R2.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
-            WorldServer w = (WorldServer) nmsChunk.getWorld();
-            PlayerChunkMap chunkMap = w.getPlayerChunkMap();
-            PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
-            if (playerChunk == null) {
-                return;
-            }
-            if (playerChunk.c.isEmpty()) {
-                return;
-            }
-            // Send chunks
-            int mask = fc.getBitMask();
-            if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
-                PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
-                for (EntityPlayer player : playerChunk.c) {
-                    player.playerConnection.sendPacket(packet);
-                }
-                mask = 255;
-            }
-            PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
+        net.minecraft.server.v1_9_R2.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
+        WorldServer w = (WorldServer) nmsChunk.getWorld();
+        PlayerChunkMap chunkMap = w.getPlayerChunkMap();
+        PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
+        if (playerChunk == null) {
+            return;
+        }
+        if (playerChunk.c.isEmpty()) {
+            return;
+        }
+        // Send chunks
+        int mask = fc.getBitMask();
+        if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
+            PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
             for (EntityPlayer player : playerChunk.c) {
                 player.playerConnection.sendPacket(packet);
             }
-        } catch (Throwable e) {
-            e.printStackTrace();
+            mask = 255;
+        }
+        PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
+        for (EntityPlayer player : playerChunk.c) {
+            player.playerConnection.sendPacket(packet);
         }
     }
 
diff --git a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java
similarity index 93%
rename from bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java
index 65f39edf..bf2d183e 100644
--- a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java
@@ -30,25 +30,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
-import net.minecraft.server.v1_9_R2.BiomeBase;
-import net.minecraft.server.v1_9_R2.BlockPosition;
-import net.minecraft.server.v1_9_R2.EntityTypes;
-import net.minecraft.server.v1_9_R2.NBTBase;
-import net.minecraft.server.v1_9_R2.NBTTagByte;
-import net.minecraft.server.v1_9_R2.NBTTagByteArray;
-import net.minecraft.server.v1_9_R2.NBTTagCompound;
-import net.minecraft.server.v1_9_R2.NBTTagDouble;
-import net.minecraft.server.v1_9_R2.NBTTagEnd;
-import net.minecraft.server.v1_9_R2.NBTTagFloat;
-import net.minecraft.server.v1_9_R2.NBTTagInt;
-import net.minecraft.server.v1_9_R2.NBTTagIntArray;
-import net.minecraft.server.v1_9_R2.NBTTagList;
-import net.minecraft.server.v1_9_R2.NBTTagLong;
-import net.minecraft.server.v1_9_R2.NBTTagShort;
-import net.minecraft.server.v1_9_R2.NBTTagString;
-import net.minecraft.server.v1_9_R2.TileEntity;
-import net.minecraft.server.v1_9_R2.World;
-import net.minecraft.server.v1_9_R2.WorldServer;
+import net.minecraft.server.v1_9_R2.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlockState.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlockState.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlockState.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlockState.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java
diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
similarity index 100%
rename from bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
rename to bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
diff --git a/bukkit0/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender_unused_for_now.java b/bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender_unused_for_now.java
similarity index 100%
rename from bukkit0/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender_unused_for_now.java
rename to bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender_unused_for_now.java
diff --git a/bukkit0/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java b/bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java
similarity index 100%
rename from bukkit0/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java
rename to bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java
diff --git a/bukkit0/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml
similarity index 100%
rename from bukkit0/src/main/resources/config.yml
rename to bukkit/src/main/resources/config.yml
diff --git a/bukkit1710/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
similarity index 95%
rename from bukkit1710/src/main/resources/plugin.yml
rename to bukkit/src/main/resources/plugin.yml
index 1154dc8c..0102307e 100644
--- a/bukkit1710/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: FastAsyncWorldEdit
-main: com.boydti.fawe.bukkit.v1_7.BukkitMain_17
+main: com.boydti.fawe.bukkit.BukkitMain
 version: ${version}
 description: Fast Async WorldEdit plugin
 authors: [Empire92]
diff --git a/bukkit110/build.gradle b/bukkit110/build.gradle
deleted file mode 100644
index 1d3deb91..00000000
--- a/bukkit110/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-dependencies {
-    compile project(':bukkit0')
-}
-
-processResources {
-    from('src/main/resources') {
-        include 'plugin.yml'
-        expand(
-                name: project.parent.name,
-                version: project.parent.version
-        )
-    }
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-// We only want the shadow jar produced
-jar.enabled = false
-shadowJar {
-    dependencies {
-        include(dependency(':bukkit0'))
-        include(dependency(':core'))
-    }
-    archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
-    destinationDir = file '../target'
-}
-shadowJar.doLast {
-    task ->
-        ant.checksum file: task.archivePath
-}
-
-build.dependsOn(shadowJar);
\ No newline at end of file
diff --git a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java b/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java
deleted file mode 100644
index bf19d106..00000000
--- a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.boydti.fawe.bukkit.v1_10;
-
-import com.boydti.fawe.bukkit.ABukkitMain;
-import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
-import com.boydti.fawe.object.FaweQueue;
-import com.sk89q.worldedit.world.World;
-
-public class BukkitMain_110 extends ABukkitMain {
-    @Override
-    public BukkitQueue_0 getQueue(World world) {
-        return new BukkitQueue_1_10(world);
-    }
-
-    @Override
-    public FaweQueue getQueue(String world) {
-        return new BukkitQueue_1_10(world);
-    }
-
-    @Override
-    public void onEnable() {
-        super.onEnable();
-    }
-}
\ No newline at end of file
diff --git a/bukkit110/src/main/resources/plugin.yml b/bukkit110/src/main/resources/plugin.yml
deleted file mode 100644
index 86452c4c..00000000
--- a/bukkit110/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: ${name}
-main: com.boydti.fawe.bukkit.v1_10.BukkitMain_110
-version: ${version}
-description: Fast Async WorldEdit plugin
-authors: [Empire92]
-loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
-load: STARTUP
-database: false
-#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
-commands:
-  wea:
-    description: (FAWE) Bypass WorldEdit processing and area restrictions
-    aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
-    usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
-  fawe:
-    description: (FAWE) Reload the plugin
-    aliases: [/fawe,/fawereload]
-  select:
-    description: (FAWE) Select your current WorldEdit Region.
-    aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
-  fcancel:
-    description: (FAWE) Cancel your edit
-    aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
-permissions:
-  fawe.bypass:
-    default: false
-  fawe.admin:
-    default: op
-  fawe.reload:
-    default: false
\ No newline at end of file
diff --git a/bukkit111/build.gradle b/bukkit111/build.gradle
deleted file mode 100644
index 1d3deb91..00000000
--- a/bukkit111/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-dependencies {
-    compile project(':bukkit0')
-}
-
-processResources {
-    from('src/main/resources') {
-        include 'plugin.yml'
-        expand(
-                name: project.parent.name,
-                version: project.parent.version
-        )
-    }
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-// We only want the shadow jar produced
-jar.enabled = false
-shadowJar {
-    dependencies {
-        include(dependency(':bukkit0'))
-        include(dependency(':core'))
-    }
-    archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
-    destinationDir = file '../target'
-}
-shadowJar.doLast {
-    task ->
-        ant.checksum file: task.archivePath
-}
-
-build.dependsOn(shadowJar);
\ No newline at end of file
diff --git a/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitMain_111.java b/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitMain_111.java
deleted file mode 100644
index 6f66509d..00000000
--- a/bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitMain_111.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.boydti.fawe.bukkit.v1_11;
-
-import com.boydti.fawe.bukkit.ABukkitMain;
-import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
-import com.boydti.fawe.object.FaweQueue;
-import com.sk89q.worldedit.world.World;
-
-public class BukkitMain_111 extends ABukkitMain {
-    @Override
-    public BukkitQueue_0 getQueue(World world) {
-        return new com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11(world);
-    }
-
-    @Override
-    public FaweQueue getQueue(String world) {
-        return new com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11(world);
-    }
-
-    @Override
-    public void onEnable() {
-        super.onEnable();
-    }
-}
\ No newline at end of file
diff --git a/bukkit111/src/main/resources/plugin.yml b/bukkit111/src/main/resources/plugin.yml
deleted file mode 100644
index 978f8aca..00000000
--- a/bukkit111/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: ${name}
-main: com.boydti.fawe.bukkit.v1_11.BukkitMain_111
-version: ${version}
-description: Fast Async WorldEdit plugin
-authors: [Empire92]
-loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
-load: STARTUP
-database: false
-#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
-commands:
-  wea:
-    description: (FAWE) Bypass WorldEdit processing and area restrictions
-    aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
-    usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
-  fawe:
-    description: (FAWE) Reload the plugin
-    aliases: [/fawe,/fawereload]
-  select:
-    description: (FAWE) Select your current WorldEdit Region.
-    aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
-  fcancel:
-    description: (FAWE) Cancel your edit
-    aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
-permissions:
-  fawe.bypass:
-    default: false
-  fawe.admin:
-    default: op
-  fawe.reload:
-    default: false
\ No newline at end of file
diff --git a/bukkit1710/build.gradle b/bukkit1710/build.gradle
deleted file mode 100644
index a7da9e8f..00000000
--- a/bukkit1710/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-dependencies {
-    compile project(':bukkit0')
-    compile 'org.bukkit.craftbukkit:Craftbukkit:1.7.10'
-}
-
-processResources {
-    from('src/main/resources') {
-        include 'plugin.yml'
-        expand(
-                name: project.parent.name,
-                version: project.parent.version
-        )
-    }
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-// We only want the shadow jar produced
-jar.enabled = false
-shadowJar {
-    dependencies {
-        include(dependency(':bukkit0'))
-        include(dependency(':core'))
-        include(dependency('com.google.code.gson:gson:2.2.4'))
-    }
-    archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
-    destinationDir = file '../target'
-
-    relocate('com.google.gson', 'com.sk89q.worldedit.internal.gson')
-}
-shadowJar.doLast {
-    task ->
-        ant.checksum file: task.archivePath
-}
-
-build.dependsOn(shadowJar);
\ No newline at end of file
diff --git a/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitMain_17.java b/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitMain_17.java
deleted file mode 100644
index ef93dd81..00000000
--- a/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitMain_17.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.boydti.fawe.bukkit.v1_7;
-
-import com.boydti.fawe.bukkit.ABukkitMain;
-import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
-import com.boydti.fawe.object.FaweQueue;
-import com.sk89q.worldedit.world.World;
-
-public class BukkitMain_17 extends ABukkitMain {
-
-    @Override
-    public BukkitQueue_0 getQueue(World world) {
-        return new BukkitQueue17(world);
-    }
-
-    @Override
-    public FaweQueue getQueue(String world) {
-        return new BukkitQueue17(world);
-    }
-}
diff --git a/bukkit18/build.gradle b/bukkit18/build.gradle
deleted file mode 100644
index 698b4c80..00000000
--- a/bukkit18/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-dependencies {
-    compile project(':bukkit0')
-    compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
-}
-
-processResources {
-    from('src/main/resources') {
-        include 'plugin.yml'
-        expand(
-                name: project.parent.name,
-                version: project.parent.version
-        )
-    }
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-// We only want the shadow jar produced
-jar.enabled = false
-shadowJar {
-    dependencies {
-        include(dependency(':bukkit0'))
-        include(dependency(':core'))
-    }
-    archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
-    destinationDir = file '../target'
-}
-shadowJar.doLast {
-    task ->
-        ant.checksum file: task.archivePath
-}
-
-build.dependsOn(shadowJar);
\ No newline at end of file
diff --git a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitMain_18.java b/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitMain_18.java
deleted file mode 100644
index d6bda43a..00000000
--- a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitMain_18.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.boydti.fawe.bukkit.v1_8;
-
-import com.boydti.fawe.bukkit.ABukkitMain;
-import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
-import com.boydti.fawe.object.FaweQueue;
-import com.sk89q.worldedit.world.World;
-
-public class BukkitMain_18 extends ABukkitMain {
-
-    @Override
-    public BukkitQueue_0 getQueue(World world) {
-        return new BukkitQueue18R3(world);
-    }
-
-    @Override
-    public FaweQueue getQueue(String world) {
-        return new BukkitQueue18R3(world);
-    }
-}
diff --git a/bukkit18/src/main/resources/plugin.yml b/bukkit18/src/main/resources/plugin.yml
deleted file mode 100644
index a652f1d0..00000000
--- a/bukkit18/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: FastAsyncWorldEdit
-main: com.boydti.fawe.bukkit.v1_8.BukkitMain_18
-version: ${version}
-description: Fast Async WorldEdit plugin
-authors: [Empire92]
-loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
-load: STARTUP
-database: false
-#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
-commands:
-  wea:
-    description: (FAWE) Bypass WorldEdit processing and area restrictions
-    aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
-    usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
-  fawe:
-    description: (FAWE) Reload the plugin
-    aliases: [/fawe,/fawereload]
-  select:
-    description: (FAWE) Select your current WorldEdit Region.
-    aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
-  fcancel:
-    description: (FAWE) Cancel your edit
-    aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
-permissions:
-  fawe.bypass:
-    default: false
-  fawe.admin:
-    default: op
-  fawe.reload:
-    default: false
diff --git a/bukkit19/build.gradle b/bukkit19/build.gradle
deleted file mode 100644
index 3d673ef8..00000000
--- a/bukkit19/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-dependencies {
-    compile project(':bukkit0')
-    compile 'org.bukkit.craftbukkit.v1_9R2:craftbukkitv1_9R2:1.9.4'
-}
-
-processResources {
-    from('src/main/resources') {
-        include 'plugin.yml'
-        expand(
-                name: project.parent.name,
-                version: project.parent.version
-        )
-    }
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-// We only want the shadow jar produced
-jar.enabled = false
-shadowJar {
-    dependencies {
-        include(dependency(':bukkit0'))
-        include(dependency(':core'))
-    }
-    archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
-    destinationDir = file '../target'
-}
-shadowJar.doLast {
-    task ->
-        ant.checksum file: task.archivePath
-}
-
-build.dependsOn(shadowJar);
\ No newline at end of file
diff --git a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitMain_19.java b/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitMain_19.java
deleted file mode 100644
index 031832d3..00000000
--- a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitMain_19.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.boydti.fawe.bukkit.v1_9;
-
-import com.boydti.fawe.bukkit.ABukkitMain;
-import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
-import com.boydti.fawe.object.FaweQueue;
-import com.sk89q.worldedit.world.World;
-
-public class BukkitMain_19 extends ABukkitMain {
-    @Override
-    public BukkitQueue_0 getQueue(World world) {
-        return new BukkitQueue_1_9_R1(world);
-    }
-
-    @Override
-    public FaweQueue getQueue(String world) {
-        return new BukkitQueue_1_9_R1(world);
-    }
-}
diff --git a/bukkit19/src/main/resources/plugin.yml b/bukkit19/src/main/resources/plugin.yml
deleted file mode 100644
index 1613b081..00000000
--- a/bukkit19/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: ${name}
-main: com.boydti.fawe.bukkit.v1_9.BukkitMain_19
-version: ${version}
-description: Fast Async WorldEdit plugin
-authors: [Empire92]
-loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
-load: STARTUP
-database: false
-#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
-commands:
-  wea:
-    description: (FAWE) Bypass WorldEdit processing and area restrictions
-    aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
-    usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
-  fixlighting:
-    description: (FAWE) Fix the lighting in your current chunk
-    aliases: [/fixlighting]
-  fawe:
-    description: (FAWE) Reload the plugin
-    aliases: [/fawe,/fawereload]
-  select:
-    description: (FAWE) Select your current WorldEdit Region.
-    aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
-  fcancel:
-    description: (FAWE) Cancel your edit
-    aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
-permissions:
-  fawe.bypass:
-    default: false
-  fawe.admin:
-    default: op
-  fawe.reload:
-    default: false
\ No newline at end of file
diff --git a/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java b/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
index 1b1b701a..628f6f9d 100644
--- a/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
+++ b/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
@@ -4,6 +4,7 @@ import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.object.FaweChunk;
 import com.boydti.fawe.object.exception.FaweException;
+import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.TaskManager;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.world.World;
@@ -88,7 +89,11 @@ public abstract class NMSMappedFaweQueue<WORLD, CHUNK, CHUNKSECTION, SECTION> ex
 
     @Override
     public void sendChunk(final FaweChunk fc) {
-        refreshChunk(fc);
+        try {
+            refreshChunk(fc);
+        } catch (Throwable e) {
+            MainUtil.handleError(e);
+        }
     }
 
     public abstract void setHeightMap(FaweChunk chunk, byte[] heightMap);
diff --git a/favs/build.gradle b/favs/build.gradle
index 5f6823b8..cd0050e7 100644
--- a/favs/build.gradle
+++ b/favs/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    compile project(':bukkit0')
-    compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
+    compile project(':bukkit')
+compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
 }
 
 processResources {
diff --git a/settings.gradle b/settings.gradle
index 821fa3a0..50b2a4c0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = 'FastAsyncWorldEdit'
 
-include 'core', 'bukkit0', 'bukkit1710', 'bukkit18', 'bukkit19', 'bukkit110', 'bukkit111', 'forge1710', 'forge189', 'forge194', 'forge110', 'favs', 'nukkit'
+include 'core', 'bukkit', 'forge1710', 'forge189', 'forge194', 'forge110', 'favs', 'nukkit'