rename and moving in right directory structure