clean up structureMap to current paradigm - using a container rather than (static) ObjectFactory method