fix dir structure