updating all scripts and reorganizing.