Fixing dir structure