Restructure the graphics package