WIP: Refactor directory structure, not working yet!!

Imports still need to be adapted. Coming in next commit.
Merge brance master into refactoring. Adapt imports.
Adapt config.cfg.template to use full paths

Please adapt this in your config.cfg files