Now distinguishing folders and files