Removed some Collections files, changed some file names for clarity, changed Collections calls in helpers