Handle subfolders better