move file name
clean it up
merge