Re-categorize to 6-way scheme matching catalog_utils.py

Fix category-count wording: 7-way, drop stale general fallback

Initial catalog release

initial commit