Refactored angular example teamplate handing and structure