Trying to fix dir structure