collectAll (and moved the files around)
broke out modules into their own files