Added model classes

Hope there's no huge conflicts!