Cleaning up Graphics.java due to package name change.