Rename simple-collection to simple-core and various cleanup.