Properly move the dir for packaging