fixes ctrl naming conventions, remoevs rootScope from services