Made tools correctly use the new HaarWavelets and functions found in
haarcommon project.