fixing issues with circular imports and service registration
Merge pull request #1697 from diegosarmentero/master

fixing issues with circular imports and service registration