Add Flickr, restructure client handling