reorg into chapter specific packages