Improve naming
Split out default vars into paths.sh and vars.sh