Added configuration components.  Refactoring