Merge manifest and category into category.xml

Also clean up leftover topic references