Rework the DI container entirely.