views and partials restructuring