big strucutral changes for multiple Bash files.