Organized model classes and added Json annotations.
Merge origin/master