Updated make.sh with latest refactoring.