correct dir structure