Update structure to FileWalker