Lots of inside-of-package code reorg, having absolutely no impact on
the behavior or scope of any code.
Merge pull request #540 from mozilla-services/pipeline-reorg

Lots of inside-of-package code reorg, having absolutely no impact on