[0.0.8] Repackage graphics classes, minor cleanup