Better grouping in install.sh