wip
refactor working
more fixes
Merge branch 'feature/create-choose-dir' into develop
Merge branch 'develop' of github.com:projmate/projmate-core into develop