Add category and license lists
Remove terms incorporated by reference, because we can auto-generate them.