Moved around some networking code and service code.