diff --git a/configure.ac b/configure.ac index 80a49c0fc5..14e070d5c2 100644 --- a/configure.ac +++ b/configure.ac @@ -779,7 +779,7 @@ then AC_SUBST(AQBANKING_LIBS) AC_SUBST(AQBANKING_CFLAGS) _COMPONENTS="$_COMPONENTS aqbanking" - MIGRATABLE_PREFS_AQBANKING="$srcdir/src/import-export/aqbanking/migratable-prefs-aqbanking.xml" + MIGRATABLE_PREFS_AQBANKING="$srcdir/src/import-export/aqb/migratable-prefs-aqbanking.xml" fi AM_CONDITIONAL([WITH_AQBANKING], [test x${want_aqbanking} = xyes]) AC_SUBST_FILE([MIGRATABLE_PREFS_AQBANKING]) @@ -1397,21 +1397,21 @@ AC_CONFIG_FILES( src/import-export/Makefile src/import-export/test/Makefile src/import-export/ofx/gschemas/Makefile - src/import-export/qif-import/Makefile + src/import-export/qif-imp/Makefile src/import-export/qif/Makefile src/import-export/qif/test/Makefile - src/import-export/qif-import/gschemas/Makefile - src/import-export/qif-import/test/Makefile + src/import-export/qif-imp/gschemas/Makefile + src/import-export/qif-imp/test/Makefile src/import-export/gschemas/Makefile src/import-export/ofx/Makefile src/import-export/ofx/test/Makefile - src/import-export/csv-import/Makefile - src/import-export/csv-import/gschemas/Makefile - src/import-export/csv-export/Makefile - src/import-export/csv-export/gschemas/Makefile + src/import-export/csv-imp/Makefile + src/import-export/csv-imp/gschemas/Makefile + src/import-export/csv-exp/Makefile + src/import-export/csv-exp/gschemas/Makefile src/import-export/log-replay/Makefile - src/import-export/aqbanking/Makefile - src/import-export/aqbanking/gschemas/Makefile + src/import-export/aqb/Makefile + src/import-export/aqb/gschemas/Makefile src/libqof/Makefile src/libqof/qof/Makefile src/libqof/qof/test/Makefile @@ -1487,12 +1487,12 @@ AC_CONFIG_FILES( src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in - src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in - src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in - src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in + src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in + src/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in + src/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in - src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in + src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in dnl # Please read doc/build-system before adding *anything* here , dnl # init-commands go here diff --git a/po/POTFILES.in b/po/POTFILES.in index 812f30f855..b4bfd9090b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -362,39 +362,39 @@ src/html/gnc-html-factory.c src/html/gnc-html-history.c src/html/gnc-html-webkit.c src/html/gncmod-html.c -src/import-export/aqbanking/assistant-ab-initial.c -src/import-export/aqbanking/assistant-ab-initial.glade -src/import-export/aqbanking/dialog-ab-daterange.c -src/import-export/aqbanking/dialog-ab.glade -src/import-export/aqbanking/dialog-ab-trans.c -src/import-export/aqbanking/gnc-ab-getbalance.c -src/import-export/aqbanking/gnc-ab-gettrans.c -src/import-export/aqbanking/gnc-ab-kvp.c -src/import-export/aqbanking/gnc-ab-transfer.c -src/import-export/aqbanking/gnc-ab-trans-templ.c -src/import-export/aqbanking/gnc-ab-utils.c -src/import-export/aqbanking/gnc-file-aqb-import.c -src/import-export/aqbanking/gnc-gwen-gui.c -src/import-export/aqbanking/gncmod-aqbanking.c -src/import-export/aqbanking/gnc-plugin-aqbanking.c -[type: gettext/gsettings]src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in -src/import-export/csv-export/assistant-csv-export.c -src/import-export/csv-export/assistant-csv-export.glade -src/import-export/csv-export/csv-transactions-export.c -src/import-export/csv-export/csv-tree-export.c -src/import-export/csv-export/gncmod-csv-export.c -src/import-export/csv-export/gnc-plugin-csv-export.c -[type: gettext/gsettings]src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in -src/import-export/csv-import/assistant-csv-account-import.c -src/import-export/csv-import/assistant-csv-account-import.glade -src/import-export/csv-import/assistant-csv-trans-import.c -src/import-export/csv-import/assistant-csv-trans-import.glade -src/import-export/csv-import/csv-account-import.c -src/import-export/csv-import/gnc-csv-gnumeric-popup.c -src/import-export/csv-import/gnc-csv-model.c -src/import-export/csv-import/gncmod-csv-import.c -src/import-export/csv-import/gnc-plugin-csv-import.c -[type: gettext/gsettings]src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in +src/import-export/aqb/assistant-ab-initial.c +src/import-export/aqb/assistant-ab-initial.glade +src/import-export/aqb/dialog-ab-daterange.c +src/import-export/aqb/dialog-ab.glade +src/import-export/aqb/dialog-ab-trans.c +src/import-export/aqb/gnc-ab-getbalance.c +src/import-export/aqb/gnc-ab-gettrans.c +src/import-export/aqb/gnc-ab-kvp.c +src/import-export/aqb/gnc-ab-transfer.c +src/import-export/aqb/gnc-ab-trans-templ.c +src/import-export/aqb/gnc-ab-utils.c +src/import-export/aqb/gnc-file-aqb-import.c +src/import-export/aqb/gnc-gwen-gui.c +src/import-export/aqb/gncmod-aqbanking.c +src/import-export/aqb/gnc-plugin-aqbanking.c +[type: gettext/gsettings]src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in +src/import-export/csv-exp/assistant-csv-export.c +src/import-export/csv-exp/assistant-csv-export.glade +src/import-export/csv-exp/csv-transactions-export.c +src/import-export/csv-exp/csv-tree-export.c +src/import-export/csv-exp/gncmod-csv-export.c +src/import-export/csv-exp/gnc-plugin-csv-export.c +[type: gettext/gsettings]src/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in +src/import-export/csv-imp/assistant-csv-account-import.c +src/import-export/csv-imp/assistant-csv-account-import.glade +src/import-export/csv-imp/assistant-csv-trans-import.c +src/import-export/csv-imp/assistant-csv-trans-import.glade +src/import-export/csv-imp/csv-account-import.c +src/import-export/csv-imp/gnc-csv-gnumeric-popup.c +src/import-export/csv-imp/gnc-csv-model.c +src/import-export/csv-imp/gncmod-csv-import.c +src/import-export/csv-imp/gnc-plugin-csv-import.c +[type: gettext/gsettings]src/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in src/import-export/dialog-import.glade src/import-export/gncmod-generic-import.c [type: gettext/gsettings]src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in @@ -416,13 +416,13 @@ src/import-export/ofx/gnc-ofx-import.c src/import-export/ofx/gnc-ofx-kvp.c src/import-export/ofx/gnc-plugin-ofx.c [type: gettext/gsettings]src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in -src/import-export/qif-import/assistant-qif-import.c -src/import-export/qif-import/assistant-qif-import.glade -src/import-export/qif-import/dialog-account-picker.c -src/import-export/qif-import/dialog-account-picker.glade -src/import-export/qif-import/gncmod-qif-import.c -src/import-export/qif-import/gnc-plugin-qif-import.c -[type: gettext/gsettings]src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in +src/import-export/qif-imp/assistant-qif-import.c +src/import-export/qif-imp/assistant-qif-import.glade +src/import-export/qif-imp/dialog-account-picker.c +src/import-export/qif-imp/dialog-account-picker.glade +src/import-export/qif-imp/gncmod-qif-import.c +src/import-export/qif-imp/gnc-plugin-qif-import.c +[type: gettext/gsettings]src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in src/import-export/qif/qif-context.c src/import-export/qif/qif-file.c src/import-export/qif/qif-objects.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index f9cfe0ca96..a3d3331af2 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -30,16 +30,16 @@ src/app-utils/business-prefs.scm src/app-utils/date-utilities.scm src/app-utils/gnucash/app-utils.scm src/app-utils/prefs.scm -src/import-export/qif-import/qif-dialog-utils.scm -src/import-export/qif-import/qif-file.scm -src/import-export/qif-import/qif-import/qif-dialog-utils.scm -src/import-export/qif-import/qif-import/qif-file.scm -src/import-export/qif-import/qif-import/qif-merge-groups.scm -src/import-export/qif-import/qif-import/qif-parse.scm -src/import-export/qif-import/qif-import/qif-to-gnc.scm -src/import-export/qif-import/qif-merge-groups.scm -src/import-export/qif-import/qif-parse.scm -src/import-export/qif-import/qif-to-gnc.scm +src/import-export/qif-imp/qif-dialog-utils.scm +src/import-export/qif-imp/qif-file.scm +src/import-export/qif-imp/qif-import/qif-dialog-utils.scm +src/import-export/qif-imp/qif-import/qif-file.scm +src/import-export/qif-imp/qif-import/qif-merge-groups.scm +src/import-export/qif-imp/qif-import/qif-parse.scm +src/import-export/qif-imp/qif-import/qif-to-gnc.scm +src/import-export/qif-imp/qif-merge-groups.scm +src/import-export/qif-imp/qif-parse.scm +src/import-export/qif-imp/qif-to-gnc.scm src/report/business-reports/aging.scm src/report/business-reports/balsheet-eg.eguile.scm src/report/business-reports/balsheet-eg.scm diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am index 24f47d6339..0f07e244be 100644 --- a/src/import-export/Makefile.am +++ b/src/import-export/Makefile.am @@ -2,10 +2,10 @@ if WITH_OFX OFX_DIR=ofx endif if WITH_AQBANKING - AQBANKING_DIR=aqbanking + AQBANKING_DIR=aqb endif -SUBDIRS = . gschemas qif qif-import \ - ${OFX_DIR} ${AQBANKING_DIR} log-replay test csv-import csv-export +SUBDIRS = . gschemas qif qif-imp \ + ${OFX_DIR} ${AQBANKING_DIR} log-replay test csv-imp csv-exp pkglib_LTLIBRARIES=libgncmod-generic-import.la diff --git a/src/import-export/aqbanking/CMakeLists.txt b/src/import-export/aqb/CMakeLists.txt similarity index 100% rename from src/import-export/aqbanking/CMakeLists.txt rename to src/import-export/aqb/CMakeLists.txt diff --git a/src/import-export/aqbanking/Makefile.am b/src/import-export/aqb/Makefile.am similarity index 100% rename from src/import-export/aqbanking/Makefile.am rename to src/import-export/aqb/Makefile.am diff --git a/src/import-export/aqbanking/assistant-ab-initial.c b/src/import-export/aqb/assistant-ab-initial.c similarity index 100% rename from src/import-export/aqbanking/assistant-ab-initial.c rename to src/import-export/aqb/assistant-ab-initial.c diff --git a/src/import-export/aqbanking/assistant-ab-initial.glade b/src/import-export/aqb/assistant-ab-initial.glade similarity index 100% rename from src/import-export/aqbanking/assistant-ab-initial.glade rename to src/import-export/aqb/assistant-ab-initial.glade diff --git a/src/import-export/aqbanking/assistant-ab-initial.h b/src/import-export/aqb/assistant-ab-initial.h similarity index 100% rename from src/import-export/aqbanking/assistant-ab-initial.h rename to src/import-export/aqb/assistant-ab-initial.h diff --git a/src/import-export/aqbanking/dialog-ab-daterange.c b/src/import-export/aqb/dialog-ab-daterange.c similarity index 100% rename from src/import-export/aqbanking/dialog-ab-daterange.c rename to src/import-export/aqb/dialog-ab-daterange.c diff --git a/src/import-export/aqbanking/dialog-ab-daterange.h b/src/import-export/aqb/dialog-ab-daterange.h similarity index 100% rename from src/import-export/aqbanking/dialog-ab-daterange.h rename to src/import-export/aqb/dialog-ab-daterange.h diff --git a/src/import-export/aqbanking/dialog-ab-trans.c b/src/import-export/aqb/dialog-ab-trans.c similarity index 100% rename from src/import-export/aqbanking/dialog-ab-trans.c rename to src/import-export/aqb/dialog-ab-trans.c diff --git a/src/import-export/aqbanking/dialog-ab-trans.h b/src/import-export/aqb/dialog-ab-trans.h similarity index 100% rename from src/import-export/aqbanking/dialog-ab-trans.h rename to src/import-export/aqb/dialog-ab-trans.h diff --git a/src/import-export/aqbanking/dialog-ab.glade b/src/import-export/aqb/dialog-ab.glade similarity index 100% rename from src/import-export/aqbanking/dialog-ab.glade rename to src/import-export/aqb/dialog-ab.glade diff --git a/src/import-export/aqbanking/gnc-ab-getbalance.c b/src/import-export/aqb/gnc-ab-getbalance.c similarity index 100% rename from src/import-export/aqbanking/gnc-ab-getbalance.c rename to src/import-export/aqb/gnc-ab-getbalance.c diff --git a/src/import-export/aqbanking/gnc-ab-getbalance.h b/src/import-export/aqb/gnc-ab-getbalance.h similarity index 100% rename from src/import-export/aqbanking/gnc-ab-getbalance.h rename to src/import-export/aqb/gnc-ab-getbalance.h diff --git a/src/import-export/aqbanking/gnc-ab-gettrans.c b/src/import-export/aqb/gnc-ab-gettrans.c similarity index 100% rename from src/import-export/aqbanking/gnc-ab-gettrans.c rename to src/import-export/aqb/gnc-ab-gettrans.c diff --git a/src/import-export/aqbanking/gnc-ab-gettrans.h b/src/import-export/aqb/gnc-ab-gettrans.h similarity index 100% rename from src/import-export/aqbanking/gnc-ab-gettrans.h rename to src/import-export/aqb/gnc-ab-gettrans.h diff --git a/src/import-export/aqbanking/gnc-ab-kvp.c b/src/import-export/aqb/gnc-ab-kvp.c similarity index 100% rename from src/import-export/aqbanking/gnc-ab-kvp.c rename to src/import-export/aqb/gnc-ab-kvp.c diff --git a/src/import-export/aqbanking/gnc-ab-kvp.h b/src/import-export/aqb/gnc-ab-kvp.h similarity index 100% rename from src/import-export/aqbanking/gnc-ab-kvp.h rename to src/import-export/aqb/gnc-ab-kvp.h diff --git a/src/import-export/aqbanking/gnc-ab-trans-templ.c b/src/import-export/aqb/gnc-ab-trans-templ.c similarity index 100% rename from src/import-export/aqbanking/gnc-ab-trans-templ.c rename to src/import-export/aqb/gnc-ab-trans-templ.c diff --git a/src/import-export/aqbanking/gnc-ab-trans-templ.h b/src/import-export/aqb/gnc-ab-trans-templ.h similarity index 100% rename from src/import-export/aqbanking/gnc-ab-trans-templ.h rename to src/import-export/aqb/gnc-ab-trans-templ.h diff --git a/src/import-export/aqbanking/gnc-ab-transfer.c b/src/import-export/aqb/gnc-ab-transfer.c similarity index 100% rename from src/import-export/aqbanking/gnc-ab-transfer.c rename to src/import-export/aqb/gnc-ab-transfer.c diff --git a/src/import-export/aqbanking/gnc-ab-transfer.h b/src/import-export/aqb/gnc-ab-transfer.h similarity index 100% rename from src/import-export/aqbanking/gnc-ab-transfer.h rename to src/import-export/aqb/gnc-ab-transfer.h diff --git a/src/import-export/aqbanking/gnc-ab-utils.c b/src/import-export/aqb/gnc-ab-utils.c similarity index 100% rename from src/import-export/aqbanking/gnc-ab-utils.c rename to src/import-export/aqb/gnc-ab-utils.c diff --git a/src/import-export/aqbanking/gnc-ab-utils.h b/src/import-export/aqb/gnc-ab-utils.h similarity index 100% rename from src/import-export/aqbanking/gnc-ab-utils.h rename to src/import-export/aqb/gnc-ab-utils.h diff --git a/src/import-export/aqbanking/gnc-file-aqb-import.c b/src/import-export/aqb/gnc-file-aqb-import.c similarity index 100% rename from src/import-export/aqbanking/gnc-file-aqb-import.c rename to src/import-export/aqb/gnc-file-aqb-import.c diff --git a/src/import-export/aqbanking/gnc-file-aqb-import.h b/src/import-export/aqb/gnc-file-aqb-import.h similarity index 100% rename from src/import-export/aqbanking/gnc-file-aqb-import.h rename to src/import-export/aqb/gnc-file-aqb-import.h diff --git a/src/import-export/aqbanking/gnc-gwen-gui.c b/src/import-export/aqb/gnc-gwen-gui.c similarity index 100% rename from src/import-export/aqbanking/gnc-gwen-gui.c rename to src/import-export/aqb/gnc-gwen-gui.c diff --git a/src/import-export/aqbanking/gnc-gwen-gui.h b/src/import-export/aqb/gnc-gwen-gui.h similarity index 100% rename from src/import-export/aqbanking/gnc-gwen-gui.h rename to src/import-export/aqb/gnc-gwen-gui.h diff --git a/src/import-export/aqbanking/gnc-plugin-aqbanking-ui.xml b/src/import-export/aqb/gnc-plugin-aqbanking-ui.xml similarity index 100% rename from src/import-export/aqbanking/gnc-plugin-aqbanking-ui.xml rename to src/import-export/aqb/gnc-plugin-aqbanking-ui.xml diff --git a/src/import-export/aqbanking/gnc-plugin-aqbanking.c b/src/import-export/aqb/gnc-plugin-aqbanking.c similarity index 100% rename from src/import-export/aqbanking/gnc-plugin-aqbanking.c rename to src/import-export/aqb/gnc-plugin-aqbanking.c diff --git a/src/import-export/aqbanking/gnc-plugin-aqbanking.h b/src/import-export/aqb/gnc-plugin-aqbanking.h similarity index 100% rename from src/import-export/aqbanking/gnc-plugin-aqbanking.h rename to src/import-export/aqb/gnc-plugin-aqbanking.h diff --git a/src/import-export/aqbanking/gncmod-aqbanking.c b/src/import-export/aqb/gncmod-aqbanking.c similarity index 100% rename from src/import-export/aqbanking/gncmod-aqbanking.c rename to src/import-export/aqb/gncmod-aqbanking.c diff --git a/src/import-export/aqbanking/gschemas/Makefile.am b/src/import-export/aqb/gschemas/Makefile.am similarity index 100% rename from src/import-export/aqbanking/gschemas/Makefile.am rename to src/import-export/aqb/gschemas/Makefile.am diff --git a/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in b/src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in similarity index 100% rename from src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in rename to src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in diff --git a/src/import-export/aqbanking/migratable-prefs-aqbanking.xml b/src/import-export/aqb/migratable-prefs-aqbanking.xml similarity index 100% rename from src/import-export/aqbanking/migratable-prefs-aqbanking.xml rename to src/import-export/aqb/migratable-prefs-aqbanking.xml diff --git a/src/import-export/csv-export/Makefile.am b/src/import-export/csv-exp/Makefile.am similarity index 100% rename from src/import-export/csv-export/Makefile.am rename to src/import-export/csv-exp/Makefile.am diff --git a/src/import-export/csv-export/assistant-csv-export.c b/src/import-export/csv-exp/assistant-csv-export.c similarity index 100% rename from src/import-export/csv-export/assistant-csv-export.c rename to src/import-export/csv-exp/assistant-csv-export.c diff --git a/src/import-export/csv-export/assistant-csv-export.glade b/src/import-export/csv-exp/assistant-csv-export.glade similarity index 100% rename from src/import-export/csv-export/assistant-csv-export.glade rename to src/import-export/csv-exp/assistant-csv-export.glade diff --git a/src/import-export/csv-export/assistant-csv-export.h b/src/import-export/csv-exp/assistant-csv-export.h similarity index 100% rename from src/import-export/csv-export/assistant-csv-export.h rename to src/import-export/csv-exp/assistant-csv-export.h diff --git a/src/import-export/csv-export/csv-transactions-export.c b/src/import-export/csv-exp/csv-transactions-export.c similarity index 100% rename from src/import-export/csv-export/csv-transactions-export.c rename to src/import-export/csv-exp/csv-transactions-export.c diff --git a/src/import-export/csv-export/csv-transactions-export.h b/src/import-export/csv-exp/csv-transactions-export.h similarity index 100% rename from src/import-export/csv-export/csv-transactions-export.h rename to src/import-export/csv-exp/csv-transactions-export.h diff --git a/src/import-export/csv-export/csv-tree-export.c b/src/import-export/csv-exp/csv-tree-export.c similarity index 100% rename from src/import-export/csv-export/csv-tree-export.c rename to src/import-export/csv-exp/csv-tree-export.c diff --git a/src/import-export/csv-export/csv-tree-export.h b/src/import-export/csv-exp/csv-tree-export.h similarity index 100% rename from src/import-export/csv-export/csv-tree-export.h rename to src/import-export/csv-exp/csv-tree-export.h diff --git a/src/import-export/csv-export/gnc-plugin-csv-export-ui.xml b/src/import-export/csv-exp/gnc-plugin-csv-export-ui.xml similarity index 100% rename from src/import-export/csv-export/gnc-plugin-csv-export-ui.xml rename to src/import-export/csv-exp/gnc-plugin-csv-export-ui.xml diff --git a/src/import-export/csv-export/gnc-plugin-csv-export.c b/src/import-export/csv-exp/gnc-plugin-csv-export.c similarity index 100% rename from src/import-export/csv-export/gnc-plugin-csv-export.c rename to src/import-export/csv-exp/gnc-plugin-csv-export.c diff --git a/src/import-export/csv-export/gnc-plugin-csv-export.h b/src/import-export/csv-exp/gnc-plugin-csv-export.h similarity index 100% rename from src/import-export/csv-export/gnc-plugin-csv-export.h rename to src/import-export/csv-exp/gnc-plugin-csv-export.h diff --git a/src/import-export/csv-export/gncmod-csv-export.c b/src/import-export/csv-exp/gncmod-csv-export.c similarity index 100% rename from src/import-export/csv-export/gncmod-csv-export.c rename to src/import-export/csv-exp/gncmod-csv-export.c diff --git a/src/import-export/csv-export/gschemas/Makefile.am b/src/import-export/csv-exp/gschemas/Makefile.am similarity index 100% rename from src/import-export/csv-export/gschemas/Makefile.am rename to src/import-export/csv-exp/gschemas/Makefile.am diff --git a/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in b/src/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in similarity index 100% rename from src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in rename to src/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in diff --git a/src/import-export/csv-import/Makefile.am b/src/import-export/csv-imp/Makefile.am similarity index 100% rename from src/import-export/csv-import/Makefile.am rename to src/import-export/csv-imp/Makefile.am diff --git a/src/import-export/csv-import/assistant-csv-account-import.c b/src/import-export/csv-imp/assistant-csv-account-import.c similarity index 100% rename from src/import-export/csv-import/assistant-csv-account-import.c rename to src/import-export/csv-imp/assistant-csv-account-import.c diff --git a/src/import-export/csv-import/assistant-csv-account-import.glade b/src/import-export/csv-imp/assistant-csv-account-import.glade similarity index 100% rename from src/import-export/csv-import/assistant-csv-account-import.glade rename to src/import-export/csv-imp/assistant-csv-account-import.glade diff --git a/src/import-export/csv-import/assistant-csv-account-import.h b/src/import-export/csv-imp/assistant-csv-account-import.h similarity index 100% rename from src/import-export/csv-import/assistant-csv-account-import.h rename to src/import-export/csv-imp/assistant-csv-account-import.h diff --git a/src/import-export/csv-import/assistant-csv-trans-import.c b/src/import-export/csv-imp/assistant-csv-trans-import.c similarity index 100% rename from src/import-export/csv-import/assistant-csv-trans-import.c rename to src/import-export/csv-imp/assistant-csv-trans-import.c diff --git a/src/import-export/csv-import/assistant-csv-trans-import.glade b/src/import-export/csv-imp/assistant-csv-trans-import.glade similarity index 100% rename from src/import-export/csv-import/assistant-csv-trans-import.glade rename to src/import-export/csv-imp/assistant-csv-trans-import.glade diff --git a/src/import-export/csv-import/assistant-csv-trans-import.h b/src/import-export/csv-imp/assistant-csv-trans-import.h similarity index 100% rename from src/import-export/csv-import/assistant-csv-trans-import.h rename to src/import-export/csv-imp/assistant-csv-trans-import.h diff --git a/src/import-export/csv-import/csv-account-import.c b/src/import-export/csv-imp/csv-account-import.c similarity index 100% rename from src/import-export/csv-import/csv-account-import.c rename to src/import-export/csv-imp/csv-account-import.c diff --git a/src/import-export/csv-import/csv-account-import.h b/src/import-export/csv-imp/csv-account-import.h similarity index 100% rename from src/import-export/csv-import/csv-account-import.h rename to src/import-export/csv-imp/csv-account-import.h diff --git a/src/import-export/csv-import/gnc-csv-gnumeric-popup.c b/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c similarity index 100% rename from src/import-export/csv-import/gnc-csv-gnumeric-popup.c rename to src/import-export/csv-imp/gnc-csv-gnumeric-popup.c diff --git a/src/import-export/csv-import/gnc-csv-gnumeric-popup.h b/src/import-export/csv-imp/gnc-csv-gnumeric-popup.h similarity index 100% rename from src/import-export/csv-import/gnc-csv-gnumeric-popup.h rename to src/import-export/csv-imp/gnc-csv-gnumeric-popup.h diff --git a/src/import-export/csv-import/gnc-csv-model.c b/src/import-export/csv-imp/gnc-csv-model.c similarity index 100% rename from src/import-export/csv-import/gnc-csv-model.c rename to src/import-export/csv-imp/gnc-csv-model.c diff --git a/src/import-export/csv-import/gnc-csv-model.h b/src/import-export/csv-imp/gnc-csv-model.h similarity index 100% rename from src/import-export/csv-import/gnc-csv-model.h rename to src/import-export/csv-imp/gnc-csv-model.h diff --git a/src/import-export/csv-import/gnc-plugin-csv-import-ui.xml b/src/import-export/csv-imp/gnc-plugin-csv-import-ui.xml similarity index 100% rename from src/import-export/csv-import/gnc-plugin-csv-import-ui.xml rename to src/import-export/csv-imp/gnc-plugin-csv-import-ui.xml diff --git a/src/import-export/csv-import/gnc-plugin-csv-import.c b/src/import-export/csv-imp/gnc-plugin-csv-import.c similarity index 100% rename from src/import-export/csv-import/gnc-plugin-csv-import.c rename to src/import-export/csv-imp/gnc-plugin-csv-import.c diff --git a/src/import-export/csv-import/gnc-plugin-csv-import.h b/src/import-export/csv-imp/gnc-plugin-csv-import.h similarity index 100% rename from src/import-export/csv-import/gnc-plugin-csv-import.h rename to src/import-export/csv-imp/gnc-plugin-csv-import.h diff --git a/src/import-export/csv-import/gncmod-csv-import.c b/src/import-export/csv-imp/gncmod-csv-import.c similarity index 100% rename from src/import-export/csv-import/gncmod-csv-import.c rename to src/import-export/csv-imp/gncmod-csv-import.c diff --git a/src/import-export/csv-import/gschemas/Makefile.am b/src/import-export/csv-imp/gschemas/Makefile.am similarity index 100% rename from src/import-export/csv-import/gschemas/Makefile.am rename to src/import-export/csv-imp/gschemas/Makefile.am diff --git a/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in b/src/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in similarity index 100% rename from src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in rename to src/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in diff --git a/src/import-export/qif-import/Makefile.am b/src/import-export/qif-imp/Makefile.am similarity index 100% rename from src/import-export/qif-import/Makefile.am rename to src/import-export/qif-imp/Makefile.am diff --git a/src/import-export/qif-import/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c similarity index 100% rename from src/import-export/qif-import/assistant-qif-import.c rename to src/import-export/qif-imp/assistant-qif-import.c diff --git a/src/import-export/qif-import/assistant-qif-import.glade b/src/import-export/qif-imp/assistant-qif-import.glade similarity index 100% rename from src/import-export/qif-import/assistant-qif-import.glade rename to src/import-export/qif-imp/assistant-qif-import.glade diff --git a/src/import-export/qif-import/assistant-qif-import.h b/src/import-export/qif-imp/assistant-qif-import.h similarity index 100% rename from src/import-export/qif-import/assistant-qif-import.h rename to src/import-export/qif-imp/assistant-qif-import.h diff --git a/src/import-export/qif-import/dialog-account-picker.c b/src/import-export/qif-imp/dialog-account-picker.c similarity index 100% rename from src/import-export/qif-import/dialog-account-picker.c rename to src/import-export/qif-imp/dialog-account-picker.c diff --git a/src/import-export/qif-import/dialog-account-picker.glade b/src/import-export/qif-imp/dialog-account-picker.glade similarity index 100% rename from src/import-export/qif-import/dialog-account-picker.glade rename to src/import-export/qif-imp/dialog-account-picker.glade diff --git a/src/import-export/qif-import/dialog-account-picker.h b/src/import-export/qif-imp/dialog-account-picker.h similarity index 100% rename from src/import-export/qif-import/dialog-account-picker.h rename to src/import-export/qif-imp/dialog-account-picker.h diff --git a/src/import-export/qif-import/file-format.txt b/src/import-export/qif-imp/file-format.txt similarity index 100% rename from src/import-export/qif-import/file-format.txt rename to src/import-export/qif-imp/file-format.txt diff --git a/src/import-export/qif-import/gnc-plugin-qif-import-ui.xml b/src/import-export/qif-imp/gnc-plugin-qif-import-ui.xml similarity index 100% rename from src/import-export/qif-import/gnc-plugin-qif-import-ui.xml rename to src/import-export/qif-imp/gnc-plugin-qif-import-ui.xml diff --git a/src/import-export/qif-import/gnc-plugin-qif-import.c b/src/import-export/qif-imp/gnc-plugin-qif-import.c similarity index 100% rename from src/import-export/qif-import/gnc-plugin-qif-import.c rename to src/import-export/qif-imp/gnc-plugin-qif-import.c diff --git a/src/import-export/qif-import/gnc-plugin-qif-import.h b/src/import-export/qif-imp/gnc-plugin-qif-import.h similarity index 100% rename from src/import-export/qif-import/gnc-plugin-qif-import.h rename to src/import-export/qif-imp/gnc-plugin-qif-import.h diff --git a/src/import-export/qif-import/gncmod-qif-import.c b/src/import-export/qif-imp/gncmod-qif-import.c similarity index 100% rename from src/import-export/qif-import/gncmod-qif-import.c rename to src/import-export/qif-imp/gncmod-qif-import.c diff --git a/src/import-export/qif-import/gschemas/Makefile.am b/src/import-export/qif-imp/gschemas/Makefile.am similarity index 100% rename from src/import-export/qif-import/gschemas/Makefile.am rename to src/import-export/qif-imp/gschemas/Makefile.am diff --git a/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in b/src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in similarity index 100% rename from src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in rename to src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in diff --git a/src/import-export/qif-import/qif-dialog-utils.scm b/src/import-export/qif-imp/qif-dialog-utils.scm similarity index 100% rename from src/import-export/qif-import/qif-dialog-utils.scm rename to src/import-export/qif-imp/qif-dialog-utils.scm diff --git a/src/import-export/qif-import/qif-file.scm b/src/import-export/qif-imp/qif-file.scm similarity index 100% rename from src/import-export/qif-import/qif-file.scm rename to src/import-export/qif-imp/qif-file.scm diff --git a/src/import-export/qif-import/qif-guess-map.scm b/src/import-export/qif-imp/qif-guess-map.scm similarity index 100% rename from src/import-export/qif-import/qif-guess-map.scm rename to src/import-export/qif-imp/qif-guess-map.scm diff --git a/src/import-export/qif-import/qif-import.scm b/src/import-export/qif-imp/qif-import.scm similarity index 100% rename from src/import-export/qif-import/qif-import.scm rename to src/import-export/qif-imp/qif-import.scm diff --git a/src/import-export/qif-import/qif-merge-groups.scm b/src/import-export/qif-imp/qif-merge-groups.scm similarity index 100% rename from src/import-export/qif-import/qif-merge-groups.scm rename to src/import-export/qif-imp/qif-merge-groups.scm diff --git a/src/import-export/qif-import/qif-objects.scm b/src/import-export/qif-imp/qif-objects.scm similarity index 100% rename from src/import-export/qif-import/qif-objects.scm rename to src/import-export/qif-imp/qif-objects.scm diff --git a/src/import-export/qif-import/qif-parse.scm b/src/import-export/qif-imp/qif-parse.scm similarity index 100% rename from src/import-export/qif-import/qif-parse.scm rename to src/import-export/qif-imp/qif-parse.scm diff --git a/src/import-export/qif-import/qif-to-gnc.scm b/src/import-export/qif-imp/qif-to-gnc.scm similarity index 100% rename from src/import-export/qif-import/qif-to-gnc.scm rename to src/import-export/qif-imp/qif-to-gnc.scm diff --git a/src/import-export/qif-import/qif-utils.scm b/src/import-export/qif-imp/qif-utils.scm similarity index 100% rename from src/import-export/qif-import/qif-utils.scm rename to src/import-export/qif-imp/qif-utils.scm diff --git a/src/import-export/qif-import/test/Makefile.am b/src/import-export/qif-imp/test/Makefile.am similarity index 100% rename from src/import-export/qif-import/test/Makefile.am rename to src/import-export/qif-imp/test/Makefile.am diff --git a/src/import-export/qif-import/test/test-link.c b/src/import-export/qif-imp/test/test-link.c similarity index 100% rename from src/import-export/qif-import/test/test-link.c rename to src/import-export/qif-imp/test/test-link.c