removed StructureMap!

also updated Moq