Migrate from one vars file to seperate files.