Organize categories of models, and fix Sunspot models