convert to complete pipeline

first step: restructure existing files