Feature/tidy up

Merged Mathias Goebel requested to merge feature/tidy-up into develop
  • tidy up dir structure
  • fix tapi module

Merge request reports