refers to #42
Updated structure and missing parts added.
For discussion in the team (preparation for tomorrows meeting)