Trying to fix messed dir structure