Reorganize refactoring menu and remove separate key bindings