Refactoring services
Xml Refactor

Using XDocument now