[xstream] Move xstream to separate extractor