Refactoring (Class renamings), change xstream dependency to newer version