Fix realy bad structure an dir name error fot testing