moved the restberry-model into the restberry package and updated the test to work with the newer versions of the dependent packages
restructured the populate and toJSON code