updated/added scripts
reorganize