Bump bukkit version + refactoring