Changing structure of the model to account for the new architecture discussed
Adjusting unit tests