implemented #3 issue.
Now folders and files are ordered by name.