Folders restructuration