Further decoupled the Scene classes from the Rendering