Add rename and remove support for directories