B-58092 moved datastore files from core-lib to services