Flatten folders and consolidate