reorg of nesting building 2