Move DI-dependent servlets into component registry