Injection refactor

Refactored app to migrate all injection points to the DE and Belphegor entry points. There are still two injectors which will eventually be factored out; Commons and Services. That will not make it into the 1.9.3 release.