Folder re-structured