more Rpmmd refactoring