diff --git a/Paper b/Paper
index cd3d8fb27..6b75dac6f 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit cd3d8fb27e4a6717146bf7256f37034285a303d7
+Subproject commit 6b75dac6f43dd55dc5ed4f850b696a3b88d37839
diff --git a/Paper-Server-Patches/0003-Show-TacoSpigot-in-client-crashes-server-lists-and-M.patch b/Paper-Server-Patches/0003-Show-TacoSpigot-in-client-crashes-server-lists-and-M.patch
index 36cb21c4b..db863d68d 100644
--- a/Paper-Server-Patches/0003-Show-TacoSpigot-in-client-crashes-server-lists-and-M.patch
+++ b/Paper-Server-Patches/0003-Show-TacoSpigot-in-client-crashes-server-lists-and-M.patch
@@ -1,4 +1,4 @@
-From d150a4d498031222e3e94559a135d511f0c3c64d Mon Sep 17 00:00:00 2001
+From 9e512431202e108b6c1a2e0c17c9dacaa5eeabf9 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sat, 7 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Show 'TacoSpigot' in client crashes, server lists, and Mojang
@@ -6,10 +6,10 @@ Subject: [PATCH] Show 'TacoSpigot' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 06dec17..e1ce035 100644
+index b1e6e5d..b286689 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -564,7 +564,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -565,7 +565,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
      }
      // Paper End
@@ -18,7 +18,7 @@ index 06dec17..e1ce035 100644
      public void run() {
          try {
              if (this.init()) {
-@@ -1113,7 +1113,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1114,7 +1114,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
  
      public String getServerModName() {
diff --git a/Paper-Server-Patches/0008-Optimize-armor-stands.patch b/Paper-Server-Patches/0008-Optimize-armor-stands.patch
index 256ca1f24..650fe7970 100644
--- a/Paper-Server-Patches/0008-Optimize-armor-stands.patch
+++ b/Paper-Server-Patches/0008-Optimize-armor-stands.patch
@@ -1,4 +1,4 @@
-From 032fb980c7ae6f4bc274216e0590c461b1208f9c Mon Sep 17 00:00:00 2001
+From 4a6f8bbca8e41b37eb0ed770d41a34c4c85b6575 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Tue, 6 Oct 2015 19:10:21 -0700
 Subject: [PATCH] Optimize armor stands
@@ -28,10 +28,10 @@ index 04161e7..e686c24 100644
  
          static final int[] a = new int[EnumItemSlot.Function.values().length];
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index aea8881..b989bc1 100644
+index 06a56bf..be74af7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1248,6 +1248,7 @@ public abstract class World implements IBlockAccess {
+@@ -1249,6 +1249,7 @@ public abstract class World implements IBlockAccess {
  
          blockposition_pooledblockposition.t();
          if (entity != null) {
diff --git a/applyPatches.sh b/applyPatches.sh
index b5c10ad0b..4ce2bb0e5 100755
--- a/applyPatches.sh
+++ b/applyPatches.sh
@@ -42,21 +42,21 @@ pushd Paper
 basedir=$basedir/Paper
 
 # Move into spigot dir
-pushd Spigot
-basedir=$basedir/Spigot
+pushd work/Spigot
+basedir=$basedir/work/Spigot
 # Apply Spigot
 applyPatch ../Bukkit Spigot-API HEAD && applyPatch ../CraftBukkit Spigot-Server patched
 # Move out of Spigot
 popd
-basedir=$(dirname $basedir)
+basedir=$(dirname $(dirname $basedir))
 
 echo "Importing Paper MC Dev"
 
-./importmcdev.sh
+./scripts/importmcdev.sh
 
 # Apply paper
 
-applyPatch Spigot/Spigot-API Paper-API HEAD && applyPatch Spigot/Spigot-Server Paper-Server HEAD
+applyPatch work/Spigot/Spigot-API Paper-API HEAD && applyPatch work/Spigot/Spigot-Server Paper-Server HEAD
 # Move out of paper
 popd
 basedir=$(dirname $basedir)
diff --git a/decompile.sh b/decompile.sh
index 914cba583..94058721d 100755
--- a/decompile.sh
+++ b/decompile.sh
@@ -5,7 +5,7 @@ pushd Paper # TacoSpigot
 PS1="$"
 basedir=`pwd`
 workdir=$basedir/work
-minecraftversion=$(cat BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
+minecraftversion=$(cat work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir=$workdir/$minecraftversion
 classdir=$decompiledir/classes
 
@@ -24,7 +24,7 @@ fi
 echo "Decompiling classes..."
 if [ ! -d "$decompiledir/net/minecraft/server" ]; then
     cd "$basedir"
-    java -jar BuildData/bin/fernflower.jar -dgs=1 -hdc=0 -asc=1 -udv=0 "$classdir" "$decompiledir"
+    java -jar work/BuildData/bin/fernflower.jar -dgs=1 -hdc=0 -asc=1 -udv=0 "$classdir" "$decompiledir"
     if [ "$?" != "0" ]; then
         echo "Failed to decompile classes."
         exit 1
diff --git a/importmcdev.sh b/importmcdev.sh
index e9c46b5a5..84cea51ee 100755
--- a/importmcdev.sh
+++ b/importmcdev.sh
@@ -6,7 +6,7 @@ PS1="$"
 basedir=`pwd`
 
 workdir=$basedir/Paper/work
-minecraftversion=$(cat Paper/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
+minecraftversion=$(cat Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir=$workdir/$minecraftversion
 
 export importedmcdev=""
diff --git a/init.sh b/init.sh
index 05cb37d1e..8c86d4650 100755
--- a/init.sh
+++ b/init.sh
@@ -5,7 +5,7 @@ pushd Paper # TacoSpigot
 PS1="$"
 basedir=`pwd`
 workdir=$basedir/work
-minecraftversion=$(cat BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
+minecraftversion=$(cat work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir=$workdir/$minecraftversion
 nms=$decompiledir/net/minecraft/server
 cb=src/main/java/net/minecraft/server
@@ -16,7 +16,7 @@ if [ "x$patch" == "x" ]; then
 fi
 
 echo "Applying CraftBukkit patches to NMS..."
-cd "$basedir/CraftBukkit"
+cd "$basedir/work/CraftBukkit"
 git checkout -B patched HEAD >/dev/null 2>&1
 rm -rf $cb
 mkdir -p $cb
diff --git a/prepare-build.sh b/prepare-build.sh
index 1bc792784..fece86e35 100755
--- a/prepare-build.sh
+++ b/prepare-build.sh
@@ -3,10 +3,10 @@
 git submodule update --recursive --init && ./remap.sh && ./decompile.sh && ./init.sh && ./applyPatches.sh
 
 # Generate paperclip jar in this stage
-mkdir -p Paper/work/Paperclip
+mkdir -p work/Paperclip
 PAPERCLIP_JAR=paperclip.jar
 
-if [ ! -f Paper/work/Paperclip/$PAPERCLIP_JAR ]; then
+if [ ! -f work/Paperclip/$PAPERCLIP_JAR ]; then
     if [ ! -d Paperclip ]; then
         echo "Paperclip not found"
         exit 1;
@@ -19,5 +19,5 @@ if [ ! -f Paper/work/Paperclip/$PAPERCLIP_JAR ]; then
         exit;
     fi;
     popd
-    cp Paperclip/target/paperclip*.jar Paper/work/Paperclip/$PAPERCLIP_JAR
+    cp Paperclip/target/paperclip*.jar work/Paperclip/$PAPERCLIP_JAR
 fi;
diff --git a/remap.sh b/remap.sh
index a947bbd3e..4753e8258 100755
--- a/remap.sh
+++ b/remap.sh
@@ -5,12 +5,12 @@ pushd Paper # TacoSpigot
 PS1="$"
 basedir=`pwd`
 workdir=$basedir/work
-minecraftversion=$(cat BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
-minecrafthash=$(cat BuildData/info.json | grep minecraftHash | cut -d '"' -f 4)
-accesstransforms=BuildData/mappings/$(cat BuildData/info.json | grep accessTransforms | cut -d '"' -f 4)
-classmappings=BuildData/mappings/$(cat BuildData/info.json | grep classMappings | cut -d '"' -f 4)
-membermappings=BuildData/mappings/$(cat BuildData/info.json | grep memberMappings | cut -d '"' -f 4)
-packagemappings=BuildData/mappings/$(cat BuildData/info.json | grep packageMappings | cut -d '"' -f 4)
+minecraftversion=$(cat work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
+minecrafthash=$(cat work/BuildData/info.json | grep minecraftHash | cut -d '"' -f 4)
+accesstransforms=work/BuildData/mappings/$(cat work/BuildData/info.json | grep accessTransforms | cut -d '"' -f 4)
+classmappings=work/BuildData/mappings/$(cat work/BuildData/info.json | grep classMappings | cut -d '"' -f 4)
+membermappings=work/BuildData/mappings/$(cat work/BuildData/info.json | grep memberMappings | cut -d '"' -f 4)
+packagemappings=work/BuildData/mappings/$(cat work/BuildData/info.json | grep packageMappings | cut -d '"' -f 4)
 jarpath=$workdir/$minecraftversion/$minecraftversion
 
 echo "Downloading unmapped vanilla jar..."
@@ -32,13 +32,13 @@ fi
 
 checksum=$(md5sum "$jarpath.jar" | cut -d ' ' -f 1)
 if [ "$checksum" != "$minecrafthash" ]; then
-    echo "The MD5 checksum of the downloaded server jar does not match the BuildData hash."
+    echo "The MD5 checksum of the downloaded server jar does not match the work/BuildData hash."
     exit 1
 fi
 
 echo "Applying class mappings..."
 if [ ! -f "$jarpath-cl.jar" ]; then
-    java -jar BuildData/bin/SpecialSource-2.jar map -i "$jarpath.jar" -m "$classmappings" -o "$jarpath-cl.jar" 1>/dev/null
+    java -jar work/BuildData/bin/SpecialSource-2.jar map -i "$jarpath.jar" -m "$classmappings" -o "$jarpath-cl.jar" 1>/dev/null
     if [ "$?" != "0" ]; then
         echo "Failed to apply class mappings."
         exit 1
@@ -47,7 +47,7 @@ fi
 
 echo "Applying member mappings..."
 if [ ! -f "$jarpath-m.jar" ]; then
-    java -jar BuildData/bin/SpecialSource-2.jar map -i "$jarpath-cl.jar" -m "$membermappings" -o "$jarpath-m.jar" 1>/dev/null
+    java -jar work/BuildData/bin/SpecialSource-2.jar map -i "$jarpath-cl.jar" -m "$membermappings" -o "$jarpath-m.jar" 1>/dev/null
     if [ "$?" != "0" ]; then
         echo "Failed to apply member mappings."
         exit 1
@@ -56,7 +56,7 @@ fi
 
 echo "Creating remapped jar..."
 if [ ! -f "$jarpath-mapped.jar" ]; then
-    java -jar BuildData/bin/SpecialSource.jar --kill-lvt -i "$jarpath-m.jar" --access-transformer "$accesstransforms" -m "$packagemappings" -o "$jarpath-mapped.jar" 1>/dev/null
+    java -jar work/BuildData/bin/SpecialSource.jar --kill-lvt -i "$jarpath-m.jar" --access-transformer "$accesstransforms" -m "$packagemappings" -o "$jarpath-mapped.jar" 1>/dev/null
     if [ "$?" != "0" ]; then
         echo "Failed to create remapped jar."
         exit 1
@@ -64,7 +64,7 @@ if [ ! -f "$jarpath-mapped.jar" ]; then
 fi
 
 echo "Installing remapped jar..."
-cd CraftBukkit # Need to be in a directory with a valid POM at the time of install.
+cd work/CraftBukkit # Need to be in a directory with a valid POM at the time of install.
 mvn install:install-file -q -Dfile="$jarpath-mapped.jar" -Dpackaging=jar -DgroupId=org.spigotmc -DartifactId=minecraft-server -Dversion="$minecraftversion-SNAPSHOT"
 if [ "$?" != "0" ]; then
     echo "Failed to install remapped jar."