File manager added. Folder grouping added