reorganized scripts called in build-and-test script
Remove unrelevant comments from scripts