update for new source tree layout (untested)