Subfolder optimization