Some fixes to the pipeline and a major change of structure