Make file locations more flexible