SSP-920 Move entity data files into a patch set