Code refactoring.  New classes for audio sink and control.