Folders cleanup, add like on homepage