remove gui_client
reorganise