Fixed compatibility with 2.5 directory structure script