Split set-from-git into 3 different files for each section and created a script for common directory variables. Created separate folders for PC/laptop configs.