Updated views and folder structures