cleanup

Fixed the bundle name (easyshare-plugin).
Various cleanup.