Moved reviewtypes, contenttypes to be top level entities