1.  Moved models into db.types.  2.  Moved cv json files into own folder.  3.  Extended unit testing.  4.  Rationalised entity/json decoding/encoding.