Servo library to the new format