We'll continue showing progress in the weekly livestreams, which will be continuing until release. (Exception: May 1st, since that's a holiday.)
Internally, you can now replace them freely, and any buildings that fit in both will be retained. (Any that don't will be destroyed. It gives you a list.)
View attachment 1279339
That's ok. I prefer this:

- 6
- 1