Refactoring - added DependencyInjection directory