Change shell scripts to new layout