gmxlib further file cleanups