seprated the collections into their own file
fixed merge conflicts