changed models and migrations to match the initial agreed structure