Renamed DependencyInjection methods and reorganized code
Renamed DI classes to better match the new interface