refactor module according to new xstream configuration