Refractoring

Refractored services