I hate whoever moved the persistence package structure on stage, and didn't merge it to master.