Added DI module to the mix
Revert "Added DI module to the mix"

This reverts commit 44ef6893ab2b6dfb21e043a620f7e24d1cad0ad8.
First step to use DI
Merge branch 'feature-DI' into development