Remove superfluous configuration files.
Merge pull request #257 from henning-gerhardt/issue_82

Fix #82: Configuration files in different folders & duplicates