Chore/refac

Refactoring for reduced line count, reduced service redundancy and reduced scope coupling.  *rootscope" and "broadcast" are no longer part of the codebase.