more intro/sys design reorg