Scene refactor (part 2).