Rename folders so they're sorted properly.