Global: Folder hierarchy edit. Prepare for Server and Model merge