Dev to main

We mainly worked in a new branch 'test' with a lot of test-files and test-data. In the dev branch that is merged here, the history of branch 'test' is missing. Only the meaningful files and changes have been copied to dev branch and are now merged into main.