Refactor ping package