Restructuring Graphics classes