Re-organize shell scripts