Refactoring: update of pathes to samples