Rearranged and organized folders