extensive gallery reorganisation