chore($angular): code re-org #7