Added drawRectangle to rawImage,
renamed some packages.