Removed TinyIoc for now
Added Structuremap