Move JSON classes into their own namespace, and fix issues with multi-namespace FromJson