Re-aligning oridinals for new YAML structure.