Adding StructureMap support(thanks Kostassoid) + Refactoring