Tested code, added a bit of documentation for JSON format, added JSON client test file. Moved files around