#41 rename interface, move a class to XChange