Moved xml stuff to separate package.