Revert "CreativeWork-genre"

This reverts commit 34cf2c063e1cfd438c6e98c3cb1035384f39431a.
Revert "Movie domain reorder"

This reverts commit 1320e3116821eadc8731138e46d643d0268c7494.