Clean up CliWrapper and Configuration

Change-Id: I3a598b61e75479be108df80de3f6c761d2a0304c
Configuration and engine refactoring

Change-Id: I42375b4e191161680f755e8c26c941512ae0d979