preparation, moving directories and files for merges