restructuring to fit ng-boilerplate
more structure changes