Moving JSON classes for clarity