[f-spot] Desuffix all exporters.

From: Ruben Vermeersch <rubenv src gnome org>
To: commits-list gnome org
Cc:
Subject: [f-spot] Desuffix all exporters.
Date: Mon, 9 Aug 2010 17:41:45 +0000 (UTC)
commit 433c54f87c1984c87dc14e7b65bd44f61de058ad
Author: Ruben Vermeersch <ruben savanne be>
Date:   Mon Aug 9 19:41:12 2010 +0200

    Desuffix all exporters.

 F-Spot.sln                                         |   16 +++---
 build/build.environment.mk                         |    2 +-
 configure.ac                                       |   16 +++---
 po/POTFILES.in                                     |   52 ++++++++++----------
 po/POTFILES.skip                                   |   18 +++---
 .../Exporters/FSpot.Exporters.CD/Makefile.am       |    2 +-
 .../.gitignore                                     |    0
 .../FSpot.Exporters.Facebook.csproj}               |   12 ++--
 .../FSpot.Exporters.Facebook}/FacebookExport.cs    |    2 +-
 .../FacebookExportDialog.cs                        |    2 +-
 .../FSpot.Exporters.Facebook}/FacebookTagPopup.cs  |    2 +-
 .../FindNullableClashes.cs                         |    0
 .../Makefile.am                                    |    8 ++--
 .../Mono.Facebook/Album.cs                         |    0
 .../Mono.Facebook/AssemblyInfo.cs                  |    0
 .../Mono.Facebook/Error.cs                         |    0
 .../Mono.Facebook/Event.cs                         |    0
 .../Mono.Facebook/FacebookException.cs             |    0
 .../Mono.Facebook/FacebookParam.cs                 |    0
 .../Mono.Facebook/FacebookSession.cs               |    0
 .../Mono.Facebook/Friend.cs                        |    0
 .../Mono.Facebook/FriendInfo.cs                    |    0
 .../Mono.Facebook/Group.cs                         |    0
 .../Mono.Facebook/Location.cs                      |    0
 .../Mono.Facebook/Notification.cs                  |    0
 .../Mono.Facebook/PeopleList.cs                    |    0
 .../Mono.Facebook/Photo.cs                         |    0
 .../Mono.Facebook/Responses.cs                     |    0
 .../Mono.Facebook/SessionInfo.cs                   |    0
 .../Mono.Facebook/SessionWrapper.cs                |    0
 .../Mono.Facebook/Tag.cs                           |    0
 .../Mono.Facebook/User.cs                          |    0
 .../Mono.Facebook/Util.cs                          |    0
 .../Mono.Facebook/facebook.cs                      |    0
 .../Mono.Facebook/facebook.xsd                     |    0
 .../Resources/FacebookExport.addin.xml             |    2 +-
 .../Resources/FacebookExport.ui                    |    0
 .../.gitignore                                     |    0
 .../FSpot.Exporters.Flickr.csproj}                 |   10 ++--
 .../FSpot.Exporters.Flickr}/FlickrExport.cs        |    2 +-
 .../FSpot.Exporters.Flickr}/FlickrRemote.cs        |   12 ++--
 .../Makefile.am                                    |    6 +-
 .../Resources/FlickrExport.addin.xml               |    6 +-
 .../Resources/FlickrExport.glade                   |    0
 .../.gitignore                                     |    0
 .../FSpot.Exporters.Folder.csproj}                 |    8 ++--
 .../FSpot.Exporters.Folder}/FolderExport.cs        |    2 +-
 .../Makefile.am                                    |    4 +-
 .../Resources/FolderExport.addin.xml               |    2 +-
 .../Resources/FolderExport.glade                   |    0
 .../Resources/f-spot-simple-white.css              |    0
 .../Resources/f-spot-simple.css                    |    0
 .../Resources/f-spot.js                            |    0
 .../.gitignore                                     |    0
 .../FSpot.Exporters.Gallery.csproj}                |   12 ++--
 .../FSpot.Exporters.Gallery}/FormClient.cs         |    2 +-
 .../FSpot.Exporters.Gallery}/GalleryExport.cs      |    2 +-
 .../FSpot.Exporters.Gallery}/GalleryRemote.cs      |    2 +-
 .../Makefile.am                                    |    8 ++--
 .../Resources/GalleryExport.addin.xml              |    2 +-
 .../Resources/GalleryExport.glade                  |    0
 .../.gitignore                                     |    0
 .../FSpot.Exporters.PicasaWeb.csproj}              |    8 ++--
 .../FSpot.Exporters.PicasaWeb}/PicasaWebExport.cs  |   16 +++---
 .../Makefile.am                                    |    2 +-
 .../Resources/PicasaWebExport.addin.xml            |    2 +-
 .../Resources/PicasaWebExport.glade                |    0
 .../.gitignore                                     |    0
 .../FSpot.Exporters.SmugMug.csproj}                |    6 +-
 .../FSpot.Exporters.SmugMug}/SmugMugExport.cs      |    2 +-
 .../Makefile.am                                    |    4 +-
 .../Resources/SmugMugExport.addin.xml              |    2 +-
 .../Resources/SmugMugExport.glade                  |    0
 .../.gitignore                                     |    0
 .../AssemblyInfo.cs                                |    0
 .../FSpot.Exporters.Tabblo.csproj}                 |   22 ++++----
 .../ApplicationCentricCertificatePolicy.cs         |    2 +-
 .../BlindTrustCertificatePolicy.cs                 |    2 +-
 .../FSpot.Exporters.Tabblo}/FSpotTraceListener.cs  |    2 +-
 .../FSpot.Exporters.Tabblo}/FSpotUploadProgress.cs |    2 +-
 .../FSpot.Exporters.Tabblo}/TabbloExport.cs        |    2 +-
 .../FSpot.Exporters.Tabblo}/TabbloExportModel.cs   |    2 +-
 .../FSpot.Exporters.Tabblo}/TabbloExportView.cs    |    2 +-
 .../UserDecisionCertificatePolicy.cs               |    2 +-
 .../Exporters/FSpot.Exporters.Tabblo/Makefile.am   |   23 +++++++++
 .../Resources/TabbloExport.addin.xml               |    2 +-
 .../Resources/ui/TabbloExport.ui                   |    0
 .../Resources/ui/TrustError.ui                     |    0
 .../FSpot.Exporters.TabbloExport/Makefile.am       |   23 ---------
 .../.gitignore                                     |    0
 .../FSpot.Exporters.Zip.csproj}                    |    8 ++--
 .../FSpot.Exporters.Zip}/ZipExport.cs              |    2 +-
 .../Makefile.am                                    |    4 +-
 .../Resources/ZipExport.addin.xml                  |    2 +-
 .../Resources/ZipExport.glade                      |    0
 src/Extensions/Exporters/Makefile.am               |   18 +++---
 96 files changed, 188 insertions(+), 188 deletions(-)
---
diff --git a/F-Spot.sln b/F-Spot.sln
index 9fed98d..18d4833 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -65,21 +65,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exporters", "Exporters", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.CD", "src\Extensions\Exporters\FSpot.Exporters.CD\FSpot.Exporters.CD.csproj", "{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.FacebookExport", "src\Extensions\Exporters\FSpot.Exporters.FacebookExport\FSpot.Exporters.FacebookExport.csproj", "{7004A4E6-12A5-46F1-BB1F-578FA9B63493}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.Facebook", "src\Extensions\Exporters\FSpot.Exporters.Facebook\FSpot.Exporters.Facebook.csproj", "{7004A4E6-12A5-46F1-BB1F-578FA9B63493}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.FlickrExport", "src\Extensions\Exporters\FSpot.Exporters.FlickrExport\FSpot.Exporters.FlickrExport.csproj", "{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.Flickr", "src\Extensions\Exporters\FSpot.Exporters.Flickr\FSpot.Exporters.Flickr.csproj", "{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.FolderExport", "src\Extensions\Exporters\FSpot.Exporters.FolderExport\FSpot.Exporters.FolderExport.csproj", "{7FBEAF56-65E5-4C07-B346-C6A0BC87B368}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.Folder", "src\Extensions\Exporters\FSpot.Exporters.Folder\FSpot.Exporters.Folder.csproj", "{7FBEAF56-65E5-4C07-B346-C6A0BC87B368}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.GalleryExport", "src\Extensions\Exporters\FSpot.Exporters.GalleryExport\FSpot.Exporters.GalleryExport.csproj", "{E55F73E0-576A-4FE2-9108-E76960820AA3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.Gallery", "src\Extensions\Exporters\FSpot.Exporters.Gallery\FSpot.Exporters.Gallery.csproj", "{E55F73E0-576A-4FE2-9108-E76960820AA3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.PicasaWebExport", "src\Extensions\Exporters\FSpot.Exporters.PicasaWebExport\FSpot.Exporters.PicasaWebExport.csproj", "{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.PicasaWeb", "src\Extensions\Exporters\FSpot.Exporters.PicasaWeb\FSpot.Exporters.PicasaWeb.csproj", "{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.SmugMugExport", "src\Extensions\Exporters\FSpot.Exporters.SmugMugExport\FSpot.Exporters.SmugMugExport.csproj", "{BE981FC8-9B41-4336-815C-ECC365AE05D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.SmugMug", "src\Extensions\Exporters\FSpot.Exporters.SmugMug\FSpot.Exporters.SmugMug.csproj", "{BE981FC8-9B41-4336-815C-ECC365AE05D4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.ZipExport", "src\Extensions\Exporters\FSpot.Exporters.ZipExport\FSpot.Exporters.ZipExport.csproj", "{4C9355A7-1797-4708-A1F2-FBCDB782D04D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.Zip", "src\Extensions\Exporters\FSpot.Exporters.Zip\FSpot.Exporters.Zip.csproj", "{4C9355A7-1797-4708-A1F2-FBCDB782D04D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.TabbloExport", "src\Extensions\Exporters\FSpot.Exporters.TabbloExport\FSpot.Exporters.TabbloExport.csproj", "{414E9813-E0A8-4BD4-8694-485F528518F5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.Tabblo", "src\Extensions\Exporters\FSpot.Exporters.Tabblo\FSpot.Exporters.Tabblo.csproj", "{414E9813-E0A8-4BD4-8694-485F528518F5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 9aed79e..1841b15 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -140,7 +140,7 @@ REF_FSPOT_EXTENSION_BWEDITOR = $(LINK_FSPOT_DEPS) $(LINK_MONO_SIMD)
 REF_FSPOT_EXTENSION_FLIPEDITOR = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_PIXELATEEDITOR = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_RESIZEEDITOR = $(LINK_FSPOT_DEPS)
-REF_FSPOT_EXTENSION_CD = $(LINK_FSPOT_DEPS)
+REF_FSPOT_EXTENSION_CDEXPORT = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_FACEBOOKEXPORT = $(LINK_FSPOT_DEPS) $(LINK_KEYRING)
 REF_FSPOT_EXTENSION_FLICKREXPORT = $(LINK_FSPOT_DEPS) $(LINK_FLICKRNET)
 REF_FSPOT_EXTENSION_FOLDEREXPORT = $(LINK_FSPOT_DEPS) $(LINK_SYSTEM_WEB)
diff --git a/configure.ac b/configure.ac
index d75f950..f92599e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,14 +368,14 @@ src/Extensions/Editors/FSpot.Editors.PixelateEditor/Makefile
 src/Extensions/Editors/FSpot.Editors.ResizeEditor/Makefile
 src/Extensions/Exporters/Makefile
 src/Extensions/Exporters/FSpot.Exporters.CD/Makefile
-src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Makefile
-src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Makefile
-src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Makefile
-src/Extensions/Exporters/FSpot.Exporters.FolderExport/Makefile
-src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Makefile
-src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Makefile
-src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Makefile
-src/Extensions/Exporters/FSpot.Exporters.ZipExport/Makefile
+src/Extensions/Exporters/FSpot.Exporters.Flickr/Makefile
+src/Extensions/Exporters/FSpot.Exporters.Gallery/Makefile
+src/Extensions/Exporters/FSpot.Exporters.Facebook/Makefile
+src/Extensions/Exporters/FSpot.Exporters.Folder/Makefile
+src/Extensions/Exporters/FSpot.Exporters.SmugMug/Makefile
+src/Extensions/Exporters/FSpot.Exporters.Tabblo/Makefile
+src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Makefile
+src/Extensions/Exporters/FSpot.Exporters.Zip/Makefile
 src/Extensions/Tools/Makefile
 src/Extensions/Tools/RawPlusJpeg/Makefile
 src/Extensions/Tools/ChangePhotoPath/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2b023a3..da2f258 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,8 @@ data/desktop-files/f-spot.desktop.in.in
 data/desktop-files/f-spot-import.desktop.in.in
 data/desktop-files/f-spot-view.desktop.in.in
 f-spot.schemas.in
+lib/Mono.Google/Mono.Google/CaptchaException.cs
+lib/Mono.Tabblo/Mono.Tabblo/Connection.cs
 src/Clients/MainApp/FSpot.addin.xml
 src/Clients/MainApp/FSpot/App.cs
 src/Clients/MainApp/FSpot.Database/Updater.cs
@@ -27,6 +29,7 @@ src/Clients/MainApp/FSpot/ItemAction.cs
 src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
 src/Clients/MainApp/FSpot/MainWindow.cs
 src/Clients/MainApp/FSpot/Photo.cs
+src/Clients/MainApp/FSpot/PhotoStore.cs
 src/Clients/MainApp/FSpot/PhotoView.cs
 src/Clients/MainApp/FSpot/Preferences.cs
 src/Clients/MainApp/FSpot/PrintOperation.cs
@@ -36,6 +39,7 @@ src/Clients/MainApp/FSpot/SendEmail.cs
 src/Clients/MainApp/FSpot/SingleView.cs
 src/Clients/MainApp/FSpot/TagQueryWidget.cs
 src/Clients/MainApp/FSpot/TagSelectionWidget.cs
+src/Clients/MainApp/FSpot/TagStore.cs
 src/Clients/MainApp/FSpot/Term.cs
 src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
 src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
@@ -70,13 +74,11 @@ src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs
 src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
 src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
 src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
-src/Clients/MainApp/PhotoStore.cs
 src/Clients/MainApp/PhotoTagMenu.cs
 src/Clients/MainApp/PhotoVersionCommands.cs
 src/Clients/MainApp/PhotoVersionMenu.cs
 src/Clients/MainApp/TagCommands.cs
 src/Clients/MainApp/TagPopup.cs
-src/Clients/MainApp/TagStore.cs
 src/Clients/MainApp/ThumbnailCommand.cs
 [type: gettext/glade]src/Clients/MainApp/ui/import.ui
 [type: gettext/glade]src/Clients/MainApp/ui/mail_dialog.ui
@@ -91,30 +93,28 @@ src/Extensions/Editors/FSpot.Editors.BWEditor/FSpot.Addins.Editors/BWEditor.cs
 src/Extensions/Editors/FSpot.Editors.FlipEditor/FSpot.Addins.Editors/FlipEditor.cs
 src/Extensions/Editors/FSpot.Editors.PixelateEditor/FSpot.Addins.Editors/PixelateEditor.cs
 src/Extensions/Editors/FSpot.Editors.ResizeEditor/FSpot.Addins.Editors/ResizeEditor.cs
-src/Extensions/Exporters/CDExport/CDExport.cs
-[type: gettext/glade]src/Extensions/Exporters/CDExport/CDExport.ui
-src/Extensions/Exporters/FacebookExport/FacebookExport.cs
-src/Extensions/Exporters/FacebookExport/FacebookExportDialog.cs
-[type: gettext/glade]src/Extensions/Exporters/FacebookExport/FacebookExport.ui
-src/Extensions/Exporters/FlickrExport/FlickrExport.cs
-[type: gettext/glade]src/Extensions/Exporters/FlickrExport/FlickrExport.glade
-src/Extensions/Exporters/FolderExport/FolderExport.cs
-[type: gettext/glade]src/Extensions/Exporters/FolderExport/FolderExport.glade
-src/Extensions/Exporters/GalleryExport/FormClient.cs
-src/Extensions/Exporters/GalleryExport/GalleryExport.cs
-[type: gettext/glade]src/Extensions/Exporters/GalleryExport/GalleryExport.glade
-src/Extensions/Exporters/GalleryExport/GalleryRemote.cs
-src/Extensions/Exporters/PicasaWebExport/google-sharp/CaptchaException.cs
-src/Extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
-[type: gettext/glade]src/Extensions/Exporters/PicasaWebExport/PicasaWebExport.glade
-src/Extensions/Exporters/SmugMugExport/SmugMugExport.cs
-[type: gettext/glade]src/Extensions/Exporters/SmugMugExport/SmugMugExport.glade
-src/Extensions/Exporters/TabbloExport/Tabblo/Connection.cs
-src/Extensions/Exporters/TabbloExport/TabbloExport.cs
-[type: gettext/glade]src/Extensions/Exporters/TabbloExport/ui/TabbloExport.ui
-[type: gettext/glade]src/Extensions/Exporters/TabbloExport/ui/TrustError.ui
-src/Extensions/Exporters/ZipExport/ZipExport.cs
-[type: gettext/glade]src/Extensions/Exporters/ZipExport/ZipExport.glade
+src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui
+src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
+src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui
+src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.glade
+src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.glade
+src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
+src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
+src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.glade
+src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.glade
+src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.glade
+src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui
+src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
+[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.glade
 [type: gettext/glade]src/Extensions/Tools/ChangePhotoPath/ChangePhotoPath.glade
 src/Extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
 src/Extensions/Tools/HashJob/HashJob.cs
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 47a1f78..44d9c55 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -21,15 +21,6 @@ lib/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs
 lib/Hyena/Hyena/Hyena.Query/StringQueryValue.cs
 lib/Hyena/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs
 src/Core/FSpot.Widgets/FSpot.Widgets/DateEdit.cs
-src/Extensions/Exporters/CDExport/CDExport.addin.xml
-src/Extensions/Exporters/FacebookExport/FacebookExport.addin.xml
-src/Extensions/Exporters/FlickrExport/FlickrExport.addin.xml
-src/Extensions/Exporters/FolderExport/FolderExport.addin.xml
-src/Extensions/Exporters/GalleryExport/GalleryExport.addin.xml
-src/Extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
-src/Extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml
-src/Extensions/Exporters/TabbloExport/TabbloExport.addin.xml
-src/Extensions/Exporters/ZipExport/ZipExport.addin.xml
 src/Extensions/Tools/ChangePhotoPath/ChangePhotoPath.addin.xml
 src/Extensions/Tools/DevelopInUFraw/DevelopInUFRaw.addin.xml
 src/Extensions/Tools/HashJob/HashJob.addin.xml
@@ -46,3 +37,12 @@ src/Extensions/Tools/RetroactiveRoll/RetroactiveRoll.addin.xml
 src/Extensions/Tools/ScreensaverConfig/ScreensaverConfig.addin.xml
 src/Extensions/Tools/SyncCatalog/SyncCatalog.addin.xml
 src/Extensions/Tools/SyncCatalog/SyncCatalog.cs
+src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml
+src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.CD/Makefile.am
index a8c94e0..08aba01 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/Makefile.am
@@ -1,6 +1,6 @@
 ASSEMBLY = FSpot.Exporters.CD
 TARGET = library
-LINK = $(REF_FSPOT_EXTENSION_CD)
+LINK = $(REF_FSPOT_EXTENSION_CDEXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.Facebook/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
similarity index 93%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
index c9e7bda..9abadd0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7004A4E6-12A5-46F1-BB1F-578FA9B63493}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.FacebookExport</RootNamespace>
-    <AssemblyName>FSpot.Exporters.FacebookExport</AssemblyName>
+    <RootNamespace>FSpot.Exporters.Facebook</RootNamespace>
+    <AssemblyName>FSpot.Exporters.Facebook</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
@@ -53,9 +53,9 @@
     <Compile Include="Mono.Facebook\Tag.cs" />
     <Compile Include="Mono.Facebook\User.cs" />
     <Compile Include="Mono.Facebook\Util.cs" />
-    <Compile Include="FSpot.Exporters.FacebookExport\FacebookExport.cs" />
-    <Compile Include="FSpot.Exporters.FacebookExport\FacebookExportDialog.cs" />
-    <Compile Include="FSpot.Exporters.FacebookExport\FacebookTagPopup.cs" />
+    <Compile Include="FSpot.Exporters.Facebook\FacebookExport.cs" />
+    <Compile Include="FSpot.Exporters.Facebook\FacebookExportDialog.cs" />
+    <Compile Include="FSpot.Exporters.Facebook\FacebookTagPopup.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\FacebookExport.addin.xml">
@@ -81,8 +81,8 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.FacebookExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.Facebook\" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Core" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
index 5a1175f..c16e66f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
@@ -38,7 +38,7 @@ using FSpot.Platform;
 
 using Mono.Facebook;
 
-namespace FSpot.Exporters.FacebookExport
+namespace FSpot.Exporters.Facebook
 {
 	internal class FacebookAccount
 	{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookExportDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookExportDialog.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs
index 3e0df12..046b7cd 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookExportDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs
@@ -32,7 +32,7 @@ using FSpot.UI.Dialog;
 using Mono.Facebook;
 using Mono.Unix;
 
-namespace FSpot.Exporters.FacebookExport
+namespace FSpot.Exporters.Facebook
 {
 	internal class FacebookExportDialog : BuilderDialog
 	{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookTagPopup.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
similarity index 94%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookTagPopup.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
index c118d47..71019c4 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FSpot.Exporters.FacebookExport/FacebookTagPopup.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
@@ -16,7 +16,7 @@ using System.Collections.Generic;
 using FSpot.Widgets;
 using Mono.Facebook;
 
-namespace FSpot.Exporters.FacebookExport
+namespace FSpot.Exporters.Facebook
 {	
 	internal class FacebookTagPopup : BuilderWindow
 	{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FindNullableClashes.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/FindNullableClashes.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Makefile.am
similarity index 81%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Makefile.am
index b18700a..2286149 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Makefile.am
@@ -1,13 +1,13 @@
-ASSEMBLY = FSpot.Exporters.FacebookExport
+ASSEMBLY = FSpot.Exporters.Facebook
 TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_FACEBOOKEXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
 	FindNullableClashes.cs \
-	FSpot.Exporters.FacebookExport/FacebookExport.cs \
-	FSpot.Exporters.FacebookExport/FacebookExportDialog.cs \
-	FSpot.Exporters.FacebookExport/FacebookTagPopup.cs \
+	FSpot.Exporters.Facebook/FacebookExport.cs \
+	FSpot.Exporters.Facebook/FacebookExportDialog.cs \
+	FSpot.Exporters.Facebook/FacebookTagPopup.cs \
 	Mono.Facebook/Album.cs \
 	Mono.Facebook/Error.cs \
 	Mono.Facebook/Event.cs \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Album.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Album.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/AssemblyInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/AssemblyInfo.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/AssemblyInfo.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/AssemblyInfo.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Error.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Error.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Event.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Event.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FacebookException.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FacebookException.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FacebookParam.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FacebookParam.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FacebookSession.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FacebookSession.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Friend.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Friend.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FriendInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/FriendInfo.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Group.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Group.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Location.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Location.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Notification.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Notification.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/PeopleList.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/PeopleList.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Photo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Photo.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Responses.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Responses.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/SessionInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/SessionInfo.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/SessionWrapper.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/SessionWrapper.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Tag.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Tag.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/User.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/User.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Util.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/Util.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/facebook.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/facebook.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/facebook.xsd b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.xsd
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Mono.Facebook/facebook.xsd
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.xsd
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Resources/FacebookExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml
similarity index 90%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Resources/FacebookExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml
index 42b2d1f..9ae9c91 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Resources/FacebookExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml
@@ -11,6 +11,6 @@
 		<Addin id="Core" version="0.7.0.0"/>
 	</Dependencies>
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="Facebook" _label = "F_acebook..." class = "FSpot.Exporters.FacebookExport.FacebookExport" />
+		<ExportMenuItem id="Facebook" _label = "F_acebook..." class = "FSpot.Exporters.Facebook.FacebookExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Resources/FacebookExport.ui b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Resources/FacebookExport.ui
rename to src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.Flickr/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FlickrExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.Flickr/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
similarity index 92%
rename from src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
index be95560..d07ce21 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.FlickrExport</RootNamespace>
-    <AssemblyName>FSpot.Exporters.FlickrExport</AssemblyName>
+    <RootNamespace>FSpot.Exporters.Flickr</RootNamespace>
+    <AssemblyName>FSpot.Exporters.Flickr</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
@@ -32,8 +32,8 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.FlickrExport\FlickrRemote.cs" />
-    <Compile Include="FSpot.Exporters.FlickrExport\FlickrExport.cs" />
+    <Compile Include="FSpot.Exporters.Flickr\FlickrRemote.cs" />
+    <Compile Include="FSpot.Exporters.Flickr\FlickrExport.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\FlickrExport.addin.xml">
@@ -93,7 +93,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.FlickrExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.Flickr\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport/FlickrExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport/FlickrExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
index ab01238..fc20739 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport/FlickrExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
@@ -14,7 +14,7 @@ using FSpot.UI.Dialog;
 using Hyena;
 using Hyena.Widgets;
 
-namespace FSpot.Exporters.FlickrExport {
+namespace FSpot.Exporters.Flickr {
 	public class TwentyThreeHQExport : FlickrExport
 	{
 		public override void Run (IBrowsableCollection selection)
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport/FlickrRemote.cs b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
similarity index 95%
rename from src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport/FlickrRemote.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
index 66a5023..388661d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/FSpot.Exporters.FlickrExport/FlickrRemote.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
@@ -20,13 +20,13 @@ using FSpot.Utils;
 using FSpot.Filters;
 using Hyena;
 
-namespace FSpot.Exporters.FlickrExport {
+namespace FSpot.Exporters.Flickr {
 public class FlickrRemote {
 	public static Licenses    licenses;
 	private string            frob;
 	private string            token;
 	private Auth              auth;
-	private Flickr            flickr;
+	private FlickrNet.Flickr            flickr;
 
 	public bool               ExportTags;
 	public bool               ExportTagHierarchy;
@@ -40,10 +40,10 @@ public class FlickrRemote {
 	public FlickrRemote (string token, Service service)
 	{
 		if (token == null || token.Length == 0) {
-			this.flickr = new Flickr (service.ApiKey, service.Secret);
+			this.flickr = new FlickrNet.Flickr (service.ApiKey, service.Secret);
 			this.token = null;
 		} else {
-			this.flickr = new Flickr (service.ApiKey, service.Secret, token);
+			this.flickr = new FlickrNet.Flickr (service.ApiKey, service.Secret, token);
 			this.token = token;
 		}
 
@@ -58,7 +58,7 @@ public class FlickrRemote {
 		}
 	}
 
-	public Flickr Connection {
+	public FlickrNet.Flickr Connection {
 		get { return flickr; }
 	}
 
@@ -239,4 +239,4 @@ public class FlickrRemote {
 		}
 	}
 }
-}
\ No newline at end of file
+}
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.Flickr/Makefile.am
similarity index 63%
rename from src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.Flickr/Makefile.am
index 77b560a..f0a34fb 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/Makefile.am
@@ -1,11 +1,11 @@
-ASSEMBLY = FSpot.Exporters.FlickrExport
+ASSEMBLY = FSpot.Exporters.Flickr
 TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_FLICKREXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
-	FSpot.Exporters.FlickrExport/FlickrExport.cs \
-	FSpot.Exporters.FlickrExport/FlickrRemote.cs
+	FSpot.Exporters.Flickr/FlickrExport.cs \
+	FSpot.Exporters.Flickr/FlickrRemote.cs
 
 RESOURCES =  \
 	Resources/FlickrExport.addin.xml \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Resources/FlickrExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml
similarity index 81%
rename from src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Resources/FlickrExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml
index 4fae45c..312681f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Resources/FlickrExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml
@@ -12,8 +12,8 @@
 	</Dependencies>
 
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="Flickr" _label = "_Flickr..." class = "FSpot.Exporters.FlickrExport.FlickrExport" />
-		<ExportMenuItem id="23hq" _label = "_23hq..." class = "FSpot.Exporters.FlickrExport.TwentyThreeHQExport" />
-		<ExportMenuItem id="zooomr" _label = "_Zooomr..." class = "FSpot.Exporters.FlickrExport.ZooomrExport" />
+		<ExportMenuItem id="Flickr" _label = "_Flickr..." class = "FSpot.Exporters.Flickr.FlickrExport" />
+		<ExportMenuItem id="23hq" _label = "_23hq..." class = "FSpot.Exporters.Flickr.TwentyThreeHQExport" />
+		<ExportMenuItem id="zooomr" _label = "_Zooomr..." class = "FSpot.Exporters.Flickr.ZooomrExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Resources/FlickrExport.glade b/src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.glade
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Resources/FlickrExport.glade
rename to src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.glade
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.Folder/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/FSpot.Exporters.FolderExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
similarity index 94%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/FSpot.Exporters.FolderExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
index ab1a107..7c3061e 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/FSpot.Exporters.FolderExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7FBEAF56-65E5-4C07-B346-C6A0BC87B368}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.FolderExport</RootNamespace>
-    <AssemblyName>FSpot.Exporters.FolderExport</AssemblyName>
+    <RootNamespace>FSpot.Exporters.Folder</RootNamespace>
+    <AssemblyName>FSpot.Exporters.Folder</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.FolderExport\FolderExport.cs" />
+    <Compile Include="FSpot.Exporters.Folder\FolderExport.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\f-spot.js">
@@ -106,6 +106,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
-    <Folder Include="FSpot.Exporters.FolderExport\" />
+    <Folder Include="FSpot.Exporters.Folder\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/FSpot.Exporters.FolderExport/FolderExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/FSpot.Exporters.FolderExport/FolderExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
index a644121..8cef453 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/FSpot.Exporters.FolderExport/FolderExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
@@ -39,7 +39,7 @@ using FSpot.Widgets;
 using FSpot.Utils;
 using FSpot.UI.Dialog;
 
-namespace FSpot.Exporters.FolderExport {
+namespace FSpot.Exporters.Folder {
 	public class FolderExport : FSpot.Extensions.IExporter {
 		IBrowsableCollection selection;
 
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.Folder/Makefile.am
similarity index 76%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/Makefile.am
index fa23bae..115d01f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/Makefile.am
@@ -1,9 +1,9 @@
-ASSEMBLY = FSpot.Exporters.FolderExport
+ASSEMBLY = FSpot.Exporters.Folder
 TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_FOLDEREXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = FSpot.Exporters.FolderExport/FolderExport.cs
+SOURCES = FSpot.Exporters.Folder/FolderExport.cs
 
 RESOURCES =  \
 	Resources/FolderExport.addin.xml \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/FolderExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml
similarity index 91%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/FolderExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml
index 14705fa..e890d46 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/FolderExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml
@@ -12,6 +12,6 @@
 	</Dependencies>
 
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="Folder" _label = "F_older..." class = "FSpot.Exporters.FolderExport.FolderExport" />
+		<ExportMenuItem id="Folder" _label = "F_older..." class = "FSpot.Exporters.Folder.FolderExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/FolderExport.glade b/src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.glade
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/FolderExport.glade
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.glade
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/f-spot-simple-white.css b/src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/f-spot-simple-white.css
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/f-spot-simple-white.css
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/f-spot-simple-white.css
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/f-spot-simple.css b/src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/f-spot-simple.css
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/f-spot-simple.css
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/f-spot-simple.css
diff --git a/src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/f-spot.js b/src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/f-spot.js
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.FolderExport/Resources/f-spot.js
rename to src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/f-spot.js
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.Gallery/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
similarity index 91%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
index e322294..f362307 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E55F73E0-576A-4FE2-9108-E76960820AA3}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.GalleryExport</RootNamespace>
-    <AssemblyName>FSpot.Exporters.GalleryExport</AssemblyName>
+    <RootNamespace>FSpot.Exporters.Gallery</RootNamespace>
+    <AssemblyName>FSpot.Exporters.Gallery</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
@@ -32,9 +32,9 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.GalleryExport\FormClient.cs" />
-    <Compile Include="FSpot.Exporters.GalleryExport\GalleryExport.cs" />
-    <Compile Include="FSpot.Exporters.GalleryExport\GalleryRemote.cs" />
+    <Compile Include="FSpot.Exporters.Gallery\FormClient.cs" />
+    <Compile Include="FSpot.Exporters.Gallery\GalleryExport.cs" />
+    <Compile Include="FSpot.Exporters.Gallery\GalleryRemote.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\GalleryExport.addin.xml">
@@ -99,7 +99,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.GalleryExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.Gallery\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/FormClient.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/FormClient.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
index 548a95f..6820ca6 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/FormClient.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
@@ -8,7 +8,7 @@ using System.Web;
 using Hyena;
 using FSpot.Core;
 
-namespace FSpot.Exporters.GalleryExport {
+namespace FSpot.Exporters.Gallery {
 	public class FormClient {
 		private struct FormItem {
 			public string Name;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/GalleryExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/GalleryExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
index 908748a..785a4b2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/GalleryExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
@@ -18,7 +18,7 @@ using FSpot.Extensions;
 using Hyena;
 using Hyena.Widgets;
 
-namespace FSpot.Exporters.GalleryExport {
+namespace FSpot.Exporters.Gallery {
 	public class GalleryAccount {
 		public GalleryAccount (string name, string url, string username, string password) : this (name, url, username, password, GalleryVersion.VersionUnknown) {}
 		public GalleryAccount (string name, string url, string username, string password, GalleryVersion version)
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/GalleryRemote.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/GalleryRemote.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
index e6c3948..87abf34 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/FSpot.Exporters.GalleryExport/GalleryRemote.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
@@ -17,7 +17,7 @@ using Hyena.Widgets;
  * http://codex.gallery2.org/index.php/Gallery_Remote:Protocol
  */
 
-namespace FSpot.Exporters.GalleryExport {
+namespace FSpot.Exporters.Gallery {
 	public enum AlbumPermission : byte
 	{
 		None = 0,
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.Gallery/Makefile.am
similarity index 56%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/Makefile.am
index 0e8f18a..436b5ef 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/Makefile.am
@@ -1,12 +1,12 @@
-ASSEMBLY = FSpot.Exporters.GalleryExport
+ASSEMBLY = FSpot.Exporters.Gallery
 TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_GALLERYEXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
-	FSpot.Exporters.GalleryExport/FormClient.cs \
-	FSpot.Exporters.GalleryExport/GalleryExport.cs \
-	FSpot.Exporters.GalleryExport/GalleryRemote.cs
+	FSpot.Exporters.Gallery/FormClient.cs \
+	FSpot.Exporters.Gallery/GalleryExport.cs \
+	FSpot.Exporters.Gallery/GalleryRemote.cs
 
 RESOURCES =  \
 	Resources/GalleryExport.addin.xml \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Resources/GalleryExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml
similarity index 90%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Resources/GalleryExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml
index 7775469..314bd11 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Resources/GalleryExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml
@@ -12,6 +12,6 @@
 	</Dependencies>
 
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="Gallery" _label = "Web _Gallery..." class = "FSpot.Exporters.GalleryExport.GalleryExport" />
+		<ExportMenuItem id="Gallery" _label = "Web _Gallery..." class = "FSpot.Exporters.Gallery.GalleryExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Resources/GalleryExport.glade b/src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.glade
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Resources/GalleryExport.glade
rename to src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.glade
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/FSpot.Exporters.PicasaWebExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
similarity index 93%
rename from src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/FSpot.Exporters.PicasaWebExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
index 7870ba8..62d42df 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/FSpot.Exporters.PicasaWebExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.PicasaWebExport</RootNamespace>
-    <AssemblyName>FSpot.Exporters.PicasaWebExport</AssemblyName>
+    <RootNamespace>FSpot.Exporters.PicasaWeb</RootNamespace>
+    <AssemblyName>FSpot.Exporters.PicasaWeb</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.PicasaWebExport\PicasaWebExport.cs" />
+    <Compile Include="FSpot.Exporters.PicasaWeb\PicasaWebExport.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\PicasaWebExport.addin.xml">
@@ -58,8 +58,8 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.PicasaWebExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.PicasaWeb\" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/FSpot.Exporters.PicasaWebExport/PicasaWebExport.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
similarity index 98%
rename from src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/FSpot.Exporters.PicasaWebExport/PicasaWebExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
index 01e8d2c..c9e32a8 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/FSpot.Exporters.PicasaWebExport/PicasaWebExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
@@ -31,7 +31,7 @@ using Gnome.Keyring;
 using Mono.Google;
 using Mono.Google.Picasa;
 
-namespace FSpot.Exporters.PicasaWebExport {
+namespace FSpot.Exporters.PicasaWeb {
 	public class GoogleAccount {
 
 		private string username;
@@ -39,7 +39,7 @@ namespace FSpot.Exporters.PicasaWebExport {
 		private string token;
 		private string unlock_captcha;
 		private GoogleConnection connection;
-		private PicasaWeb picasa;
+		private Mono.Google.Picasa.PicasaWeb picasa;
 
 		public GoogleAccount (string username, string password)
 		{
@@ -55,7 +55,7 @@ namespace FSpot.Exporters.PicasaWebExport {
 			this.unlock_captcha = unlock_captcha;
 		}
 
-		public PicasaWeb Connect ()
+		public Mono.Google.Picasa.PicasaWeb Connect ()
 		{
 			Log.Debug ("GoogleAccount.Connect()");
 			GoogleConnection conn = new GoogleConnection (GoogleService.Picasa);
@@ -68,7 +68,7 @@ namespace FSpot.Exporters.PicasaWebExport {
 				unlock_captcha = null;
 			}
 			connection = conn;
-			PicasaWeb picasa = new PicasaWeb(conn);
+			var picasa = new Mono.Google.Picasa.PicasaWeb(conn);
 			this.picasa = picasa;
 			return picasa;
 		}
@@ -126,7 +126,7 @@ namespace FSpot.Exporters.PicasaWebExport {
 			}
 		}
 
-		public PicasaWeb Picasa {
+		public Mono.Google.Picasa.PicasaWeb Picasa {
 			get {
 				return picasa;
 			}
@@ -396,12 +396,12 @@ namespace FSpot.Exporters.PicasaWebExport {
 		private string dialog_name = "google_add_album_dialog";
 
 		private GoogleExport export;
-		private PicasaWeb picasa;
+		private Mono.Google.Picasa.PicasaWeb picasa;
 		private string description;
 		private string title;
 		private bool public_album;
 
-		public GoogleAddAlbum (GoogleExport export, PicasaWeb picasa)
+		public GoogleAddAlbum (GoogleExport export, Mono.Google.Picasa.PicasaWeb picasa)
 		{
 			xml = new Glade.XML (null, "PicasaWebExport.glade", dialog_name, "f-spot");
 			xml.Autoconnect (this);
@@ -817,7 +817,7 @@ namespace FSpot.Exporters.PicasaWebExport {
 			}
 		}
 
-		private void PopulateAlbumOptionMenu (PicasaWeb picasa)
+		private void PopulateAlbumOptionMenu (Mono.Google.Picasa.PicasaWeb picasa)
 		{
 			if (picasa != null) {
 				try {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Makefile.am
similarity index 81%
rename from src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Makefile.am
index 18c5f96..8b53c91 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Makefile.am
@@ -3,7 +3,7 @@ TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_PICASAWEBEXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = FSpot.Exporters.PicasaWebExport/PicasaWebExport.cs
+SOURCES = FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
 
 RESOURCES =  \
 	Resources/PicasaWebExport.addin.xml \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Resources/PicasaWebExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml
similarity index 89%
rename from src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Resources/PicasaWebExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml
index e1111d2..155e2f1 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Resources/PicasaWebExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml
@@ -12,6 +12,6 @@
 	</Dependencies>
 
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="PicasaWeb" _label = "_PicasaWeb..." class = "FSpot.Exporters.PicasaWebExport.GoogleExport" />
+		<ExportMenuItem id="PicasaWeb" _label = "_PicasaWeb..." class = "FSpot.Exporters.PicasaWeb.GoogleExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Resources/PicasaWebExport.glade b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.glade
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.PicasaWebExport/Resources/PicasaWebExport.glade
rename to src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.glade
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.SmugMug/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/FSpot.Exporters.SmugMugExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
similarity index 95%
rename from src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/FSpot.Exporters.SmugMugExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
index 98f560d..1ba769a 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/FSpot.Exporters.SmugMugExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
@@ -7,7 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BE981FC8-9B41-4336-815C-ECC365AE05D4}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.SmugMugExport</RootNamespace>
+    <RootNamespace>FSpot.Exporters.SmugMug</RootNamespace>
     <AssemblyName>FSpot.Exporters.SmugMugExport</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.SmugMugExport\SmugMugExport.cs" />
+    <Compile Include="FSpot.Exporters.SmugMug\SmugMugExport.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\SmugMugExport.addin.xml">
@@ -89,7 +89,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.SmugMugExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.SmugMug\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/FSpot.Exporters.SmugMugExport/SmugMugExport.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/FSpot.Exporters.SmugMugExport/SmugMugExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
index 612085c..16e29d0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/FSpot.Exporters.SmugMugExport/SmugMugExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
@@ -30,7 +30,7 @@ using FSpot.UI.Dialog;
 using Gnome.Keyring;
 using SmugMugNet;
 
-namespace FSpot.Exporters.SmugMugExport {
+namespace FSpot.Exporters.SmugMug {
 	public class SmugMugAccount {
 		private string username;
 		private string password;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/Makefile.am
similarity index 69%
rename from src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.SmugMug/Makefile.am
index e09e399..1b0ddb5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/Makefile.am
@@ -1,9 +1,9 @@
-ASSEMBLY = FSpot.Exporters.SmugMugExport
+ASSEMBLY = FSpot.Exporters.SmugMug
 TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_SMUGMUGEXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = FSpot.Exporters.SmugMugExport/SmugMugExport.cs
+SOURCES = FSpot.Exporters.SmugMug/SmugMugExport.cs
 
 RESOURCES =  \
 	Resources/SmugMugExport.addin.xml \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Resources/SmugMugExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml
similarity index 90%
rename from src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Resources/SmugMugExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml
index bfce7e8..32cecd4 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Resources/SmugMugExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml
@@ -12,6 +12,6 @@
 	</Dependencies>
 
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="SmugMug" _label = "_SmugMug..." class = "FSpot.Exporters.SmugMugExport.SmugMugExport" />
+		<ExportMenuItem id="SmugMug" _label = "_SmugMug..." class = "FSpot.Exporters.SmugMug.SmugMugExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Resources/SmugMugExport.glade b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.glade
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.SmugMugExport/Resources/SmugMugExport.glade
rename to src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.glade
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/AssemblyInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/AssemblyInfo.cs
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/AssemblyInfo.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/AssemblyInfo.cs
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
similarity index 84%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
index faaa1ca..ba25bc3 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{414E9813-E0A8-4BD4-8694-485F528518F5}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.TabbloExport</RootNamespace>
-    <AssemblyName>FSpot.Exporters.TabbloExport</AssemblyName>
+    <RootNamespace>FSpot.Exporters.Tabblo</RootNamespace>
+    <AssemblyName>FSpot.Exporters.Tabblo</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
@@ -32,14 +32,14 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.TabbloExport\ApplicationCentricCertificatePolicy.cs" />
-    <Compile Include="FSpot.Exporters.TabbloExport\BlindTrustCertificatePolicy.cs" />
-    <Compile Include="FSpot.Exporters.TabbloExport\FSpotTraceListener.cs" />
-    <Compile Include="FSpot.Exporters.TabbloExport\FSpotUploadProgress.cs" />
-    <Compile Include="FSpot.Exporters.TabbloExport\TabbloExport.cs" />
-    <Compile Include="FSpot.Exporters.TabbloExport\TabbloExportModel.cs" />
-    <Compile Include="FSpot.Exporters.TabbloExport\TabbloExportView.cs" />
-    <Compile Include="FSpot.Exporters.TabbloExport\UserDecisionCertificatePolicy.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\ApplicationCentricCertificatePolicy.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\BlindTrustCertificatePolicy.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\FSpotTraceListener.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\FSpotUploadProgress.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\TabbloExport.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\TabbloExportModel.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\TabbloExportView.cs" />
+    <Compile Include="FSpot.Exporters.Tabblo\UserDecisionCertificatePolicy.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\TabbloExport.addin.xml">
@@ -106,7 +106,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.TabbloExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.Tabblo\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/ApplicationCentricCertificatePolicy.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/ApplicationCentricCertificatePolicy.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
index 3822a40..059114e 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/ApplicationCentricCertificatePolicy.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
@@ -39,7 +39,7 @@ using System.Security.Cryptography.X509Certificates;
 
 using Hyena;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 
 	class ApplicationCentricCertificatePolicy : ICertificatePolicy {
 
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/BlindTrustCertificatePolicy.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs
similarity index 97%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/BlindTrustCertificatePolicy.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs
index 9f2cce4..90b700d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/BlindTrustCertificatePolicy.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs
@@ -32,7 +32,7 @@ using System.Security.Cryptography.X509Certificates;
 
 using Hyena;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 	class BlindTrustCertificatePolicy : ICertificatePolicy {
 		public bool CheckValidationResult (ServicePoint service_point,
 		                                   X509Certificate certificate,
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/FSpotTraceListener.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotTraceListener.cs
similarity index 97%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/FSpotTraceListener.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotTraceListener.cs
index 57b0a39..5c8caf9 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/FSpotTraceListener.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotTraceListener.cs
@@ -29,7 +29,7 @@
 
 using Hyena;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 
 	class FSpotTraceListener : System.Diagnostics.TraceListener {
 
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/FSpotUploadProgress.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
similarity index 98%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/FSpotUploadProgress.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
index ed8c791..8b0b1f6 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/FSpotUploadProgress.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
@@ -33,7 +33,7 @@ using System;
 using FSpot.UI.Dialog;
 using FSpot.Utils;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 
 	class FSpotUploadProgress : TotalUploadProgress	{
 
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
index 147825c..a70fda3 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
@@ -41,7 +41,7 @@ using FSpot;
 using FSpot.Core;
 using FSpot.UI.Dialog;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 
 	public class TabbloExport : FSpot.Extensions.IExporter {
 
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExportModel.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExportModel.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
index 201b277..811a64c 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExportModel.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
@@ -38,7 +38,7 @@ using System.Diagnostics;
 
 using FSpot.Core;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 
 	class TabbloExportModel : Mono.Tabblo.IPreferences {
 
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExportView.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
similarity index 98%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExportView.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
index b51ed48..341cacd 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/TabbloExportView.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
@@ -33,7 +33,7 @@ using System.Reflection;
 
 using FSpot.Core;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 
 
 	class TabbloExportView : FSpot.UI.Dialog.BuilderDialog {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/UserDecisionCertificatePolicy.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs
similarity index 98%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/UserDecisionCertificatePolicy.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs
index 963a3a9..ede6243 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/FSpot.Exporters.TabbloExport/UserDecisionCertificatePolicy.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs
@@ -36,7 +36,7 @@ using System.Threading;
 
 using Hyena;
 
-namespace FSpot.Exporters.TabbloExport {
+namespace FSpot.Exporters.Tabblo {
 
 	class UserDecisionCertificatePolicy
 			: ApplicationCentricCertificatePolicy {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/Makefile.am
new file mode 100644
index 0000000..5616a66
--- /dev/null
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/Makefile.am
@@ -0,0 +1,23 @@
+ASSEMBLY = FSpot.Exporters.Tabblo
+TARGET = library
+LINK = $(REF_FSPOT_EXTENSION_TABBLOEXPORT)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+
+SOURCES =  \
+	FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs \
+	FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs \
+	FSpot.Exporters.Tabblo/FSpotTraceListener.cs \
+	FSpot.Exporters.Tabblo/FSpotUploadProgress.cs \
+	FSpot.Exporters.Tabblo/TabbloExport.cs \
+	FSpot.Exporters.Tabblo/TabbloExportModel.cs \
+	FSpot.Exporters.Tabblo/TabbloExportView.cs \
+	FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs
+
+RESOURCES =  \
+	Resources/TabbloExport.addin.xml \
+	Resources/ui/TabbloExport.ui \
+	Resources/ui/TrustError.ui
+
+ASSEMBLY_INFO_SOURCE = AssemblyInfo.cs
+
+include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Resources/TabbloExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml
similarity index 90%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Resources/TabbloExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml
index 8278f77..744104e 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Resources/TabbloExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml
@@ -11,6 +11,6 @@
 	</Dependencies>
 
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="Tabblo" _label = "_Tabblo..." class = "FSpot.Exporters.TabbloExport.TabbloExport" />
+		<ExportMenuItem id="Tabblo" _label = "_Tabblo..." class = "FSpot.Exporters.Tabblo.TabbloExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Resources/ui/TabbloExport.ui b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Resources/ui/TabbloExport.ui
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui
diff --git a/src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Resources/ui/TrustError.ui b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.TabbloExport/Resources/ui/TrustError.ui
rename to src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui
diff --git a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/.gitignore b/src/Extensions/Exporters/FSpot.Exporters.Zip/.gitignore
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.ZipExport/.gitignore
rename to src/Extensions/Exporters/FSpot.Exporters.Zip/.gitignore
diff --git a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/FSpot.Exporters.ZipExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
similarity index 93%
rename from src/Extensions/Exporters/FSpot.Exporters.ZipExport/FSpot.Exporters.ZipExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
index 0a6d8d6..e5f1c9d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/FSpot.Exporters.ZipExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4C9355A7-1797-4708-A1F2-FBCDB782D04D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSpot.Exporters.ZipExport</RootNamespace>
-    <AssemblyName>FSpot.Exporters.ZipExport</AssemblyName>
+    <RootNamespace>FSpot.Exporters.Zip</RootNamespace>
+    <AssemblyName>FSpot.Exporters.Zip</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.ZipExport\ZipExport.cs" />
+    <Compile Include="FSpot.Exporters.Zip\ZipExport.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\ZipExport.addin.xml">
@@ -83,7 +83,7 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.ZipExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.Zip\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/FSpot.Exporters.ZipExport/ZipExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.ZipExport/FSpot.Exporters.ZipExport/ZipExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
index 12d6cc7..50ca683 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/FSpot.Exporters.ZipExport/ZipExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
@@ -28,7 +28,7 @@ using ICSharpCode.SharpZipLib.Checksums;
 using ICSharpCode.SharpZipLib.Zip;
 using ICSharpCode.SharpZipLib.GZip;
 
-namespace FSpot.Exporters.ZipExport {
+namespace FSpot.Exporters.Zip {
 	public class Zip : IExporter {
 
 		[Glade.Widget] Gtk.Dialog zipdiag;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.Zip/Makefile.am
similarity index 71%
rename from src/Extensions/Exporters/FSpot.Exporters.ZipExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.Zip/Makefile.am
index 3e57cbe..7773b66 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/Makefile.am
@@ -1,9 +1,9 @@
-ASSEMBLY = FSpot.Exporters.ZipExport
+ASSEMBLY = FSpot.Exporters.Zip
 TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_ZIPEXPORT)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = FSpot.Exporters.ZipExport/ZipExport.cs
+SOURCES = FSpot.Exporters.Zip/ZipExport.cs
 
 RESOURCES =  \
 	Resources/ZipExport.addin.xml \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/Resources/ZipExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml
similarity index 90%
rename from src/Extensions/Exporters/FSpot.Exporters.ZipExport/Resources/ZipExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml
index b9bedfd..05b3cfa 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/Resources/ZipExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml
@@ -11,6 +11,6 @@
 		<Addin id="Core" version="0.7"/>
 	</Dependencies>
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="ZipExport" _label = "Compressed fil_e..." class = "FSpot.Exporters.ZipExport.Zip" />
+		<ExportMenuItem id="ZipExport" _label = "Compressed fil_e..." class = "FSpot.Exporters.Zip.Zip" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.ZipExport/Resources/ZipExport.glade b/src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.glade
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.ZipExport/Resources/ZipExport.glade
rename to src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.glade
diff --git a/src/Extensions/Exporters/Makefile.am b/src/Extensions/Exporters/Makefile.am
index d92128a..b8933bc 100644
--- a/src/Extensions/Exporters/Makefile.am
+++ b/src/Extensions/Exporters/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS = 			\
-	FSpot.Exporters.CD		\
-	FSpot.Exporters.FacebookExport		\
-	FSpot.Exporters.FlickrExport		\
-	FSpot.Exporters.FolderExport		\
-	FSpot.Exporters.GalleryExport		\
-	FSpot.Exporters.PicasaWebExport		\
-	FSpot.Exporters.SmugMugExport		\
-	FSpot.Exporters.TabbloExport		\
-	FSpot.Exporters.ZipExport
+	FSpot.Exporters.CD		  \
+	FSpot.Exporters.Facebook  \
+	FSpot.Exporters.Flickr    \
+	FSpot.Exporters.Folder    \
+	FSpot.Exporters.Gallery   \
+	FSpot.Exporters.PicasaWeb \
+	FSpot.Exporters.SmugMug   \
+	FSpot.Exporters.Tabblo    \
+	FSpot.Exporters.Zip
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]