Working on delayer
Switched back to ping to make things easy
Moved modules into their specific packages