Reorg to support multiple packages.  Added supervisor support