Folders are restructured