Separation of cli and commands