Angular project refactored