Refactored solution.  Introduced Unity framework for DI.