Add City model, refactor Venues model and update tests and migration