Reorganized modeling pipeline