folders and namespace renaming + system window update (WIP)