Minor refactoring of persistence package structure.