Reorgs class hierarchy. Adds annotation, image_resource, resource and service. Fixes to_json.
Merge pull request #27 from jpstroop/implement_annotation

Reorgs class hierarchy. Adds annotation, image_resource, resource and service. Fixes to_json.