Merged Servo and ServoTimer files to allow more inlining