Bugfix #1 + sort by folders first, then files