Minor naming issue
Moving common code outside module js file.
Merge branch 'refactor/angular'