started restructuring for X11