Rearranged folders, will have big sync change