Commit 7cc18ffd115ad83e8e2151893d9975ac75486ce5

Steffen Jaeckel 2017-08-25T12:59:22

rename/move some files; fix some stuff regarding this