Adjust build dir layout to new install dir layout.

Should fix the unit tests and likely Windows.