Made model a module rather than package
Moved model.py to models.py