Working direct pipeline, refactor packages