refactoring structure, refactoring file-filter
logging