Refactored Json converters.

Now the Json converters are in the same files as the types they convert.