more reorgs of scripts and directories