More changes to handle the split into two projects.