big change about dir structure