Folder layout updates