move topics into place, fix up some yaml
yaml cleanup