Modified models to be more modular
Merge remote-tracking branch 'origin/master'