Started refactoring
Removed Pinger
Removed unused imports