refactor out finder and changers to their own files
fix issue 5