Updated structure of the view files