Finished user/keypair models and restructured the controllers a bit