working distributed templating
Directive consolidation
removed team view