FAIMS-243: refactoring code + adding data files dir
FAIMS-243: fixing broken tests