refactoring of file structure adapter