Data Migrations for #4 - Simplify Admin and Data Model
Simplify Admin and Data Model. This fixes #4