Move scripts into bin dir. enhance scripts