changes. views. model. collection in single file for now
merges