I think the "Harry Potter - Books Only" and "Harry Potter - Wizarding World" setup worked well last year, so I suggest keeping that with the addition of "Harry Potter - Cursed Child" and "Fantastic Beasts and Where to Find Them" (though I think this would be more a division of era than a division of information to draw on, since most of the information in Fantastic Beasts, like the setup of US magical society and some of the creatures, originated from Pottermore or the spinoff book of the same name.)