Reflect the new source tree layout
2 files changed