making changes to cli structure