try and fix dir structure