Project structure refactoring
Merge branch 'devel' of github.com:projectscopt/jacob into devel