Fix dir structure