Refactor for new approach
Properly move the dir for packaging
Merge branch 'new_approach'