refactoring of pair files mechanism almost done. need to test