Added services / modularized existing services via blueprint