WIP: Reorganize pipeline to be consistent

The process of building the pipeline sould
be contained in one set of files, not distributed
across several files somewhat indeterminantly..