package .persistence moved to .core.persistence