Reorganizing Gui library...