refactoring project structure
Merge branch 'master' of https://github.com/rminchev1/tskup