(no real change, the relevant files where not modified in gmx)

Same as 55bc92d2
(written by Carlo), but in such a way that it results as a git mv