Basic angular structure
Angular refactoring