rename and reorganize tsts and data