cleaning up scripts and directories to simplify deployment (VBAT-28)