Xing: restructure, develop gui, gui to master