Correct dir structure