Some progress & added StructureMap

- Added StructureMap
- More tests