Moved Model classes to its own package
Merge remote-tracking branch 'origin/master'