Move wrap and HistArray out to util/ dir