Simplification

* Simplify out 'base classes' that really aren't needed (DataSource,
Sounder)