refactored models
updated .gitignore