Category Restructure

We’re in the midst of adding lots of new categories, to split up the big ones. It may take a while to get things properly organized.