Servo library refactoring. See #1617