updated structure with views