rearranged folders and file names