Changes to the way the Services and Controllers are implemented
Added Directive for maps