Now, I have taken both sections of my office sections and combined them on a table. Let the reshuffle begin!
Here's the first pass. It needs a reorg, however. I don't like the look.

I have more space for additional buildings as well. Dangerous. :)
I may do something crazy and bring my Unitram and the roadbed it has into the office, then keep all the gray parts here and ship the tan home and use them for the Old Town layout pieces there. If anything, it will keep things uniform and might be a nice change. I'm just not sure I have enough of the tan pieces to contain all the Old Town buildings I have going at home.
I think I'll give it a go, however. It's been a while since I've made any major changes.