views re-structured