Re-organise view file structure