Renamed a bunch of security stuff; added a bunch of models