Simplify persistence module, merge db into persistence