The "one vs four" problem was caused indirectly by the mapping of the former units as "buildings" (possibly by me!).  This isn't really correct; there's actually really only one building on each side, and the interior partitions can be moved and removed easily.