refactored location
added default service and updated to move common html to directives