Refactoring Rotary Encoder classes; renaming and moving internal class.