Refactor: promote Injectables out of Cli package

An internal refactor. I wasn't happy with the Injectables being buried inside the Cli section.