Restructure Graphics commit