finally fixed dir structure