fix data order and rename files