re-factorize code (move xml-related service to one file)