Revamp Shell Scripts

Reworking scripts for automation