moved all the dependency injection code into the same namespace
Merge pull request #5768 from cash/class_organization

Improving the organization of classes