Reorgs class hierarchy. Adds annotation, image_resource, resource and se...

...rvice.