reorg of nesting buildings set 1.