second attempt fix dir structure