moved and renamed json loader pojos, should be base for new model class.

bullet is currently broken, need to modify the swig stuff.