Move files around before merging..