Refactor single model to use new style angular structure