Cleaned up a bunch of stuff

Seperated authenticator and serverping code from the main class