updated with most recent file tree structure