Refactoring models.
Merge branch 'master' of https://github.com/phristov/kss