Move all files to new subdir before repo merge