Moved containers and made config a DI dependency