update directory structure after merge