Manifest: Drop Category class, instead build the lists in place