added structuremap
major reorganization...