added maps and moved to ng-modules