finished library reorg