Make file locations more generic-fixes issue #9
Concatenate strings in a better way