reorganize folders and scripts