Finished JSON decoding support and tidied up codebase.
Renamed atoc field spec