use correct dir layout