IStructuredData and generic conversion to JSON.
Removed stray duplicate of uri.hpp
Removed unused test code from test.cpp