Library reorg