moved persistence to model package