Angular refactoring round 1 is COMPLETE