glib: move more files to main pkg.