Improve subfolder management.