Reorganize persistence