package cleanup in Lib_Gui