merged the new dir structure