Major refactoring using bukkiteventrouters and nmsf->bukkit