Renamed some files, and changed the references to them. Added function to model.py. Other minor changes.