Revert "rm old models.py, mv models_new.py -> models.py"

This reverts commit 95ab597fb75c8a49e151f940b9e5a70de8d64441.

Adds back the old models, and renames new models that conflict with
names of old models (such as new Resource model renamed to NewResource).