Reducing the server/client split singleton types to one for simplicity. This should be enough for now at least. In summary: - The old singleton types are fine if you're only going to have one even in listen server mode - If you're going to have one on client and another of the same type on server, use ServerClientSingleton