Cleanup and restructure the project

scripts/upstreamMerge.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+PS1="$"
+basedir="$1"
+workdir="$basedir/work"
+
+function update {
+    cd "$workdir/$1"
+    git fetch && git reset --hard origin/master
+    cd ../
+    git add $1
+}
+
+update Bukkit
+update CraftBukkit
+update Spigot