Added angularjs base
Refactor services