reorganize steps.

It's important not to refactor steps _too_ much, but these were certainly
http steps and not card steps.