Yes, this is 5-15 years down the line. I think that is without a doubt.

That being said, I think a new C/D terminal built in the style of B would be amazing. Honestly, it would not even require the consolidation of Star carriers in a single terminal, since once the new C/D is built, the train becomes an actual useful method of conveyance. (No more long walk to the train station, plus an actual station under D).