[nautilus-actions] Refactoring: rename source tree from nautilus-actions/ to src/

[Pierre Wieser <pwieser src gnome org>]

commit c961a74c107936e0eb79913c2ce7b4370985cc0b
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Feb 15 14:02:25 2010 +0100

    Refactoring: rename source tree from nautilus-actions/ to src/

 ChangeLog                                          |    8 ++
 Makefile.am                                        |    2 +-
 configure.ac                                       |   26 ++++----
 po/POTFILES.in                                     |   76 ++++++++++----------
 {nautilus-actions => src}/Makefile.am              |    0
 {nautilus-actions => src}/api/Makefile.am          |    0
 {nautilus-actions => src}/api/README               |    0
 {nautilus-actions => src}/api/na-api.h             |    0
 {nautilus-actions => src}/api/na-dbus.h            |    0
 {nautilus-actions => src}/api/na-gconf-keys.h      |    0
 {nautilus-actions => src}/api/na-gconf-monitor.c   |    0
 {nautilus-actions => src}/api/na-gconf-monitor.h   |    0
 {nautilus-actions => src}/api/na-iio-provider.c    |    0
 {nautilus-actions => src}/api/na-iio-provider.h    |    0
 {nautilus-actions => src}/api/na-object-api.h      |    0
 .../io-provider-desktop/Makefile.am                |    0
 .../io-provider-desktop/nadp-desktop-file.c        |    0
 .../io-provider-desktop/nadp-desktop-file.h        |    0
 .../io-provider-desktop/nadp-desktop-provider.c    |    0
 .../io-provider-desktop/nadp-desktop-provider.h    |    0
 .../io-provider-desktop/nadp-module.c              |    0
 .../io-provider-desktop/nadp-read.c                |    0
 .../io-provider-desktop/nadp-read.h                |    0
 .../io-provider-desktop/nadp-utils.c               |    0
 .../io-provider-desktop/nadp-utils.h               |    0
 .../io-provider-desktop/nadp-write.c               |    0
 .../io-provider-desktop/nadp-write.h               |    0
 .../io-provider-desktop/nadp-xdg-data-dirs.c       |    0
 .../io-provider-desktop/nadp-xdg-data-dirs.h       |    0
 .../io-provider-gconf/Makefile.am                  |    0
 .../io-provider-gconf/nagp-gconf-provider.c        |    0
 .../io-provider-gconf/nagp-gconf-provider.h        |    0
 .../io-provider-gconf/nagp-keys.h                  |    0
 .../io-provider-gconf/nagp-module.c                |    0
 .../io-provider-gconf/nagp-read.c                  |    0
 .../io-provider-gconf/nagp-read.h                  |    0
 .../io-provider-gconf/nagp-write.c                 |    0
 .../io-provider-gconf/nagp-write.h                 |    0
 {nautilus-actions => src}/nact/.gitignore          |    0
 {nautilus-actions => src}/nact/Makefile.am         |    0
 .../nact/base-application-class.h                  |    0
 {nautilus-actions => src}/nact/base-application.c  |    0
 {nautilus-actions => src}/nact/base-application.h  |    0
 {nautilus-actions => src}/nact/base-assistant.c    |    0
 {nautilus-actions => src}/nact/base-assistant.h    |    0
 {nautilus-actions => src}/nact/base-builder.c      |    0
 {nautilus-actions => src}/nact/base-builder.h      |    0
 {nautilus-actions => src}/nact/base-dialog.c       |    0
 {nautilus-actions => src}/nact/base-dialog.h       |    0
 {nautilus-actions => src}/nact/base-iprefs.c       |    0
 {nautilus-actions => src}/nact/base-iprefs.h       |    0
 {nautilus-actions => src}/nact/base-window-class.h |    0
 {nautilus-actions => src}/nact/base-window.c       |    0
 {nautilus-actions => src}/nact/base-window.h       |    0
 {nautilus-actions => src}/nact/egg-desktop-file.c  |    0
 {nautilus-actions => src}/nact/egg-desktop-file.h  |    0
 .../nact/egg-sm-client-private.h                   |    0
 .../nact/egg-sm-client-xsmp.c                      |    0
 {nautilus-actions => src}/nact/egg-sm-client.c     |    0
 {nautilus-actions => src}/nact/egg-sm-client.h     |    0
 .../nact/egg-tree-multi-dnd.c                      |    0
 .../nact/egg-tree-multi-dnd.h                      |    0
 {nautilus-actions => src}/nact/locked.png          |  Bin 898 -> 898 bytes
 {nautilus-actions => src}/nact/nact-application.c  |    0
 {nautilus-actions => src}/nact/nact-application.h  |    0
 .../nact/nact-assistant-export-ask.c               |    0
 .../nact/nact-assistant-export-ask.h               |    0
 .../nact/nact-assistant-export.c                   |    0
 .../nact/nact-assistant-export.h                   |    0
 .../nact/nact-assistant-export.ui                  |    0
 .../nact/nact-assistant-import-ask.c               |    0
 .../nact/nact-assistant-import-ask.h               |    0
 .../nact/nact-assistant-import.c                   |    0
 .../nact/nact-assistant-import.h                   |    0
 {nautilus-actions => src}/nact/nact-clipboard.c    |    0
 {nautilus-actions => src}/nact/nact-clipboard.h    |    0
 .../nact/nact-confirm-logout.c                     |    0
 .../nact/nact-confirm-logout.h                     |    0
 {nautilus-actions => src}/nact/nact-gtk-utils.c    |    0
 {nautilus-actions => src}/nact/nact-gtk-utils.h    |    0
 {nautilus-actions => src}/nact/nact-iaction-tab.c  |    0
 {nautilus-actions => src}/nact/nact-iaction-tab.h  |    0
 .../nact/nact-iactions-list-bis.c                  |    0
 .../nact/nact-iactions-list-priv.c                 |    0
 .../nact/nact-iactions-list-priv.h                 |    0
 .../nact/nact-iactions-list.c                      |    0
 .../nact/nact-iactions-list.h                      |    0
 .../nact/nact-iadvanced-tab.c                      |    0
 .../nact/nact-iadvanced-tab.h                      |    0
 .../nact/nact-ibackground-tab.c                    |    0
 .../nact/nact-ibackground-tab.h                    |    0
 {nautilus-actions => src}/nact/nact-icommand-tab.c |    0
 {nautilus-actions => src}/nact/nact-icommand-tab.h |    0
 .../nact/nact-iconditions-tab.c                    |    0
 .../nact/nact-iconditions-tab.h                    |    0
 {nautilus-actions => src}/nact/nact-main-menubar.c |    0
 {nautilus-actions => src}/nact/nact-main-menubar.h |    0
 .../nact/nact-main-statusbar.c                     |    0
 .../nact/nact-main-statusbar.h                     |    0
 {nautilus-actions => src}/nact/nact-main-tab.c     |    0
 {nautilus-actions => src}/nact/nact-main-tab.h     |    0
 {nautilus-actions => src}/nact/nact-main-toolbar.c |    0
 {nautilus-actions => src}/nact/nact-main-toolbar.h |    0
 {nautilus-actions => src}/nact/nact-main-window.c  |    0
 {nautilus-actions => src}/nact/nact-main-window.h  |    0
 {nautilus-actions => src}/nact/nact-main.c         |    0
 {nautilus-actions => src}/nact/nact-marshal.list   |    0
 .../nact/nact-preferences-editor.c                 |    0
 .../nact/nact-preferences-editor.h                 |    0
 {nautilus-actions => src}/nact/nact-preferences.ui |    0
 .../nact/nact-providers-list.c                     |    0
 .../nact/nact-providers-list.h                     |    0
 {nautilus-actions => src}/nact/nact-schemes-list.c |    0
 {nautilus-actions => src}/nact/nact-schemes-list.h |    0
 .../nact/nact-tree-model-dnd.c                     |    0
 .../nact/nact-tree-model-dnd.h                     |    0
 .../nact/nact-tree-model-priv.h                    |    0
 {nautilus-actions => src}/nact/nact-tree-model.c   |    0
 {nautilus-actions => src}/nact/nact-tree-model.h   |    0
 {nautilus-actions => src}/nact/nact-window.c       |    0
 {nautilus-actions => src}/nact/nact-window.h       |    0
 {nautilus-actions => src}/nact/nact-xml-reader.c   |    0
 {nautilus-actions => src}/nact/nact-xml-reader.h   |    0
 {nautilus-actions => src}/nact/nact.desktop.in     |    0
 {nautilus-actions => src}/nact/nact.template       |    0
 .../nact/nautilus-actions-config-tool.actions      |    0
 .../nact/nautilus-actions-config-tool.ui           |    0
 .../nact/nautilus-actions-maintainer.actions       |    0
 {nautilus-actions => src}/nact/transparent.png     |  Bin 183 -> 183 bytes
 {nautilus-actions => src}/plugin/Makefile.am       |    0
 {nautilus-actions => src}/plugin/README            |    0
 .../plugin/nautilus-actions.c                      |    0
 .../plugin/nautilus-actions.h                      |    0
 {nautilus-actions => src}/plugin/nautilus-module.c |    0
 {nautilus-actions => src}/private/Makefile.am      |    0
 {nautilus-actions => src}/private/README           |    0
 .../private/na-gnome-vfs-uri.c                     |    0
 .../private/na-gnome-vfs-uri.h                     |    0
 {nautilus-actions => src}/private/na-iduplicable.c |    0
 {nautilus-actions => src}/private/na-iduplicable.h |    0
 .../private/na-object-action-class.h               |    0
 .../private/na-object-action-fn.h                  |    0
 .../private/na-object-action-priv.h                |    0
 .../private/na-object-action.c                     |    0
 .../private/na-object-class.h                      |    0
 {nautilus-actions => src}/private/na-object-fn.h   |    0
 .../private/na-object-id-class.h                   |    0
 .../private/na-object-id-fn.h                      |    0
 .../private/na-object-id-priv.h                    |    0
 {nautilus-actions => src}/private/na-object-id.c   |    0
 .../private/na-object-item-class.h                 |    0
 .../private/na-object-item-fn.h                    |    0
 .../private/na-object-item-priv.h                  |    0
 {nautilus-actions => src}/private/na-object-item.c |    0
 .../private/na-object-menu-class.h                 |    0
 .../private/na-object-menu-fn.h                    |    0
 .../private/na-object-menu-priv.h                  |    0
 {nautilus-actions => src}/private/na-object-menu.c |    0
 {nautilus-actions => src}/private/na-object-priv.h |    0
 .../private/na-object-profile-class.h              |    0
 .../private/na-object-profile-fn.h                 |    0
 .../private/na-object-profile-priv.h               |    0
 .../private/na-object-profile.c                    |    0
 {nautilus-actions => src}/private/na-object.c      |    0
 {nautilus-actions => src}/runtime/Makefile.am      |    0
 {nautilus-actions => src}/runtime/README           |    0
 {nautilus-actions => src}/runtime/na-gconf-utils.c |    0
 {nautilus-actions => src}/runtime/na-gconf-utils.h |    0
 {nautilus-actions => src}/runtime/na-iabout.c      |    0
 {nautilus-actions => src}/runtime/na-iabout.h      |    0
 {nautilus-actions => src}/runtime/na-io-provider.c |    0
 {nautilus-actions => src}/runtime/na-io-provider.h |    0
 .../runtime/na-ipivot-consumer.c                   |    0
 .../runtime/na-ipivot-consumer.h                   |    0
 {nautilus-actions => src}/runtime/na-iprefs.c      |    0
 {nautilus-actions => src}/runtime/na-iprefs.h      |    0
 {nautilus-actions => src}/runtime/na-module.c      |    0
 {nautilus-actions => src}/runtime/na-module.h      |    0
 {nautilus-actions => src}/runtime/na-pivot.c       |    0
 {nautilus-actions => src}/runtime/na-pivot.h       |    0
 {nautilus-actions => src}/runtime/na-utils.c       |    0
 {nautilus-actions => src}/runtime/na-utils.h       |    0
 {nautilus-actions => src}/runtime/na-xml-names.h   |    0
 {nautilus-actions => src}/runtime/na-xml-writer.c  |    0
 {nautilus-actions => src}/runtime/na-xml-writer.h  |    0
 {nautilus-actions => src}/test/.gitignore          |    0
 {nautilus-actions => src}/test/Makefile.am         |    0
 {nautilus-actions => src}/test/dbus-introspect.sh  |    0
 .../test/init-dispose-diff.sh                      |    0
 {nautilus-actions => src}/test/test-iface-base.c   |    0
 {nautilus-actions => src}/test/test-iface-base.h   |    0
 .../test/test-iface-derived.c                      |    0
 .../test/test-iface-derived.h                      |    0
 {nautilus-actions => src}/test/test-iface-iface.c  |    0
 {nautilus-actions => src}/test/test-iface-iface.h  |    0
 {nautilus-actions => src}/test/test-iface.c        |    0
 {nautilus-actions => src}/test/test-parse-uris.c   |    0
 .../test/test-virtuals-without-test.c              |    0
 {nautilus-actions => src}/test/test-virtuals.c     |    0
 {nautilus-actions => src}/tracker/.gitignore       |    0
 {nautilus-actions => src}/tracker/Makefile.am      |    0
 .../tracker/na-tracker-dbus.c                      |    0
 .../tracker/na-tracker-dbus.h                      |    0
 .../tracker/na-tracker-dbus.xml                    |    0
 .../tracker/na-tracker-plugin.c                    |    0
 {nautilus-actions => src}/tracker/na-tracker.c     |    0
 {nautilus-actions => src}/tracker/na-tracker.h     |    0
 {nautilus-actions => src}/utils/.gitignore         |    0
 {nautilus-actions => src}/utils/Makefile.am        |    0
 {nautilus-actions => src}/utils/console-utils.c    |    0
 {nautilus-actions => src}/utils/console-utils.h    |    0
 .../utils/nautilus-actions-new.c                   |    0
 .../utils/nautilus-actions-run.c                   |    0
 .../utils/nautilus-actions-schemas.c               |    0
 214 files changed, 60 insertions(+), 52 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d0758c0..0a9fa1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-15 Pierre Wieser <pwieser trychlos org>
+
+	Rename source tree from nautilus-actions/ to src/
+
+	* Makefile.am:
+	* configure.ac:
+	* po/POTFILES.in: Updated accordingly.
+
 2009-01-31 Pierre Wieser <pwieser trychlos org>
 
 	* nautilus-actions/io-provider-desktop/nadp-desktop-file.c:
diff --git a/Makefile.am b/Makefile.am
index 2134975..832f21e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ SUBDIRS = \
 	doc							\
 	m4							\
 	icons						\
-	nautilus-actions			\
+	src							\
 	po							\
 	$(NULL)
 
diff --git a/configure.ac b/configure.ac
index 5292b2c..c1c4cc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,9 +32,9 @@ AC_INIT([Nautilus-Actions],[2.29.5],[maintainer nautilus-actions org])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 
-AC_CONFIG_SRCDIR([nautilus-actions/plugin/nautilus-module.c])
+AC_CONFIG_SRCDIR([src/plugin/nautilus-module.c])
 
-AC_CONFIG_HEADERS([nautilus-actions/config.h])
+AC_CONFIG_HEADERS([src/config.h])
 
 AC_CONFIG_FILES([
 	Makefile
@@ -47,17 +47,17 @@ AC_CONFIG_FILES([
 	icons/32x32/Makefile
 	icons/48x48/Makefile
 	icons/scalable/Makefile
-	nautilus-actions/Makefile
-	nautilus-actions/api/Makefile
-	nautilus-actions/io-provider-desktop/Makefile
-	nautilus-actions/io-provider-gconf/Makefile
-	nautilus-actions/nact/Makefile
-	nautilus-actions/plugin/Makefile
-	nautilus-actions/private/Makefile
-	nautilus-actions/runtime/Makefile
-	nautilus-actions/test/Makefile
-	nautilus-actions/tracker/Makefile
-	nautilus-actions/utils/Makefile
+	src/Makefile
+	src/api/Makefile
+	src/io-provider-desktop/Makefile
+	src/io-provider-gconf/Makefile
+	src/nact/Makefile
+	src/plugin/Makefile
+	src/private/Makefile
+	src/runtime/Makefile
+	src/test/Makefile
+	src/tracker/Makefile
+	src/utils/Makefile
 	po/Makefile.in
 ])
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fd0e4ae..f69f741 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,39 +1,39 @@
 data/nautilus-actions.schemas.in
-nautilus-actions/io-provider-desktop/nadp-desktop-provider.c
-nautilus-actions/io-provider-gconf/nagp-gconf-provider.c
-nautilus-actions/nact/base-application.c
-nautilus-actions/nact/base-assistant.c
-nautilus-actions/nact/base-window.c
-nautilus-actions/nact/egg-desktop-file.c
-nautilus-actions/nact/egg-sm-client.c
-nautilus-actions/nact/nact-application.c
-nautilus-actions/nact/nact-assistant-export.c
-nautilus-actions/nact/nact-assistant-export.ui
-nautilus-actions/nact/nact-assistant-export-ask.c
-nautilus-actions/nact/nact-assistant-import.c
-nautilus-actions/nact/nact-assistant-import-ask.c
-nautilus-actions/nact/nact.desktop.in
-nautilus-actions/nact/nact-iactions-list.c
-nautilus-actions/nact/nact-iaction-tab.c
-nautilus-actions/nact/nact-iadvanced-tab.c
-nautilus-actions/nact/nact-ibackground-tab.c
-nautilus-actions/nact/nact-icommand-tab.c
-nautilus-actions/nact/nact-main-menubar.c
-nautilus-actions/nact/nact-main-statusbar.c
-nautilus-actions/nact/nact-main-window.c
-nautilus-actions/nact/nact-preferences.ui
-nautilus-actions/nact/nact-tree-model.c
-nautilus-actions/nact/nact-window.c
-nautilus-actions/nact/nact-xml-reader.c
-nautilus-actions/nact/nautilus-actions-config-tool.ui
-nautilus-actions/plugin/nautilus-actions.c
-nautilus-actions/private/na-object-action.c
-nautilus-actions/private/na-object-action-fn.h
-nautilus-actions/private/na-object-id.c
-nautilus-actions/private/na-object-menu-fn.h
-nautilus-actions/private/na-object-profile-fn.h
-nautilus-actions/runtime/na-iabout.c
-nautilus-actions/runtime/na-xml-names.h
-nautilus-actions/test/test-parse-uris.c
-nautilus-actions/utils/nautilus-actions-new.c
-nautilus-actions/utils/nautilus-actions-schemas.c
+src/io-provider-desktop/nadp-desktop-provider.c
+src/io-provider-gconf/nagp-gconf-provider.c
+src/nact/base-application.c
+src/nact/base-assistant.c
+src/nact/base-window.c
+src/nact/egg-desktop-file.c
+src/nact/egg-sm-client.c
+src/nact/nact-application.c
+src/nact/nact-assistant-export.c
+src/nact/nact-assistant-export.ui
+src/nact/nact-assistant-export-ask.c
+src/nact/nact-assistant-import.c
+src/nact/nact-assistant-import-ask.c
+src/nact/nact.desktop.in
+src/nact/nact-iactions-list.c
+src/nact/nact-iaction-tab.c
+src/nact/nact-iadvanced-tab.c
+src/nact/nact-ibackground-tab.c
+src/nact/nact-icommand-tab.c
+src/nact/nact-main-menubar.c
+src/nact/nact-main-statusbar.c
+src/nact/nact-main-window.c
+src/nact/nact-preferences.ui
+src/nact/nact-tree-model.c
+src/nact/nact-window.c
+src/nact/nact-xml-reader.c
+src/nact/nautilus-actions-config-tool.ui
+src/plugin/nautilus-actions.c
+src/private/na-object-action.c
+src/private/na-object-action-fn.h
+src/private/na-object-id.c
+src/private/na-object-menu-fn.h
+src/private/na-object-profile-fn.h
+src/runtime/na-iabout.c
+src/runtime/na-xml-names.h
+src/test/test-parse-uris.c
+src/utils/nautilus-actions-new.c
+src/utils/nautilus-actions-schemas.c
diff --git a/nautilus-actions/Makefile.am b/src/Makefile.am
similarity index 100%
rename from nautilus-actions/Makefile.am
rename to src/Makefile.am
diff --git a/nautilus-actions/api/Makefile.am b/src/api/Makefile.am
similarity index 100%
rename from nautilus-actions/api/Makefile.am
rename to src/api/Makefile.am
diff --git a/nautilus-actions/api/README b/src/api/README
similarity index 100%
rename from nautilus-actions/api/README
rename to src/api/README
diff --git a/nautilus-actions/api/na-api.h b/src/api/na-api.h
similarity index 100%
rename from nautilus-actions/api/na-api.h
rename to src/api/na-api.h
diff --git a/nautilus-actions/api/na-dbus.h b/src/api/na-dbus.h
similarity index 100%
rename from nautilus-actions/api/na-dbus.h
rename to src/api/na-dbus.h
diff --git a/nautilus-actions/api/na-gconf-keys.h b/src/api/na-gconf-keys.h
similarity index 100%
rename from nautilus-actions/api/na-gconf-keys.h
rename to src/api/na-gconf-keys.h
diff --git a/nautilus-actions/api/na-gconf-monitor.c b/src/api/na-gconf-monitor.c
similarity index 100%
rename from nautilus-actions/api/na-gconf-monitor.c
rename to src/api/na-gconf-monitor.c
diff --git a/nautilus-actions/api/na-gconf-monitor.h b/src/api/na-gconf-monitor.h
similarity index 100%
rename from nautilus-actions/api/na-gconf-monitor.h
rename to src/api/na-gconf-monitor.h
diff --git a/nautilus-actions/api/na-iio-provider.c b/src/api/na-iio-provider.c
similarity index 100%
rename from nautilus-actions/api/na-iio-provider.c
rename to src/api/na-iio-provider.c
diff --git a/nautilus-actions/api/na-iio-provider.h b/src/api/na-iio-provider.h
similarity index 100%
rename from nautilus-actions/api/na-iio-provider.h
rename to src/api/na-iio-provider.h
diff --git a/nautilus-actions/api/na-object-api.h b/src/api/na-object-api.h
similarity index 100%
rename from nautilus-actions/api/na-object-api.h
rename to src/api/na-object-api.h
diff --git a/nautilus-actions/io-provider-desktop/Makefile.am b/src/io-provider-desktop/Makefile.am
similarity index 100%
rename from nautilus-actions/io-provider-desktop/Makefile.am
rename to src/io-provider-desktop/Makefile.am
diff --git a/nautilus-actions/io-provider-desktop/nadp-desktop-file.c b/src/io-provider-desktop/nadp-desktop-file.c
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-desktop-file.c
rename to src/io-provider-desktop/nadp-desktop-file.c
diff --git a/nautilus-actions/io-provider-desktop/nadp-desktop-file.h b/src/io-provider-desktop/nadp-desktop-file.h
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-desktop-file.h
rename to src/io-provider-desktop/nadp-desktop-file.h
diff --git a/nautilus-actions/io-provider-desktop/nadp-desktop-provider.c b/src/io-provider-desktop/nadp-desktop-provider.c
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-desktop-provider.c
rename to src/io-provider-desktop/nadp-desktop-provider.c
diff --git a/nautilus-actions/io-provider-desktop/nadp-desktop-provider.h b/src/io-provider-desktop/nadp-desktop-provider.h
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-desktop-provider.h
rename to src/io-provider-desktop/nadp-desktop-provider.h
diff --git a/nautilus-actions/io-provider-desktop/nadp-module.c b/src/io-provider-desktop/nadp-module.c
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-module.c
rename to src/io-provider-desktop/nadp-module.c
diff --git a/nautilus-actions/io-provider-desktop/nadp-read.c b/src/io-provider-desktop/nadp-read.c
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-read.c
rename to src/io-provider-desktop/nadp-read.c
diff --git a/nautilus-actions/io-provider-desktop/nadp-read.h b/src/io-provider-desktop/nadp-read.h
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-read.h
rename to src/io-provider-desktop/nadp-read.h
diff --git a/nautilus-actions/io-provider-desktop/nadp-utils.c b/src/io-provider-desktop/nadp-utils.c
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-utils.c
rename to src/io-provider-desktop/nadp-utils.c
diff --git a/nautilus-actions/io-provider-desktop/nadp-utils.h b/src/io-provider-desktop/nadp-utils.h
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-utils.h
rename to src/io-provider-desktop/nadp-utils.h
diff --git a/nautilus-actions/io-provider-desktop/nadp-write.c b/src/io-provider-desktop/nadp-write.c
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-write.c
rename to src/io-provider-desktop/nadp-write.c
diff --git a/nautilus-actions/io-provider-desktop/nadp-write.h b/src/io-provider-desktop/nadp-write.h
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-write.h
rename to src/io-provider-desktop/nadp-write.h
diff --git a/nautilus-actions/io-provider-desktop/nadp-xdg-data-dirs.c b/src/io-provider-desktop/nadp-xdg-data-dirs.c
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-xdg-data-dirs.c
rename to src/io-provider-desktop/nadp-xdg-data-dirs.c
diff --git a/nautilus-actions/io-provider-desktop/nadp-xdg-data-dirs.h b/src/io-provider-desktop/nadp-xdg-data-dirs.h
similarity index 100%
rename from nautilus-actions/io-provider-desktop/nadp-xdg-data-dirs.h
rename to src/io-provider-desktop/nadp-xdg-data-dirs.h
diff --git a/nautilus-actions/io-provider-gconf/Makefile.am b/src/io-provider-gconf/Makefile.am
similarity index 100%
rename from nautilus-actions/io-provider-gconf/Makefile.am
rename to src/io-provider-gconf/Makefile.am
diff --git a/nautilus-actions/io-provider-gconf/nagp-gconf-provider.c b/src/io-provider-gconf/nagp-gconf-provider.c
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-gconf-provider.c
rename to src/io-provider-gconf/nagp-gconf-provider.c
diff --git a/nautilus-actions/io-provider-gconf/nagp-gconf-provider.h b/src/io-provider-gconf/nagp-gconf-provider.h
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-gconf-provider.h
rename to src/io-provider-gconf/nagp-gconf-provider.h
diff --git a/nautilus-actions/io-provider-gconf/nagp-keys.h b/src/io-provider-gconf/nagp-keys.h
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-keys.h
rename to src/io-provider-gconf/nagp-keys.h
diff --git a/nautilus-actions/io-provider-gconf/nagp-module.c b/src/io-provider-gconf/nagp-module.c
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-module.c
rename to src/io-provider-gconf/nagp-module.c
diff --git a/nautilus-actions/io-provider-gconf/nagp-read.c b/src/io-provider-gconf/nagp-read.c
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-read.c
rename to src/io-provider-gconf/nagp-read.c
diff --git a/nautilus-actions/io-provider-gconf/nagp-read.h b/src/io-provider-gconf/nagp-read.h
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-read.h
rename to src/io-provider-gconf/nagp-read.h
diff --git a/nautilus-actions/io-provider-gconf/nagp-write.c b/src/io-provider-gconf/nagp-write.c
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-write.c
rename to src/io-provider-gconf/nagp-write.c
diff --git a/nautilus-actions/io-provider-gconf/nagp-write.h b/src/io-provider-gconf/nagp-write.h
similarity index 100%
rename from nautilus-actions/io-provider-gconf/nagp-write.h
rename to src/io-provider-gconf/nagp-write.h
diff --git a/nautilus-actions/nact/.gitignore b/src/nact/.gitignore
similarity index 100%
rename from nautilus-actions/nact/.gitignore
rename to src/nact/.gitignore
diff --git a/nautilus-actions/nact/Makefile.am b/src/nact/Makefile.am
similarity index 100%
rename from nautilus-actions/nact/Makefile.am
rename to src/nact/Makefile.am
diff --git a/nautilus-actions/nact/base-application-class.h b/src/nact/base-application-class.h
similarity index 100%
rename from nautilus-actions/nact/base-application-class.h
rename to src/nact/base-application-class.h
diff --git a/nautilus-actions/nact/base-application.c b/src/nact/base-application.c
similarity index 100%
rename from nautilus-actions/nact/base-application.c
rename to src/nact/base-application.c
diff --git a/nautilus-actions/nact/base-application.h b/src/nact/base-application.h
similarity index 100%
rename from nautilus-actions/nact/base-application.h
rename to src/nact/base-application.h
diff --git a/nautilus-actions/nact/base-assistant.c b/src/nact/base-assistant.c
similarity index 100%
rename from nautilus-actions/nact/base-assistant.c
rename to src/nact/base-assistant.c
diff --git a/nautilus-actions/nact/base-assistant.h b/src/nact/base-assistant.h
similarity index 100%
rename from nautilus-actions/nact/base-assistant.h
rename to src/nact/base-assistant.h
diff --git a/nautilus-actions/nact/base-builder.c b/src/nact/base-builder.c
similarity index 100%
rename from nautilus-actions/nact/base-builder.c
rename to src/nact/base-builder.c
diff --git a/nautilus-actions/nact/base-builder.h b/src/nact/base-builder.h
similarity index 100%
rename from nautilus-actions/nact/base-builder.h
rename to src/nact/base-builder.h
diff --git a/nautilus-actions/nact/base-dialog.c b/src/nact/base-dialog.c
similarity index 100%
rename from nautilus-actions/nact/base-dialog.c
rename to src/nact/base-dialog.c
diff --git a/nautilus-actions/nact/base-dialog.h b/src/nact/base-dialog.h
similarity index 100%
rename from nautilus-actions/nact/base-dialog.h
rename to src/nact/base-dialog.h
diff --git a/nautilus-actions/nact/base-iprefs.c b/src/nact/base-iprefs.c
similarity index 100%
rename from nautilus-actions/nact/base-iprefs.c
rename to src/nact/base-iprefs.c
diff --git a/nautilus-actions/nact/base-iprefs.h b/src/nact/base-iprefs.h
similarity index 100%
rename from nautilus-actions/nact/base-iprefs.h
rename to src/nact/base-iprefs.h
diff --git a/nautilus-actions/nact/base-window-class.h b/src/nact/base-window-class.h
similarity index 100%
rename from nautilus-actions/nact/base-window-class.h
rename to src/nact/base-window-class.h
diff --git a/nautilus-actions/nact/base-window.c b/src/nact/base-window.c
similarity index 100%
rename from nautilus-actions/nact/base-window.c
rename to src/nact/base-window.c
diff --git a/nautilus-actions/nact/base-window.h b/src/nact/base-window.h
similarity index 100%
rename from nautilus-actions/nact/base-window.h
rename to src/nact/base-window.h
diff --git a/nautilus-actions/nact/egg-desktop-file.c b/src/nact/egg-desktop-file.c
similarity index 100%
rename from nautilus-actions/nact/egg-desktop-file.c
rename to src/nact/egg-desktop-file.c
diff --git a/nautilus-actions/nact/egg-desktop-file.h b/src/nact/egg-desktop-file.h
similarity index 100%
rename from nautilus-actions/nact/egg-desktop-file.h
rename to src/nact/egg-desktop-file.h
diff --git a/nautilus-actions/nact/egg-sm-client-private.h b/src/nact/egg-sm-client-private.h
similarity index 100%
rename from nautilus-actions/nact/egg-sm-client-private.h
rename to src/nact/egg-sm-client-private.h
diff --git a/nautilus-actions/nact/egg-sm-client-xsmp.c b/src/nact/egg-sm-client-xsmp.c
similarity index 100%
rename from nautilus-actions/nact/egg-sm-client-xsmp.c
rename to src/nact/egg-sm-client-xsmp.c
diff --git a/nautilus-actions/nact/egg-sm-client.c b/src/nact/egg-sm-client.c
similarity index 100%
rename from nautilus-actions/nact/egg-sm-client.c
rename to src/nact/egg-sm-client.c
diff --git a/nautilus-actions/nact/egg-sm-client.h b/src/nact/egg-sm-client.h
similarity index 100%
rename from nautilus-actions/nact/egg-sm-client.h
rename to src/nact/egg-sm-client.h
diff --git a/nautilus-actions/nact/egg-tree-multi-dnd.c b/src/nact/egg-tree-multi-dnd.c
similarity index 100%
rename from nautilus-actions/nact/egg-tree-multi-dnd.c
rename to src/nact/egg-tree-multi-dnd.c
diff --git a/nautilus-actions/nact/egg-tree-multi-dnd.h b/src/nact/egg-tree-multi-dnd.h
similarity index 100%
rename from nautilus-actions/nact/egg-tree-multi-dnd.h
rename to src/nact/egg-tree-multi-dnd.h
diff --git a/nautilus-actions/nact/locked.png b/src/nact/locked.png
similarity index 100%
rename from nautilus-actions/nact/locked.png
rename to src/nact/locked.png
diff --git a/nautilus-actions/nact/nact-application.c b/src/nact/nact-application.c
similarity index 100%
rename from nautilus-actions/nact/nact-application.c
rename to src/nact/nact-application.c
diff --git a/nautilus-actions/nact/nact-application.h b/src/nact/nact-application.h
similarity index 100%
rename from nautilus-actions/nact/nact-application.h
rename to src/nact/nact-application.h
diff --git a/nautilus-actions/nact/nact-assistant-export-ask.c b/src/nact/nact-assistant-export-ask.c
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-export-ask.c
rename to src/nact/nact-assistant-export-ask.c
diff --git a/nautilus-actions/nact/nact-assistant-export-ask.h b/src/nact/nact-assistant-export-ask.h
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-export-ask.h
rename to src/nact/nact-assistant-export-ask.h
diff --git a/nautilus-actions/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-export.c
rename to src/nact/nact-assistant-export.c
diff --git a/nautilus-actions/nact/nact-assistant-export.h b/src/nact/nact-assistant-export.h
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-export.h
rename to src/nact/nact-assistant-export.h
diff --git a/nautilus-actions/nact/nact-assistant-export.ui b/src/nact/nact-assistant-export.ui
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-export.ui
rename to src/nact/nact-assistant-export.ui
diff --git a/nautilus-actions/nact/nact-assistant-import-ask.c b/src/nact/nact-assistant-import-ask.c
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-import-ask.c
rename to src/nact/nact-assistant-import-ask.c
diff --git a/nautilus-actions/nact/nact-assistant-import-ask.h b/src/nact/nact-assistant-import-ask.h
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-import-ask.h
rename to src/nact/nact-assistant-import-ask.h
diff --git a/nautilus-actions/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-import.c
rename to src/nact/nact-assistant-import.c
diff --git a/nautilus-actions/nact/nact-assistant-import.h b/src/nact/nact-assistant-import.h
similarity index 100%
rename from nautilus-actions/nact/nact-assistant-import.h
rename to src/nact/nact-assistant-import.h
diff --git a/nautilus-actions/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
similarity index 100%
rename from nautilus-actions/nact/nact-clipboard.c
rename to src/nact/nact-clipboard.c
diff --git a/nautilus-actions/nact/nact-clipboard.h b/src/nact/nact-clipboard.h
similarity index 100%
rename from nautilus-actions/nact/nact-clipboard.h
rename to src/nact/nact-clipboard.h
diff --git a/nautilus-actions/nact/nact-confirm-logout.c b/src/nact/nact-confirm-logout.c
similarity index 100%
rename from nautilus-actions/nact/nact-confirm-logout.c
rename to src/nact/nact-confirm-logout.c
diff --git a/nautilus-actions/nact/nact-confirm-logout.h b/src/nact/nact-confirm-logout.h
similarity index 100%
rename from nautilus-actions/nact/nact-confirm-logout.h
rename to src/nact/nact-confirm-logout.h
diff --git a/nautilus-actions/nact/nact-gtk-utils.c b/src/nact/nact-gtk-utils.c
similarity index 100%
rename from nautilus-actions/nact/nact-gtk-utils.c
rename to src/nact/nact-gtk-utils.c
diff --git a/nautilus-actions/nact/nact-gtk-utils.h b/src/nact/nact-gtk-utils.h
similarity index 100%
rename from nautilus-actions/nact/nact-gtk-utils.h
rename to src/nact/nact-gtk-utils.h
diff --git a/nautilus-actions/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
similarity index 100%
rename from nautilus-actions/nact/nact-iaction-tab.c
rename to src/nact/nact-iaction-tab.c
diff --git a/nautilus-actions/nact/nact-iaction-tab.h b/src/nact/nact-iaction-tab.h
similarity index 100%
rename from nautilus-actions/nact/nact-iaction-tab.h
rename to src/nact/nact-iaction-tab.h
diff --git a/nautilus-actions/nact/nact-iactions-list-bis.c b/src/nact/nact-iactions-list-bis.c
similarity index 100%
rename from nautilus-actions/nact/nact-iactions-list-bis.c
rename to src/nact/nact-iactions-list-bis.c
diff --git a/nautilus-actions/nact/nact-iactions-list-priv.c b/src/nact/nact-iactions-list-priv.c
similarity index 100%
rename from nautilus-actions/nact/nact-iactions-list-priv.c
rename to src/nact/nact-iactions-list-priv.c
diff --git a/nautilus-actions/nact/nact-iactions-list-priv.h b/src/nact/nact-iactions-list-priv.h
similarity index 100%
rename from nautilus-actions/nact/nact-iactions-list-priv.h
rename to src/nact/nact-iactions-list-priv.h
diff --git a/nautilus-actions/nact/nact-iactions-list.c b/src/nact/nact-iactions-list.c
similarity index 100%
rename from nautilus-actions/nact/nact-iactions-list.c
rename to src/nact/nact-iactions-list.c
diff --git a/nautilus-actions/nact/nact-iactions-list.h b/src/nact/nact-iactions-list.h
similarity index 100%
rename from nautilus-actions/nact/nact-iactions-list.h
rename to src/nact/nact-iactions-list.h
diff --git a/nautilus-actions/nact/nact-iadvanced-tab.c b/src/nact/nact-iadvanced-tab.c
similarity index 100%
rename from nautilus-actions/nact/nact-iadvanced-tab.c
rename to src/nact/nact-iadvanced-tab.c
diff --git a/nautilus-actions/nact/nact-iadvanced-tab.h b/src/nact/nact-iadvanced-tab.h
similarity index 100%
rename from nautilus-actions/nact/nact-iadvanced-tab.h
rename to src/nact/nact-iadvanced-tab.h
diff --git a/nautilus-actions/nact/nact-ibackground-tab.c b/src/nact/nact-ibackground-tab.c
similarity index 100%
rename from nautilus-actions/nact/nact-ibackground-tab.c
rename to src/nact/nact-ibackground-tab.c
diff --git a/nautilus-actions/nact/nact-ibackground-tab.h b/src/nact/nact-ibackground-tab.h
similarity index 100%
rename from nautilus-actions/nact/nact-ibackground-tab.h
rename to src/nact/nact-ibackground-tab.h
diff --git a/nautilus-actions/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
similarity index 100%
rename from nautilus-actions/nact/nact-icommand-tab.c
rename to src/nact/nact-icommand-tab.c
diff --git a/nautilus-actions/nact/nact-icommand-tab.h b/src/nact/nact-icommand-tab.h
similarity index 100%
rename from nautilus-actions/nact/nact-icommand-tab.h
rename to src/nact/nact-icommand-tab.h
diff --git a/nautilus-actions/nact/nact-iconditions-tab.c b/src/nact/nact-iconditions-tab.c
similarity index 100%
rename from nautilus-actions/nact/nact-iconditions-tab.c
rename to src/nact/nact-iconditions-tab.c
diff --git a/nautilus-actions/nact/nact-iconditions-tab.h b/src/nact/nact-iconditions-tab.h
similarity index 100%
rename from nautilus-actions/nact/nact-iconditions-tab.h
rename to src/nact/nact-iconditions-tab.h
diff --git a/nautilus-actions/nact/nact-main-menubar.c b/src/nact/nact-main-menubar.c
similarity index 100%
rename from nautilus-actions/nact/nact-main-menubar.c
rename to src/nact/nact-main-menubar.c
diff --git a/nautilus-actions/nact/nact-main-menubar.h b/src/nact/nact-main-menubar.h
similarity index 100%
rename from nautilus-actions/nact/nact-main-menubar.h
rename to src/nact/nact-main-menubar.h
diff --git a/nautilus-actions/nact/nact-main-statusbar.c b/src/nact/nact-main-statusbar.c
similarity index 100%
rename from nautilus-actions/nact/nact-main-statusbar.c
rename to src/nact/nact-main-statusbar.c
diff --git a/nautilus-actions/nact/nact-main-statusbar.h b/src/nact/nact-main-statusbar.h
similarity index 100%
rename from nautilus-actions/nact/nact-main-statusbar.h
rename to src/nact/nact-main-statusbar.h
diff --git a/nautilus-actions/nact/nact-main-tab.c b/src/nact/nact-main-tab.c
similarity index 100%
rename from nautilus-actions/nact/nact-main-tab.c
rename to src/nact/nact-main-tab.c
diff --git a/nautilus-actions/nact/nact-main-tab.h b/src/nact/nact-main-tab.h
similarity index 100%
rename from nautilus-actions/nact/nact-main-tab.h
rename to src/nact/nact-main-tab.h
diff --git a/nautilus-actions/nact/nact-main-toolbar.c b/src/nact/nact-main-toolbar.c
similarity index 100%
rename from nautilus-actions/nact/nact-main-toolbar.c
rename to src/nact/nact-main-toolbar.c
diff --git a/nautilus-actions/nact/nact-main-toolbar.h b/src/nact/nact-main-toolbar.h
similarity index 100%
rename from nautilus-actions/nact/nact-main-toolbar.h
rename to src/nact/nact-main-toolbar.h
diff --git a/nautilus-actions/nact/nact-main-window.c b/src/nact/nact-main-window.c
similarity index 100%
rename from nautilus-actions/nact/nact-main-window.c
rename to src/nact/nact-main-window.c
diff --git a/nautilus-actions/nact/nact-main-window.h b/src/nact/nact-main-window.h
similarity index 100%
rename from nautilus-actions/nact/nact-main-window.h
rename to src/nact/nact-main-window.h
diff --git a/nautilus-actions/nact/nact-main.c b/src/nact/nact-main.c
similarity index 100%
rename from nautilus-actions/nact/nact-main.c
rename to src/nact/nact-main.c
diff --git a/nautilus-actions/nact/nact-marshal.list b/src/nact/nact-marshal.list
similarity index 100%
rename from nautilus-actions/nact/nact-marshal.list
rename to src/nact/nact-marshal.list
diff --git a/nautilus-actions/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
similarity index 100%
rename from nautilus-actions/nact/nact-preferences-editor.c
rename to src/nact/nact-preferences-editor.c
diff --git a/nautilus-actions/nact/nact-preferences-editor.h b/src/nact/nact-preferences-editor.h
similarity index 100%
rename from nautilus-actions/nact/nact-preferences-editor.h
rename to src/nact/nact-preferences-editor.h
diff --git a/nautilus-actions/nact/nact-preferences.ui b/src/nact/nact-preferences.ui
similarity index 100%
rename from nautilus-actions/nact/nact-preferences.ui
rename to src/nact/nact-preferences.ui
diff --git a/nautilus-actions/nact/nact-providers-list.c b/src/nact/nact-providers-list.c
similarity index 100%
rename from nautilus-actions/nact/nact-providers-list.c
rename to src/nact/nact-providers-list.c
diff --git a/nautilus-actions/nact/nact-providers-list.h b/src/nact/nact-providers-list.h
similarity index 100%
rename from nautilus-actions/nact/nact-providers-list.h
rename to src/nact/nact-providers-list.h
diff --git a/nautilus-actions/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
similarity index 100%
rename from nautilus-actions/nact/nact-schemes-list.c
rename to src/nact/nact-schemes-list.c
diff --git a/nautilus-actions/nact/nact-schemes-list.h b/src/nact/nact-schemes-list.h
similarity index 100%
rename from nautilus-actions/nact/nact-schemes-list.h
rename to src/nact/nact-schemes-list.h
diff --git a/nautilus-actions/nact/nact-tree-model-dnd.c b/src/nact/nact-tree-model-dnd.c
similarity index 100%
rename from nautilus-actions/nact/nact-tree-model-dnd.c
rename to src/nact/nact-tree-model-dnd.c
diff --git a/nautilus-actions/nact/nact-tree-model-dnd.h b/src/nact/nact-tree-model-dnd.h
similarity index 100%
rename from nautilus-actions/nact/nact-tree-model-dnd.h
rename to src/nact/nact-tree-model-dnd.h
diff --git a/nautilus-actions/nact/nact-tree-model-priv.h b/src/nact/nact-tree-model-priv.h
similarity index 100%
rename from nautilus-actions/nact/nact-tree-model-priv.h
rename to src/nact/nact-tree-model-priv.h
diff --git a/nautilus-actions/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
similarity index 100%
rename from nautilus-actions/nact/nact-tree-model.c
rename to src/nact/nact-tree-model.c
diff --git a/nautilus-actions/nact/nact-tree-model.h b/src/nact/nact-tree-model.h
similarity index 100%
rename from nautilus-actions/nact/nact-tree-model.h
rename to src/nact/nact-tree-model.h
diff --git a/nautilus-actions/nact/nact-window.c b/src/nact/nact-window.c
similarity index 100%
rename from nautilus-actions/nact/nact-window.c
rename to src/nact/nact-window.c
diff --git a/nautilus-actions/nact/nact-window.h b/src/nact/nact-window.h
similarity index 100%
rename from nautilus-actions/nact/nact-window.h
rename to src/nact/nact-window.h
diff --git a/nautilus-actions/nact/nact-xml-reader.c b/src/nact/nact-xml-reader.c
similarity index 100%
rename from nautilus-actions/nact/nact-xml-reader.c
rename to src/nact/nact-xml-reader.c
diff --git a/nautilus-actions/nact/nact-xml-reader.h b/src/nact/nact-xml-reader.h
similarity index 100%
rename from nautilus-actions/nact/nact-xml-reader.h
rename to src/nact/nact-xml-reader.h
diff --git a/nautilus-actions/nact/nact.desktop.in b/src/nact/nact.desktop.in
similarity index 100%
rename from nautilus-actions/nact/nact.desktop.in
rename to src/nact/nact.desktop.in
diff --git a/nautilus-actions/nact/nact.template b/src/nact/nact.template
similarity index 100%
rename from nautilus-actions/nact/nact.template
rename to src/nact/nact.template
diff --git a/nautilus-actions/nact/nautilus-actions-config-tool.actions b/src/nact/nautilus-actions-config-tool.actions
similarity index 100%
rename from nautilus-actions/nact/nautilus-actions-config-tool.actions
rename to src/nact/nautilus-actions-config-tool.actions
diff --git a/nautilus-actions/nact/nautilus-actions-config-tool.ui b/src/nact/nautilus-actions-config-tool.ui
similarity index 100%
rename from nautilus-actions/nact/nautilus-actions-config-tool.ui
rename to src/nact/nautilus-actions-config-tool.ui
diff --git a/nautilus-actions/nact/nautilus-actions-maintainer.actions b/src/nact/nautilus-actions-maintainer.actions
similarity index 100%
rename from nautilus-actions/nact/nautilus-actions-maintainer.actions
rename to src/nact/nautilus-actions-maintainer.actions
diff --git a/nautilus-actions/nact/transparent.png b/src/nact/transparent.png
similarity index 100%
rename from nautilus-actions/nact/transparent.png
rename to src/nact/transparent.png
diff --git a/nautilus-actions/plugin/Makefile.am b/src/plugin/Makefile.am
similarity index 100%
rename from nautilus-actions/plugin/Makefile.am
rename to src/plugin/Makefile.am
diff --git a/nautilus-actions/plugin/README b/src/plugin/README
similarity index 100%
rename from nautilus-actions/plugin/README
rename to src/plugin/README
diff --git a/nautilus-actions/plugin/nautilus-actions.c b/src/plugin/nautilus-actions.c
similarity index 100%
rename from nautilus-actions/plugin/nautilus-actions.c
rename to src/plugin/nautilus-actions.c
diff --git a/nautilus-actions/plugin/nautilus-actions.h b/src/plugin/nautilus-actions.h
similarity index 100%
rename from nautilus-actions/plugin/nautilus-actions.h
rename to src/plugin/nautilus-actions.h
diff --git a/nautilus-actions/plugin/nautilus-module.c b/src/plugin/nautilus-module.c
similarity index 100%
rename from nautilus-actions/plugin/nautilus-module.c
rename to src/plugin/nautilus-module.c
diff --git a/nautilus-actions/private/Makefile.am b/src/private/Makefile.am
similarity index 100%
rename from nautilus-actions/private/Makefile.am
rename to src/private/Makefile.am
diff --git a/nautilus-actions/private/README b/src/private/README
similarity index 100%
rename from nautilus-actions/private/README
rename to src/private/README
diff --git a/nautilus-actions/private/na-gnome-vfs-uri.c b/src/private/na-gnome-vfs-uri.c
similarity index 100%
rename from nautilus-actions/private/na-gnome-vfs-uri.c
rename to src/private/na-gnome-vfs-uri.c
diff --git a/nautilus-actions/private/na-gnome-vfs-uri.h b/src/private/na-gnome-vfs-uri.h
similarity index 100%
rename from nautilus-actions/private/na-gnome-vfs-uri.h
rename to src/private/na-gnome-vfs-uri.h
diff --git a/nautilus-actions/private/na-iduplicable.c b/src/private/na-iduplicable.c
similarity index 100%
rename from nautilus-actions/private/na-iduplicable.c
rename to src/private/na-iduplicable.c
diff --git a/nautilus-actions/private/na-iduplicable.h b/src/private/na-iduplicable.h
similarity index 100%
rename from nautilus-actions/private/na-iduplicable.h
rename to src/private/na-iduplicable.h
diff --git a/nautilus-actions/private/na-object-action-class.h b/src/private/na-object-action-class.h
similarity index 100%
rename from nautilus-actions/private/na-object-action-class.h
rename to src/private/na-object-action-class.h
diff --git a/nautilus-actions/private/na-object-action-fn.h b/src/private/na-object-action-fn.h
similarity index 100%
rename from nautilus-actions/private/na-object-action-fn.h
rename to src/private/na-object-action-fn.h
diff --git a/nautilus-actions/private/na-object-action-priv.h b/src/private/na-object-action-priv.h
similarity index 100%
rename from nautilus-actions/private/na-object-action-priv.h
rename to src/private/na-object-action-priv.h
diff --git a/nautilus-actions/private/na-object-action.c b/src/private/na-object-action.c
similarity index 100%
rename from nautilus-actions/private/na-object-action.c
rename to src/private/na-object-action.c
diff --git a/nautilus-actions/private/na-object-class.h b/src/private/na-object-class.h
similarity index 100%
rename from nautilus-actions/private/na-object-class.h
rename to src/private/na-object-class.h
diff --git a/nautilus-actions/private/na-object-fn.h b/src/private/na-object-fn.h
similarity index 100%
rename from nautilus-actions/private/na-object-fn.h
rename to src/private/na-object-fn.h
diff --git a/nautilus-actions/private/na-object-id-class.h b/src/private/na-object-id-class.h
similarity index 100%
rename from nautilus-actions/private/na-object-id-class.h
rename to src/private/na-object-id-class.h
diff --git a/nautilus-actions/private/na-object-id-fn.h b/src/private/na-object-id-fn.h
similarity index 100%
rename from nautilus-actions/private/na-object-id-fn.h
rename to src/private/na-object-id-fn.h
diff --git a/nautilus-actions/private/na-object-id-priv.h b/src/private/na-object-id-priv.h
similarity index 100%
rename from nautilus-actions/private/na-object-id-priv.h
rename to src/private/na-object-id-priv.h
diff --git a/nautilus-actions/private/na-object-id.c b/src/private/na-object-id.c
similarity index 100%
rename from nautilus-actions/private/na-object-id.c
rename to src/private/na-object-id.c
diff --git a/nautilus-actions/private/na-object-item-class.h b/src/private/na-object-item-class.h
similarity index 100%
rename from nautilus-actions/private/na-object-item-class.h
rename to src/private/na-object-item-class.h
diff --git a/nautilus-actions/private/na-object-item-fn.h b/src/private/na-object-item-fn.h
similarity index 100%
rename from nautilus-actions/private/na-object-item-fn.h
rename to src/private/na-object-item-fn.h
diff --git a/nautilus-actions/private/na-object-item-priv.h b/src/private/na-object-item-priv.h
similarity index 100%
rename from nautilus-actions/private/na-object-item-priv.h
rename to src/private/na-object-item-priv.h
diff --git a/nautilus-actions/private/na-object-item.c b/src/private/na-object-item.c
similarity index 100%
rename from nautilus-actions/private/na-object-item.c
rename to src/private/na-object-item.c
diff --git a/nautilus-actions/private/na-object-menu-class.h b/src/private/na-object-menu-class.h
similarity index 100%
rename from nautilus-actions/private/na-object-menu-class.h
rename to src/private/na-object-menu-class.h
diff --git a/nautilus-actions/private/na-object-menu-fn.h b/src/private/na-object-menu-fn.h
similarity index 100%
rename from nautilus-actions/private/na-object-menu-fn.h
rename to src/private/na-object-menu-fn.h
diff --git a/nautilus-actions/private/na-object-menu-priv.h b/src/private/na-object-menu-priv.h
similarity index 100%
rename from nautilus-actions/private/na-object-menu-priv.h
rename to src/private/na-object-menu-priv.h
diff --git a/nautilus-actions/private/na-object-menu.c b/src/private/na-object-menu.c
similarity index 100%
rename from nautilus-actions/private/na-object-menu.c
rename to src/private/na-object-menu.c
diff --git a/nautilus-actions/private/na-object-priv.h b/src/private/na-object-priv.h
similarity index 100%
rename from nautilus-actions/private/na-object-priv.h
rename to src/private/na-object-priv.h
diff --git a/nautilus-actions/private/na-object-profile-class.h b/src/private/na-object-profile-class.h
similarity index 100%
rename from nautilus-actions/private/na-object-profile-class.h
rename to src/private/na-object-profile-class.h
diff --git a/nautilus-actions/private/na-object-profile-fn.h b/src/private/na-object-profile-fn.h
similarity index 100%
rename from nautilus-actions/private/na-object-profile-fn.h
rename to src/private/na-object-profile-fn.h
diff --git a/nautilus-actions/private/na-object-profile-priv.h b/src/private/na-object-profile-priv.h
similarity index 100%
rename from nautilus-actions/private/na-object-profile-priv.h
rename to src/private/na-object-profile-priv.h
diff --git a/nautilus-actions/private/na-object-profile.c b/src/private/na-object-profile.c
similarity index 100%
rename from nautilus-actions/private/na-object-profile.c
rename to src/private/na-object-profile.c
diff --git a/nautilus-actions/private/na-object.c b/src/private/na-object.c
similarity index 100%
rename from nautilus-actions/private/na-object.c
rename to src/private/na-object.c
diff --git a/nautilus-actions/runtime/Makefile.am b/src/runtime/Makefile.am
similarity index 100%
rename from nautilus-actions/runtime/Makefile.am
rename to src/runtime/Makefile.am
diff --git a/nautilus-actions/runtime/README b/src/runtime/README
similarity index 100%
rename from nautilus-actions/runtime/README
rename to src/runtime/README
diff --git a/nautilus-actions/runtime/na-gconf-utils.c b/src/runtime/na-gconf-utils.c
similarity index 100%
rename from nautilus-actions/runtime/na-gconf-utils.c
rename to src/runtime/na-gconf-utils.c
diff --git a/nautilus-actions/runtime/na-gconf-utils.h b/src/runtime/na-gconf-utils.h
similarity index 100%
rename from nautilus-actions/runtime/na-gconf-utils.h
rename to src/runtime/na-gconf-utils.h
diff --git a/nautilus-actions/runtime/na-iabout.c b/src/runtime/na-iabout.c
similarity index 100%
rename from nautilus-actions/runtime/na-iabout.c
rename to src/runtime/na-iabout.c
diff --git a/nautilus-actions/runtime/na-iabout.h b/src/runtime/na-iabout.h
similarity index 100%
rename from nautilus-actions/runtime/na-iabout.h
rename to src/runtime/na-iabout.h
diff --git a/nautilus-actions/runtime/na-io-provider.c b/src/runtime/na-io-provider.c
similarity index 100%
rename from nautilus-actions/runtime/na-io-provider.c
rename to src/runtime/na-io-provider.c
diff --git a/nautilus-actions/runtime/na-io-provider.h b/src/runtime/na-io-provider.h
similarity index 100%
rename from nautilus-actions/runtime/na-io-provider.h
rename to src/runtime/na-io-provider.h
diff --git a/nautilus-actions/runtime/na-ipivot-consumer.c b/src/runtime/na-ipivot-consumer.c
similarity index 100%
rename from nautilus-actions/runtime/na-ipivot-consumer.c
rename to src/runtime/na-ipivot-consumer.c
diff --git a/nautilus-actions/runtime/na-ipivot-consumer.h b/src/runtime/na-ipivot-consumer.h
similarity index 100%
rename from nautilus-actions/runtime/na-ipivot-consumer.h
rename to src/runtime/na-ipivot-consumer.h
diff --git a/nautilus-actions/runtime/na-iprefs.c b/src/runtime/na-iprefs.c
similarity index 100%
rename from nautilus-actions/runtime/na-iprefs.c
rename to src/runtime/na-iprefs.c
diff --git a/nautilus-actions/runtime/na-iprefs.h b/src/runtime/na-iprefs.h
similarity index 100%
rename from nautilus-actions/runtime/na-iprefs.h
rename to src/runtime/na-iprefs.h
diff --git a/nautilus-actions/runtime/na-module.c b/src/runtime/na-module.c
similarity index 100%
rename from nautilus-actions/runtime/na-module.c
rename to src/runtime/na-module.c
diff --git a/nautilus-actions/runtime/na-module.h b/src/runtime/na-module.h
similarity index 100%
rename from nautilus-actions/runtime/na-module.h
rename to src/runtime/na-module.h
diff --git a/nautilus-actions/runtime/na-pivot.c b/src/runtime/na-pivot.c
similarity index 100%
rename from nautilus-actions/runtime/na-pivot.c
rename to src/runtime/na-pivot.c
diff --git a/nautilus-actions/runtime/na-pivot.h b/src/runtime/na-pivot.h
similarity index 100%
rename from nautilus-actions/runtime/na-pivot.h
rename to src/runtime/na-pivot.h
diff --git a/nautilus-actions/runtime/na-utils.c b/src/runtime/na-utils.c
similarity index 100%
rename from nautilus-actions/runtime/na-utils.c
rename to src/runtime/na-utils.c
diff --git a/nautilus-actions/runtime/na-utils.h b/src/runtime/na-utils.h
similarity index 100%
rename from nautilus-actions/runtime/na-utils.h
rename to src/runtime/na-utils.h
diff --git a/nautilus-actions/runtime/na-xml-names.h b/src/runtime/na-xml-names.h
similarity index 100%
rename from nautilus-actions/runtime/na-xml-names.h
rename to src/runtime/na-xml-names.h
diff --git a/nautilus-actions/runtime/na-xml-writer.c b/src/runtime/na-xml-writer.c
similarity index 100%
rename from nautilus-actions/runtime/na-xml-writer.c
rename to src/runtime/na-xml-writer.c
diff --git a/nautilus-actions/runtime/na-xml-writer.h b/src/runtime/na-xml-writer.h
similarity index 100%
rename from nautilus-actions/runtime/na-xml-writer.h
rename to src/runtime/na-xml-writer.h
diff --git a/nautilus-actions/test/.gitignore b/src/test/.gitignore
similarity index 100%
rename from nautilus-actions/test/.gitignore
rename to src/test/.gitignore
diff --git a/nautilus-actions/test/Makefile.am b/src/test/Makefile.am
similarity index 100%
rename from nautilus-actions/test/Makefile.am
rename to src/test/Makefile.am
diff --git a/nautilus-actions/test/dbus-introspect.sh b/src/test/dbus-introspect.sh
similarity index 100%
rename from nautilus-actions/test/dbus-introspect.sh
rename to src/test/dbus-introspect.sh
diff --git a/nautilus-actions/test/init-dispose-diff.sh b/src/test/init-dispose-diff.sh
similarity index 100%
rename from nautilus-actions/test/init-dispose-diff.sh
rename to src/test/init-dispose-diff.sh
diff --git a/nautilus-actions/test/test-iface-base.c b/src/test/test-iface-base.c
similarity index 100%
rename from nautilus-actions/test/test-iface-base.c
rename to src/test/test-iface-base.c
diff --git a/nautilus-actions/test/test-iface-base.h b/src/test/test-iface-base.h
similarity index 100%
rename from nautilus-actions/test/test-iface-base.h
rename to src/test/test-iface-base.h
diff --git a/nautilus-actions/test/test-iface-derived.c b/src/test/test-iface-derived.c
similarity index 100%
rename from nautilus-actions/test/test-iface-derived.c
rename to src/test/test-iface-derived.c
diff --git a/nautilus-actions/test/test-iface-derived.h b/src/test/test-iface-derived.h
similarity index 100%
rename from nautilus-actions/test/test-iface-derived.h
rename to src/test/test-iface-derived.h
diff --git a/nautilus-actions/test/test-iface-iface.c b/src/test/test-iface-iface.c
similarity index 100%
rename from nautilus-actions/test/test-iface-iface.c
rename to src/test/test-iface-iface.c
diff --git a/nautilus-actions/test/test-iface-iface.h b/src/test/test-iface-iface.h
similarity index 100%
rename from nautilus-actions/test/test-iface-iface.h
rename to src/test/test-iface-iface.h
diff --git a/nautilus-actions/test/test-iface.c b/src/test/test-iface.c
similarity index 100%
rename from nautilus-actions/test/test-iface.c
rename to src/test/test-iface.c
diff --git a/nautilus-actions/test/test-parse-uris.c b/src/test/test-parse-uris.c
similarity index 100%
rename from nautilus-actions/test/test-parse-uris.c
rename to src/test/test-parse-uris.c
diff --git a/nautilus-actions/test/test-virtuals-without-test.c b/src/test/test-virtuals-without-test.c
similarity index 100%
rename from nautilus-actions/test/test-virtuals-without-test.c
rename to src/test/test-virtuals-without-test.c
diff --git a/nautilus-actions/test/test-virtuals.c b/src/test/test-virtuals.c
similarity index 100%
rename from nautilus-actions/test/test-virtuals.c
rename to src/test/test-virtuals.c
diff --git a/nautilus-actions/tracker/.gitignore b/src/tracker/.gitignore
similarity index 100%
rename from nautilus-actions/tracker/.gitignore
rename to src/tracker/.gitignore
diff --git a/nautilus-actions/tracker/Makefile.am b/src/tracker/Makefile.am
similarity index 100%
rename from nautilus-actions/tracker/Makefile.am
rename to src/tracker/Makefile.am
diff --git a/nautilus-actions/tracker/na-tracker-dbus.c b/src/tracker/na-tracker-dbus.c
similarity index 100%
rename from nautilus-actions/tracker/na-tracker-dbus.c
rename to src/tracker/na-tracker-dbus.c
diff --git a/nautilus-actions/tracker/na-tracker-dbus.h b/src/tracker/na-tracker-dbus.h
similarity index 100%
rename from nautilus-actions/tracker/na-tracker-dbus.h
rename to src/tracker/na-tracker-dbus.h
diff --git a/nautilus-actions/tracker/na-tracker-dbus.xml b/src/tracker/na-tracker-dbus.xml
similarity index 100%
rename from nautilus-actions/tracker/na-tracker-dbus.xml
rename to src/tracker/na-tracker-dbus.xml
diff --git a/nautilus-actions/tracker/na-tracker-plugin.c b/src/tracker/na-tracker-plugin.c
similarity index 100%
rename from nautilus-actions/tracker/na-tracker-plugin.c
rename to src/tracker/na-tracker-plugin.c
diff --git a/nautilus-actions/tracker/na-tracker.c b/src/tracker/na-tracker.c
similarity index 100%
rename from nautilus-actions/tracker/na-tracker.c
rename to src/tracker/na-tracker.c
diff --git a/nautilus-actions/tracker/na-tracker.h b/src/tracker/na-tracker.h
similarity index 100%
rename from nautilus-actions/tracker/na-tracker.h
rename to src/tracker/na-tracker.h
diff --git a/nautilus-actions/utils/.gitignore b/src/utils/.gitignore
similarity index 100%
rename from nautilus-actions/utils/.gitignore
rename to src/utils/.gitignore
diff --git a/nautilus-actions/utils/Makefile.am b/src/utils/Makefile.am
similarity index 100%
rename from nautilus-actions/utils/Makefile.am
rename to src/utils/Makefile.am
diff --git a/nautilus-actions/utils/console-utils.c b/src/utils/console-utils.c
similarity index 100%
rename from nautilus-actions/utils/console-utils.c
rename to src/utils/console-utils.c
diff --git a/nautilus-actions/utils/console-utils.h b/src/utils/console-utils.h
similarity index 100%
rename from nautilus-actions/utils/console-utils.h
rename to src/utils/console-utils.h
diff --git a/nautilus-actions/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
similarity index 100%
rename from nautilus-actions/utils/nautilus-actions-new.c
rename to src/utils/nautilus-actions-new.c
diff --git a/nautilus-actions/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
similarity index 100%
rename from nautilus-actions/utils/nautilus-actions-run.c
rename to src/utils/nautilus-actions-run.c
diff --git a/nautilus-actions/utils/nautilus-actions-schemas.c b/src/utils/nautilus-actions-schemas.c
similarity index 100%
rename from nautilus-actions/utils/nautilus-actions-schemas.c
rename to src/utils/nautilus-actions-schemas.c