tried to fix dir structure