Added appropriate associations and renamed model and migration files.