Use observable properties correctly

This fixes my original hick-up in using the [ObservableProperty] annotations correctly. It also illustrates further how the Model classes need to be implemented.

In addition, I aligned the schema definition files to more closely match the code samples.