Fixed scene graphing, also finished packaging