fixed dir structure once more