Bit refactored CLI structure