Refactor Answer model
Rename file
Refactor Round