Renamed some classes to better describe their meaning.  Added new configuration elements.