Rearranged helper shell scripts