Redo of folder structures