Refactor angular structure