Refactoring BuilderCtrl; created new services