added rename and move features