Moved the model classes into their own files
Removed a temporary file that should not have been committed