Merge "Remove subdirs"