Restructure manual categories, add leaf category