initial reorg for new structure