Renamed package to "model"
Merge remote-tracking branch 'origin/master'