Change categories of some items

This PR is requested in #3499, and this is only beginning of the big way.