reorganised controllers + views