Added seed data
Refactored models
Fixed some issues in models. More changes coming