Refactored XML storage out. Fixed encoding issue
Added MEF support
Refactored
Refactored