fix dir layout