Restructuring of angular app structure, controllers, templates etc.