[cli] Improved call
[gitignore] Update to match new structure