Replace group_files with lazy class, fixes #121