Refactor ServerHandler -> VersionHandler