Little reorganize, changed to a BukkitTask