more restructuring, progress on XY chart