renamed patch 2d-3d search classes
misc updates to 2d-3d dict code