Lots of refactoring (SceneEditor)