[Fixes #10] refactor models into logical units
Merge remote-tracking branch 'origin/i10'