Reorganised the data package into a persistence package.