reorganized rhubarb.yaml. not yet implemented, though.