Refactoring in MCS-persistent: more specific packages introduced.