Final data model commit.

Puts everything where it should be.