Revert "Adaption of style and filenames"

This reverts commit 2bcada68d7d6beab29b431d0562ed0672ea4ac16.