Issues #92 (additional script) + small library reorg.