refactoring: merge persistence- and persistence-util-modules