Merge several libraries into one

Early 2021 clean-up: duplicate