dir structure adjusted