Small refactoring to simplify names
Working CLI for both basic and modular robots