Refactor Angular to reliable load ordering

-Dx: