Adding angular controllers and re-organising layouts