Fixed several installer issues introduced after the strucutre changes.