Refactor models, especially response.rb