Fixed versioning of sources; factored out commonality between sources and collections