Updated structure
Added templating and Angular