Splitting collections for organisation

Early 2021 clean-up: duplicate