And remove old dir