Rebuilding file tree - again (again)