Package rename: util.grid -> grid.proxy (which contains proxy classes)