update scripts, folder refactor