refactor Configuration and CommandBuilder classes