I'm afraid I don't follow.  Remove the mkdir_p and the 2 mv's below it and replace it with what exactly?