Added JSON classes, moved classes into folders.
Merge branch 'master' of https://github.com/ChrisAU/Categories