Moved properties to type namespace
Moved properties to type namespace
Associations; moved properties and renamed to PropertyDescriptions
(Final?) refactor of model, tests for core model
Missed some files in last commit