Refactor CLI application

This will refactor the CLI application to use the core DIC
* No DIC magic applied so far...
* Depends on #216