Managing Static References in DI-Driven Apps

Refactor global static state into injectable service singletons to improve testability.