rearranged folders and folder names