JSON  response Serialization, and re-organizing of classes