The master plan has a new terminal that connects to the C rail station, then a separate, new terminal will be on the other end of the U that the train makes, so yes, they will basically split C and D. I was answering a question about why they are spending money on the mobile lounges instead of building a D terminal for the train (essentially the same thing they did with the C terminal for the train).