Further work to monolithic lib creation.