Dashboard folders refactoring