renaming model files for clarity, updating backbone collections