Refactored model classes.
Merge branch 'second' of github.com:linkra/omnilk2 into second