Reorganised views into folders