Move test files out of directory
Move test.proto out of main sourc eidrectory
Remove test files
Rename protobuf-json to protobuf_json directory