Fixing subfolder problems