Merge directory changes into master

Jendrik Richterrequested to merge
7-change-mapping-logic into master

Merge changes that happened in this branch but were not related to #7 (closed)

Open a new branch to deal with #7 (closed)

Merge request reports