More restructuring of the views system