Start switching to angular
Finish angular refactor