Moved injector namespace
Refactored Injector