modified the models and changed the package. Added some unit tests for the models.