Use correct dir structure