Fix direcotry structure