Scenes and objects re-organized