Added new SceneBuilder, doesn't work well though. Also refactored SceneBuilder classes to be more agile.