r35 Reorganized scene somewhat