consolidate view structure and App.state models @T13