[feedback] yaml reshuffle v0

Feedback welcome!

Reshuffle YAML to make more sense to new users.