Revert "put persistence class under service"

This reverts commit 561cdfd4dfb1a28ad6d8b187f38c7a9d894f76fa.