I spent a few hours last night moving everything from the studio to upstairs. It took longer than I expected and was nearly midnight by the time I'd finished.
I haven't begun to think about how the gear will be arranged but I am thinking about a sort of U-shaped layout.
I still haven't worked out exactly how I'm going to connect up the patch bay but I will be using it to route instruments to various effects pedals.