Reorganized shell scripts