Datamodel general update

This set of changes implement all major updates of the datamodel, as discussed last week in Berlin. Main changes can be seen in the commit messages. Merging this will close issue #22.