Move Util and BukkitUtil to a seperate package