Update for file tree
Modify to adapt new file directory structure.