CMS model classes cleanup.
Merge pull request #95 from kormik/feature/model

CMS model classes cleanup.