Merge branch 'cleanup/input-file-names-and-cmakelists' into 'master'

Harmonize input file names and CMakeLists.txt

Closes #4

See merge request !62
2 jobs for master in 25 seconds (queued for 3 seconds)