simplify dir structure