#396 Converted service layers to  symfony DI services