Changing Entities to new structure