rename and add mkdir