Scene refactor (part 1).