moved files around

Change-Id: I19a9d55233b7a7462825949466abdaddf1a5348d
Merge branch 'alexandria' of ssh://gerrit.gromacs.org:29418/gromacs into alexandria