Restructuring Graphics classes.