Scene reorganisation

Starting to organise scene files before publishing today's build.