Schema

Changed migration files and model associations