Folder hierarchy cleanup