Fix typo in var name
link files after all folder hierarchy is created
create "By Location" hierarchy