Move classes to make more consistent
Merge pull request #168 from willwclo/kitkat

Move classes to make more consistent