More bash script organization