refactoring, consolidated more files into lib.cfg