More project layout changes.