Move histograms to the more appropriate namespace