Large refactor, remove last of the Bukkit dependencies