Refactoring: private access to fields
Fix matrix generation: pair file (file1 and file2) with same filename
Fixed queries.
Refactoring: remove parameter and method
Prevent NullPointerException
Implemented hashCode() and equals()