[Updated] Move to bukkit package