Scene and Object Refactoring