Restructured the scene graph to be easier to work with.