Move dir-vim pop to dir-root, and remove the dir-editor.