refactoring of file tree; refactoring of calls