Refactoring. Moved XML loader to icfoundation