Updated the model and the relations to a more logical structure, also added new test-data in bootstrap.groovy