Pipe components not layouts

Much more to be done there + opens doors to more complex treatment.