Change data model to reflect design.

See https://github.com/unsay/vicini/pull/4#issuecomment-21764996