restructuring angular/public facing code, MUCH nicer codebase