This avoids some merge conflicts to allow git blame to detect renames properly.
Signed-off-by: Wolfgang Walther <walther@technowledgy.de>