diff --git a/CMakeLists.txt b/CMakeLists.txt
index db01fcd9f8..ffad3d18f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ SET (GNUCASH_RESAVE_VERSION "19920")
 SET(GETTEXT_PACKAGE "gnucash")
 
 # Extra cmake macros
-SET (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/src/cmake_modules;${CMAKE_MODULE_PATH}")
+SET (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/common/cmake_modules;${CMAKE_MODULE_PATH}")
 # CMake does a non-recursive build that puts the final build product directories in the build root. Some code needs to know this.
 
 INCLUDE (MacroAppendForeach)
@@ -161,7 +161,7 @@ ENDIF(WIN32)
 FIND_PACKAGE(PkgConfig REQUIRED)
 
 # The default FindPkgConfig.make code has a bug in how the setting of PKG_CONFIG_PATH is handled.
-# The src/cmake_modules/GncFindPkgConfig.cmake file overrides a couple of macros in FindPkgConfig to fix.
+# The common/cmake_modules/GncFindPkgConfig.cmake file overrides a couple of macros in FindPkgConfig to fix.
 
 INCLUDE (GncFindPkgConfig)
 
@@ -556,16 +556,16 @@ INSTALL(FILES ${gnucash_DOCS} DESTINATION share/doc/gnucash)
 SET (GETTEXT_PACKAGE "gnucash")
 
 IF (WIN32)
-  IF (MINGW)
-    SET (HAVE_SCANF_LLD 1)
-  ELSE ()
-    SET (HAVE_SCANF_I64D 1)
-  ENDIF ()
-  SET (HAVE_HTMLHELPW 1)
+IF (MINGW)
+SET (HAVE_SCANF_LLD 1)
+ELSE ()
+SET (HAVE_SCANF_I64D 1)
+ENDIF ()
+SET (HAVE_HTMLHELPW 1)
 ENDIF (WIN32)
 
 IF (NOT WIN32)
-  CHECK_INCLUDE_FILES (X11/Xlib.h HAVE_X11_XLIB_H)
+CHECK_INCLUDE_FILES (X11/Xlib.h HAVE_X11_XLIB_H)
 ENDIF (NOT WIN32)
 
 CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
@@ -589,99 +589,92 @@ CHECK_INCLUDE_FILES (utmp.h HAVE_UTMP_H)
 CHECK_INCLUDE_FILES (wctype.h HAVE_WCTYPE_H)
 
 IF (NOT DISABLE_NLS)
-  SET(ENABLE_NLS 1)
+SET(ENABLE_NLS 1)
 ENDIF(NOT DISABLE_NLS)
 
 IF (ENABLE_BINRELOC)
-  IF (UNIX OR MINGW)
-    SET(BR_PTHREAD 1)
-  ENDIF(UNIX OR MINGW)
+IF (UNIX OR MINGW)
+SET(BR_PTHREAD 1)
+ENDIF(UNIX OR MINGW)
 ENDIF(ENABLE_BINRELOC)
 
 IF (UNIX OR MINGW)
-  SET (HAVE_BIND_TEXTDOMAIN_CODESET 1)
-  SET (HAVE_DCGETTEXT 1)
-  SET (HAVE_GETTEXT 1)
-  SET (HAVE_GETTIMEOFDAY 1)
-  SET (HAVE_GUILE 1)
-  SET (HAVE_LIBM 1)
-  SET (HAVE_MEMCPY 1)
-  SET (STDC_HEADERS 1)
-  SET (_ALL_SOURCE 1)
-  SET (_GNU_SOURCE 1)
-  SET (_POSIX_PTHREAD_SEMANTICS 1)
-  SET (_TANDEM_SOURCE 1)
-  SET (__EXTENSIONS__ 1)
+SET (HAVE_BIND_TEXTDOMAIN_CODESET 1)
+SET (HAVE_DCGETTEXT 1)
+SET (HAVE_GETTEXT 1)
+SET (HAVE_GETTIMEOFDAY 1)
+SET (HAVE_GUILE 1)
+SET (HAVE_LIBM 1)
+SET (HAVE_MEMCPY 1)
+SET (STDC_HEADERS 1)
+SET (_ALL_SOURCE 1)
+SET (_GNU_SOURCE 1)
+SET (_POSIX_PTHREAD_SEMANTICS 1)
+SET (_TANDEM_SOURCE 1)
+SET (__EXTENSIONS__ 1)
 ENDIF (UNIX OR MINGW)
 
 IF (UNIX)
-  SET (HAVE_CHOWN 1)
-  SET (HAVE_DLERROR 1)
-  SET (HAVE_DLSYM 1)
-  SET (HAVE_GETHOSTID 1)
-  SET (HAVE_GETHOSTNAME 1)
-  SET (HAVE_GETPPID 1)
-  SET (HAVE_GETUID 1)
-  SET (HAVE_GMTIME_R 1)
-  SET (HAVE_LANGINFO_D_FMT 1)
-  SET (HAVE_LC_MESSAGES 1)
-  SET (HAVE_LIBPTHREAD 1)
-  SET (HAVE_LINK 1)
-  SET (HAVE_LOCALTIME_R 1)
-  SET (HAVE_PTHREAD_MUTEX_INIT 1)
-  SET (HAVE_PTHREAD_PRIO_INHERIT 1)
-  SET (HAVE_SCANF_LLD 1)
-  SET (HAVE_SETENV 1)
-  SET (HAVE_STPCPY 1)
-  SET (HAVE_STRFMON 1)
-  SET (HAVE_STRPTIME 1)
-  SET (HAVE_STRUCT_TM_GMTOFF 1)
-  SET (HAVE_TIMEGM 1)
-  SET (HAVE_TOWUPPER 1)
-  SET (GNC_PLATFORM_POSIX 1)
+SET (HAVE_CHOWN 1)
+SET (HAVE_DLERROR 1)
+SET (HAVE_DLSYM 1)
+SET (HAVE_GETHOSTID 1)
+SET (HAVE_GETHOSTNAME 1)
+SET (HAVE_GETPPID 1)
+SET (HAVE_GETUID 1)
+SET (HAVE_GMTIME_R 1)
+SET (HAVE_LANGINFO_D_FMT 1)
+SET (HAVE_LC_MESSAGES 1)
+SET (HAVE_LIBPTHREAD 1)
+SET (HAVE_LINK 1)
+SET (HAVE_LOCALTIME_R 1)
+SET (HAVE_PTHREAD_MUTEX_INIT 1)
+SET (HAVE_PTHREAD_PRIO_INHERIT 1)
+SET (HAVE_SCANF_LLD 1)
+SET (HAVE_SETENV 1)
+SET (HAVE_STPCPY 1)
+SET (HAVE_STRFMON 1)
+SET (HAVE_STRPTIME 1)
+SET (HAVE_STRUCT_TM_GMTOFF 1)
+SET (HAVE_TIMEGM 1)
+SET (HAVE_TOWUPPER 1)
+SET (GNC_PLATFORM_POSIX 1)
 ENDIF (UNIX)
 
 IF (WIN32)
-  SET (GNC_PLATFORM_WINDOWS 1)
+SET (GNC_PLATFORM_WINDOWS 1)
 ENDIF (WIN32)
 
 IF (APPLE)
 # FIXME: HANDLE gtk-mac-integration-gtk2
-  SET(GNC_PLATFORM_DARWIN 1)
-  SET(GNC_PLATFORM_OSX 1)
-  SET(PLATFORM_OSX 1)
-  SET(HAVE_OSX_KEYCHAIN 1)
+SET(GNC_PLATFORM_DARWIN 1)
+SET(GNC_PLATFORM_OSX 1)
+SET(PLATFORM_OSX 1)
+SET(HAVE_OSX_KEYCHAIN 1)
 ENDIF(APPLE)
 
 IF(GLIB2_VERSION VERSION_GREATER 2.46.0 OR GLIB2_VERSION VERSION_EQUAL 2.46.0)
-  SET(HAVE_GLIB_2_46 1)
+SET(HAVE_GLIB_2_46 1)
 ENDIF()
 
 IF(DISABLE_DEPRECATED_GNOME)
-  SET(GNOME_DISABLE_DEPRECATED 1)
+SET(GNOME_DISABLE_DEPRECATED 1)
 ENDIF(DISABLE_DEPRECATED_GNOME)
 
 IF(DISABLE_DEPRECATED_GTK)
-  SET(GTK_DISABLE_DEPRECATED 1)
-  SET(GDK_DISABLE_DEPRECATED 1)
-  SET(GDK_PIXMAP_DISABLE_DEPRECATED 1)
+SET(GTK_DISABLE_DEPRECATED 1)
+SET(GDK_DISABLE_DEPRECATED 1)
+SET(GDK_PIXMAP_DISABLE_DEPRECATED 1)
 ENDIF(DISABLE_DEPRECATED_GTK)
 
 IF(DISABLE_DEPRECATED_GLIB)
-  SET(G_DISABLE_DEPRECATED 1)
+SET(G_DISABLE_DEPRECATED 1)
 ENDIF(DISABLE_DEPRECATED_GLIB)
 
 ADD_DEFINITIONS (-DHAVE_CONFIG_H)
 
-SET (CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
-CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake.in ${CONFIG_H})
-
-IF (BUILDING_FROM_VCS)
-  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_BINARY_DIR}/src/swig-runtime.h)
-ELSE()
-  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_SOURCE_DIR}/src/swig-runtime.h)
-ENDIF()
-
+SET (CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/common/config.h)
+CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/common/config.h.cmake.in ${CONFIG_H})
 
 SET(SCHEME_INSTALLED_SOURCE_DIR ${CMAKE_INSTALL_PREFIX}/share/gnucash/scm)
 SET(SCHEME_INSTALLED_CACHE_DIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
@@ -694,7 +687,12 @@ ADD_SUBDIRECTORY (lib)
 ADD_SUBDIRECTORY (macros)
 ADD_SUBDIRECTORY (packaging)
 ADD_SUBDIRECTORY (po)
-ADD_SUBDIRECTORY (src)
+ADD_SUBDIRECTORY (common)
+ADD_SUBDIRECTORY (libgnucash)
+IF (WITH_GNUCASH)
+  ADD_SUBDIRECTORY (gnucash)
+ENDIF (WITH_GNUCASH)
+ADD_SUBDIRECTORY (bindings)
 ADD_SUBDIRECTORY (test-templates)
 ADD_SUBDIRECTORY (util)
 
@@ -709,26 +707,27 @@ ADD_SUBDIRECTORY(cmake)
 SET(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}")
 SET(DIST_FILE "${PACKAGE_PREFIX}.tar")
 
-SET(gnucash_DIST_local ${gnucash_DOCS} ChangeLog.2015 ChangeLog.2016
+SET(toplvl_DIST_local ${gnucash_DOCS} ChangeLog.2015 ChangeLog.2016
   CMakeLists.txt configure.ac Makefile.am make-gnucash-potfiles.in README)
 
 IF(BUILDING_FROM_VCS AND AUTOTOOLS_IN_DIST)
-  SET(gnucash_DIST_local ${gnucash_DIST_local} autogen.sh)
+  SET(toplvl_DIST_local ${toplvl_DIST_local} autogen.sh)
 ENDIF()
 
-SET_LOCAL_DIST(gnucash_DIST ${gnucash_DIST_local})
+SET_LOCAL_DIST(toplvl_DIST ${toplvl_DIST_local})
 
 # Each subdirectory is responsible for reporting its list of distribution files to its parent, up to here.
 #
 # Leaf directories use the SET_DIST_LIST() function to report their distribution files. See
-# the bottom of src/app-utils/test/CMakeLists.txt for an example.
+# the bottom of libgnucash/app-utils/test/CMakeLists.txt for an example.
 #
 # A non leaf directories uses the SET_LOCAL_DIST() function to specify its distribution files local that dir,
 # then uses a (SET ${foo_DIST} ${locals....} PARENT_SCOPE) command to report up. See the bottom of
-# src/app-utils/CMakeLists.txt for an example of this.
+# libgnucash/app-utils/CMakeLists.txt for an example of this.
 
-SET(ALL_DIST ${accounts_DIST} ${checks_DIST} ${cmake_DIST} ${doc_DIST} ${lib_DIST} ${macros_DIST} ${packaging_DIST}
-        ${po_DIST} ${src_DIST} ${gnucash_DIST} ${test_templates_DIST} ${util_DIST})
+SET(ALL_DIST ${accounts_DIST} ${bindings_DIST} ${checks_DIST} ${cmake_DIST} ${common_DIST}
+    ${doc_DIST} ${gnucash_DIST} ${lib_DIST} ${libgnucash_DIST} ${macros_DIST} ${packaging_DIST}
+    ${po_DIST} ${test_templates_DIST} ${toplvl_DIST} ${util_DIST})
 
 
 IF (BUILDING_FROM_VCS)
@@ -738,7 +737,7 @@ ELSE()
   IF(AUTOTOOLS_IN_DIST)
     # Include autotools generated file in the dist
     LIST(APPEND ALL_DIST compile config.guess config.sub configure depcomp install-sh missing
-            src/doc/design/mdate-sh src/doc/design/texinfo.tex)
+            libgnucash/doc/design/mdate-sh libgnucash/doc/design/texinfo.tex)
     IF (EXISTS ${CMAKE_SOURCE_DIR}/test-driver)  # test-driver only created for automake 1.12+.
       LIST(APPEND ALL_DIST test-driver)
     ENDIF()
@@ -757,14 +756,14 @@ ENDFOREACH()
 
 ADD_CUSTOM_COMMAND(OUTPUT ${DIST_FILE}.gz ${DIST_FILE}.bz2
         COMMAND ${CMAKE_COMMAND}
-           -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/src/cmake_modules
+           -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/common/cmake_modules
            -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
            -D GNUCASH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
            -D BUILD_SOURCE_DIR=${BUILD_SOURCE_DIR}
            -D BUILDING_FROM_VCS=${BUILDING_FROM_VCS}
            -D SHELL=${SHELL}
            -D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST}
-           -P ${CMAKE_SOURCE_DIR}/src/cmake_modules/MakeDist.cmake
+           -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDist.cmake
 
         DEPENDS
           ${ALL_DIST} ${DIST_GENERATED_FILES2} gnc-vcs-info iso-4217-c gnc-warnings-c build-config-scm gnucash-design-info ChangeLog
@@ -774,13 +773,13 @@ ADD_CUSTOM_TARGET(dist DEPENDS ${DIST_FILE}.gz ${DIST_FILE}.bz2)
 
 ADD_CUSTOM_TARGET(distcheck DEPENDS dist
         COMMAND ${CMAKE_COMMAND}
-            -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/src/cmake_modules
+            -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/common/cmake_modules
             -D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
             -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
             -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS}
             -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
             -D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST}
-            -P ${CMAKE_SOURCE_DIR}/src/cmake_modules/MakeDistCheck.cmake
+            -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake
         )
 
 
diff --git a/Makefile.am b/Makefile.am
index cd3e8f589b..5fa7dba7a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,9 @@
-
-SUBDIRS = . doc lib src packaging po accounts checks
+if GNUCASH_ENABLE_GUI
+  GNUCASH_SUBDIR = gnucash
+else
+  GNUCASH_SUBDIR =
+endif
+SUBDIRS = . doc lib common libgnucash bindings ${GNUCASH_SUBDIR} packaging po accounts checks
 
 GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
 GNC_ETAGS_FILE = @GNC_ETAGS_FILE@
@@ -125,9 +129,9 @@ DISTCLEANFILES = \
   make-gnucash-potfiles po/.intltool-merge-cache
 
 cscope.files:
-	find src lib -name '*.[ch]' > cscope.files
+	find bindings common libgnucash gnucash lib -name '*.[ch]' > cscope.files
 if GNUCASH_SEPARATE_BUILDDIR
-	find ${srcdir}/src ${srcdir}/lib -name '*.[ch]' >> cscope.files
+	find ${srcdir}/bindings ${srcdir}/common ${srcdir}/libgnucash ${srcdir}/gnucash ${srcdir}/lib -name '*.[ch]' >> cscope.files
 endif
 
 ${srcdir}/cscope.out: cscope.files
@@ -243,10 +247,10 @@ endif
 ASTYLE = /usr/bin/astyle
 .PHONY: indent
 indent:
-	$(ASTYLE) --indent=spaces=4 --brackets=break --suffix=none `find ${srcdir}/src -name '*.[hc]'`
+	$(ASTYLE) --indent=spaces=4 --brackets=break --suffix=none `find ${srcdir}/{bindings,common,libgnucash,gnucash} -name '*.[hc]'`
 # Use the following line if you've got astyle-1.24, but don't use
 # --pad=oper with astyle 1.22 as it will reformat e.g. "return +1;" in
 # a very ugly way.
-#	$(ASTYLE) --indent=spaces=4 --brackets=break --pad-oper -pad-header --suffix=none `find ${srcdir}/src -name '*.[hc]'`
+#	$(ASTYLE) --indent=spaces=4 --brackets=break --pad-oper -pad-header --suffix=none `find ${srcdir}/{bindings,common,libgnucash,gnucash} -name '*.[hc]'`
 	@echo "### GnuCash development hint: The above command might have re-indented much more files than what you intended. Please commit only those which you really want to have changed, and revert the changes in the others so that other devevelopers do not have unnecessary merge conflicts. Thanks! ###"
 
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
new file mode 100644
index 0000000000..f34b2da2b7
--- /dev/null
+++ b/bindings/CMakeLists.txt
@@ -0,0 +1,4 @@
+ADD_SUBDIRECTORY(python)
+
+SET_LOCAL_DIST(bindings_DIST_local CMakeLists.txt Makefile.am)
+SET(bindings_DIST ${bindings_DIST_local} ${python_bindings_DIST} PARENT_SCOPE)
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
new file mode 100644
index 0000000000..bfe93cb29b
--- /dev/null
+++ b/bindings/Makefile.am
@@ -0,0 +1,6 @@
+if WITH_PYTHON
+    PYTHON_DIR = python
+endif
+SUBDIRS = ${PYTHON_DIR}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/optional/python-bindings/CMakeLists.txt b/bindings/python/CMakeLists.txt
similarity index 59%
rename from src/optional/python-bindings/CMakeLists.txt
rename to bindings/python/CMakeLists.txt
index 8aed964dbd..294748f1d9 100644
--- a/src/optional/python-bindings/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -4,43 +4,43 @@ ADD_SUBDIRECTORY(tests)
 IF (BUILDING_FROM_VCS)
   SET(SWIG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnucash_core.i ${CMAKE_CURRENT_SOURCE_DIR}/timespec.i)
   SET(GNUCASH_CORE_C_INCLUDES
-    ${CMAKE_BINARY_DIR}/src/config.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofsession.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofbook.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofbackend.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qoflog.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofutil.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofid.h
-    ${CMAKE_SOURCE_DIR}/src/engine/guid.h
-    ${CMAKE_SOURCE_DIR}/src/gnc-module/gnc-module.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-engine.h
-    ${CMAKE_SOURCE_DIR}/src/engine/Transaction.h
-    ${CMAKE_SOURCE_DIR}/src/engine/Split.h
-    ${CMAKE_SOURCE_DIR}/src/engine/Account.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-commodity.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-lot.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-numeric.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncCustomer.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncEmployee.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncVendor.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncAddress.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncBillTerm.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncOwner.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncInvoice.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncJob.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncEntry.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncTaxTable.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncIDSearch.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-pricedb.h
-    ${CMAKE_SOURCE_DIR}/src/app-utils/gnc-prefs-utils.h
+    ${CONFIG_H}
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofsession.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofbook.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofbackend.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qoflog.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofutil.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofid.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/guid.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module/gnc-module.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-engine.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/Transaction.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/Split.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/Account.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-commodity.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-lot.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-numeric.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncCustomer.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncEmployee.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncVendor.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncAddress.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncBillTerm.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncOwner.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncInvoice.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncJob.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncEntry.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncTaxTable.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncIDSearch.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-pricedb.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/app-utils/gnc-prefs-utils.h
   )
 
   SET (SWIG_GNUCASH_CORE_C ${CMAKE_CURRENT_BINARY_DIR}/gnucash_core.c)
 
   GNC_ADD_SWIG_PYTHON_COMMAND (swig-gnucash-core ${SWIG_GNUCASH_CORE_C}
     ${SWIG_FILES}
-    ${CMAKE_SOURCE_DIR}/src/base-typemaps.i
-    ${CMAKE_SOURCE_DIR}/src/engine/engine-common.i
+    ${CMAKE_SOURCE_DIR}/common/base-typemaps.i
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/engine-common.i
     ${GNUCASH_CORE_C_INCLUDES}
   )
 ELSE()
@@ -50,14 +50,14 @@ ENDIF()
 IF(WITH_PYTHON)
 
   SET(gnucash_core_c_INCLUDE_DIRS
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_SOURCE_DIR}/src/engine
-    ${CMAKE_SOURCE_DIR}/src/gnome-utils
-    ${CMAKE_SOURCE_DIR}/src/app-utils
-    ${CMAKE_SOURCE_DIR}/src/gnc-module
-    ${CMAKE_SOURCE_DIR}/src/gnome
-    ${CMAKE_SOURCE_DIR}/src/core-utils
-    ${CMAKE_SOURCE_DIR}/src/gnc-module
+    ${CMAKE_SOURCE_DIR}/libgnucash
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine
+    ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
+    ${CMAKE_SOURCE_DIR}/libgnucash/app-utils
+    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
+    ${CMAKE_SOURCE_DIR}/gnucash/gnome
+    ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
+    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
     ${GLIB_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
   )
diff --git a/src/optional/python-bindings/Makefile.am b/bindings/python/Makefile.am
similarity index 51%
rename from src/optional/python-bindings/Makefile.am
rename to bindings/python/Makefile.am
index 6d0ac7d701..264c2cf502 100644
--- a/src/optional/python-bindings/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -17,14 +17,14 @@ _gnucash_core_c_la_SOURCES = \
 _gnucash_core_c_la_CPPFLAGS = \
   $(PYTHON_CPPFLAGS) \
   $(GLIB_CFLAGS) \
-  -I$(top_srcdir)/src  \
-  -I$(top_srcdir)/src/engine \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module
+  -I$(top_srcdir)/common  \
+  -I$(top_srcdir)/libgnucash/engine \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module
 
 # Suppress all warnings for now, but we really only need to -Wno-implicit
 AM_CFLAGS = -w
@@ -33,46 +33,46 @@ _gnucash_core_c_la_LDFLAGS = -avoid-version -module
 
 _gnucash_core_c_la_LIBADD = \
   ${GLIB_LIBS} \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la
 if BUILDING_FROM_VCS
 _gnucash_core_c_includes= \
 	${top_builddir}/config.h \
-	${top_srcdir}/src/engine/qofsession.h \
-	${top_srcdir}/src/engine/qofbook.h \
-	${top_srcdir}/src/engine/qofbackend.h \
-	${top_srcdir}/src/engine/qoflog.h \
-	${top_srcdir}/src/engine/qofutil.h \
-	${top_srcdir}/src/engine/qofid.h \
-	${top_srcdir}/src/engine/guid.h \
-	${top_srcdir}/src/gnc-module/gnc-module.h \
-	${top_srcdir}/src/engine/gnc-engine.h \
-	${top_srcdir}/src/engine/Transaction.h \
-	${top_srcdir}/src/engine/Split.h \
-	${top_srcdir}/src/engine/Account.h \
-	${top_srcdir}/src/engine/gnc-commodity.h \
-	${top_srcdir}/src/engine/gnc-lot.h \
-	${top_srcdir}/src/engine/gnc-numeric.h \
-	${top_srcdir}/src/engine/gncCustomer.h \
-	${top_srcdir}/src/engine/gncEmployee.h \
-	${top_srcdir}/src/engine/gncVendor.h \
-	${top_srcdir}/src/engine/gncAddress.h \
-	${top_srcdir}/src/engine/gncBillTerm.h \
-	${top_srcdir}/src/engine/gncOwner.h \
-	${top_srcdir}/src/engine/gncInvoice.h \
-	${top_srcdir}/src/engine/gncJob.h \
-	${top_srcdir}/src/engine/gncEntry.h \
-	${top_srcdir}/src/engine/gncTaxTable.h \
-	${top_srcdir}/src/engine/gncIDSearch.h \
-	${top_srcdir}/src/engine/gnc-pricedb.h \
-	${top_srcdir}/src/app-utils/gnc-prefs-utils.h
-
-
-gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes)
+	${top_srcdir}/libgnucash/engine/qofsession.h \
+	${top_srcdir}/libgnucash/engine/qofbook.h \
+	${top_srcdir}/libgnucash/engine/qofbackend.h \
+	${top_srcdir}/libgnucash/engine/qoflog.h \
+	${top_srcdir}/libgnucash/engine/qofutil.h \
+	${top_srcdir}/libgnucash/engine/qofid.h \
+	${top_srcdir}/libgnucash/engine/guid.h \
+	${top_srcdir}/libgnucash/gnc-module/gnc-module.h \
+	${top_srcdir}/libgnucash/engine/gnc-engine.h \
+	${top_srcdir}/libgnucash/engine/Transaction.h \
+	${top_srcdir}/libgnucash/engine/Split.h \
+	${top_srcdir}/libgnucash/engine/Account.h \
+	${top_srcdir}/libgnucash/engine/gnc-commodity.h \
+	${top_srcdir}/libgnucash/engine/gnc-lot.h \
+	${top_srcdir}/libgnucash/engine/gnc-numeric.h \
+	${top_srcdir}/libgnucash/engine/gncCustomer.h \
+	${top_srcdir}/libgnucash/engine/gncEmployee.h \
+	${top_srcdir}/libgnucash/engine/gncVendor.h \
+	${top_srcdir}/libgnucash/engine/gncAddress.h \
+	${top_srcdir}/libgnucash/engine/gncBillTerm.h \
+	${top_srcdir}/libgnucash/engine/gncOwner.h \
+	${top_srcdir}/libgnucash/engine/gncInvoice.h \
+	${top_srcdir}/libgnucash/engine/gncJob.h \
+	${top_srcdir}/libgnucash/engine/gncEntry.h \
+	${top_srcdir}/libgnucash/engine/gncTaxTable.h \
+	${top_srcdir}/libgnucash/engine/gncIDSearch.h \
+	${top_srcdir}/libgnucash/engine/gnc-pricedb.h \
+	${top_srcdir}/libgnucash/app-utils/gnc-prefs-utils.h
+
+
+gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/common/base-typemaps.i ${top_srcdir}/libgnucash/engine/engine-common.i $(_gnucash_core_c_includes)
 	$(SWIG) -python -Wall -Werror \
-	-I$(top_srcdir)/src -I$(top_srcdir)/src/engine \
-	-I$(top_srcdir)/src/app-utils -o $@ $<
+	-I$(top_srcdir)/common -I$(top_srcdir)/libgnucash/engine \
+	-I$(top_srcdir)/libgnucash/app-utils -o $@ $<
 
 gnucash_core_c.py: gnucash_core.c $(SWIG_FILES)
 endif
diff --git a/src/optional/python-bindings/__init__.py b/bindings/python/__init__.py
similarity index 100%
rename from src/optional/python-bindings/__init__.py
rename to bindings/python/__init__.py
diff --git a/src/optional/python-bindings/example_scripts/CMakeLists.txt b/bindings/python/example_scripts/CMakeLists.txt
similarity index 100%
rename from src/optional/python-bindings/example_scripts/CMakeLists.txt
rename to bindings/python/example_scripts/CMakeLists.txt
diff --git a/src/optional/python-bindings/example_scripts/Invoice.tex b/bindings/python/example_scripts/Invoice.tex
similarity index 100%
rename from src/optional/python-bindings/example_scripts/Invoice.tex
rename to bindings/python/example_scripts/Invoice.tex
diff --git a/src/optional/python-bindings/example_scripts/Invoice.tex.tmpl b/bindings/python/example_scripts/Invoice.tex.tmpl
similarity index 100%
rename from src/optional/python-bindings/example_scripts/Invoice.tex.tmpl
rename to bindings/python/example_scripts/Invoice.tex.tmpl
diff --git a/src/optional/python-bindings/example_scripts/Invoice_2.tex.tmpl b/bindings/python/example_scripts/Invoice_2.tex.tmpl
similarity index 100%
rename from src/optional/python-bindings/example_scripts/Invoice_2.tex.tmpl
rename to bindings/python/example_scripts/Invoice_2.tex.tmpl
diff --git a/src/optional/python-bindings/example_scripts/account_analysis.py b/bindings/python/example_scripts/account_analysis.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/account_analysis.py
rename to bindings/python/example_scripts/account_analysis.py
diff --git a/src/optional/python-bindings/example_scripts/change_tax_code.py b/bindings/python/example_scripts/change_tax_code.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/change_tax_code.py
rename to bindings/python/example_scripts/change_tax_code.py
diff --git a/src/optional/python-bindings/example_scripts/get_quotes.pl b/bindings/python/example_scripts/get_quotes.pl
similarity index 100%
rename from src/optional/python-bindings/example_scripts/get_quotes.pl
rename to bindings/python/example_scripts/get_quotes.pl
diff --git a/src/optional/python-bindings/example_scripts/gnc_convenience.py b/bindings/python/example_scripts/gnc_convenience.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/gnc_convenience.py
rename to bindings/python/example_scripts/gnc_convenience.py
diff --git a/src/optional/python-bindings/example_scripts/gncinvoice_jinja.py b/bindings/python/example_scripts/gncinvoice_jinja.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/gncinvoice_jinja.py
rename to bindings/python/example_scripts/gncinvoice_jinja.py
diff --git a/src/optional/python-bindings/example_scripts/gncinvoicefkt.py b/bindings/python/example_scripts/gncinvoicefkt.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/gncinvoicefkt.py
rename to bindings/python/example_scripts/gncinvoicefkt.py
diff --git a/src/optional/python-bindings/example_scripts/invoice_export_doxygen.txt b/bindings/python/example_scripts/invoice_export_doxygen.txt
similarity index 100%
rename from src/optional/python-bindings/example_scripts/invoice_export_doxygen.txt
rename to bindings/python/example_scripts/invoice_export_doxygen.txt
diff --git a/src/optional/python-bindings/example_scripts/latex_invoices.py b/bindings/python/example_scripts/latex_invoices.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/latex_invoices.py
rename to bindings/python/example_scripts/latex_invoices.py
diff --git a/src/optional/python-bindings/example_scripts/new_book_with_opening_balances.py b/bindings/python/example_scripts/new_book_with_opening_balances.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/new_book_with_opening_balances.py
rename to bindings/python/example_scripts/new_book_with_opening_balances.py
diff --git a/src/optional/python-bindings/example_scripts/priceDB_test.py b/bindings/python/example_scripts/priceDB_test.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/priceDB_test.py
rename to bindings/python/example_scripts/priceDB_test.py
diff --git a/src/optional/python-bindings/example_scripts/price_database_example.py b/bindings/python/example_scripts/price_database_example.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/price_database_example.py
rename to bindings/python/example_scripts/price_database_example.py
diff --git a/src/optional/python-bindings/example_scripts/quotes_historic.py b/bindings/python/example_scripts/quotes_historic.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/quotes_historic.py
rename to bindings/python/example_scripts/quotes_historic.py
diff --git a/src/optional/python-bindings/example_scripts/rest-api/README b/bindings/python/example_scripts/rest-api/README
similarity index 100%
rename from src/optional/python-bindings/example_scripts/rest-api/README
rename to bindings/python/example_scripts/rest-api/README
diff --git a/src/optional/python-bindings/example_scripts/rest-api/gnucash_rest.py b/bindings/python/example_scripts/rest-api/gnucash_rest.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/rest-api/gnucash_rest.py
rename to bindings/python/example_scripts/rest-api/gnucash_rest.py
diff --git a/src/optional/python-bindings/example_scripts/rest-api/gnucash_simple.py b/bindings/python/example_scripts/rest-api/gnucash_simple.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/rest-api/gnucash_simple.py
rename to bindings/python/example_scripts/rest-api/gnucash_simple.py
diff --git a/src/optional/python-bindings/example_scripts/simple_book.py b/bindings/python/example_scripts/simple_book.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/simple_book.py
rename to bindings/python/example_scripts/simple_book.py
diff --git a/src/optional/python-bindings/example_scripts/simple_business_create.py b/bindings/python/example_scripts/simple_business_create.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/simple_business_create.py
rename to bindings/python/example_scripts/simple_business_create.py
diff --git a/src/optional/python-bindings/example_scripts/simple_invoice_insert.py b/bindings/python/example_scripts/simple_invoice_insert.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/simple_invoice_insert.py
rename to bindings/python/example_scripts/simple_invoice_insert.py
diff --git a/src/optional/python-bindings/example_scripts/simple_session.py b/bindings/python/example_scripts/simple_session.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/simple_session.py
rename to bindings/python/example_scripts/simple_session.py
diff --git a/src/optional/python-bindings/example_scripts/simple_sqlite_create.py b/bindings/python/example_scripts/simple_sqlite_create.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/simple_sqlite_create.py
rename to bindings/python/example_scripts/simple_sqlite_create.py
diff --git a/src/optional/python-bindings/example_scripts/simple_test.py b/bindings/python/example_scripts/simple_test.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/simple_test.py
rename to bindings/python/example_scripts/simple_test.py
diff --git a/src/optional/python-bindings/example_scripts/str_methods.py b/bindings/python/example_scripts/str_methods.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/str_methods.py
rename to bindings/python/example_scripts/str_methods.py
diff --git a/src/optional/python-bindings/example_scripts/test_imbalance_transaction.py b/bindings/python/example_scripts/test_imbalance_transaction.py
similarity index 100%
rename from src/optional/python-bindings/example_scripts/test_imbalance_transaction.py
rename to bindings/python/example_scripts/test_imbalance_transaction.py
diff --git a/src/optional/python-bindings/function_class.py b/bindings/python/function_class.py
similarity index 100%
rename from src/optional/python-bindings/function_class.py
rename to bindings/python/function_class.py
diff --git a/src/optional/python-bindings/gnucash_business.py b/bindings/python/gnucash_business.py
similarity index 100%
rename from src/optional/python-bindings/gnucash_business.py
rename to bindings/python/gnucash_business.py
diff --git a/src/optional/python-bindings/gnucash_core.i b/bindings/python/gnucash_core.i
similarity index 97%
rename from src/optional/python-bindings/gnucash_core.i
rename to bindings/python/gnucash_core.i
index d636ce7f45..f0b3800f7d 100644
--- a/src/optional/python-bindings/gnucash_core.i
+++ b/bindings/python/gnucash_core.i
@@ -56,8 +56,8 @@
 #include "guid.h"
 #include "qofquery.h"
 #include "qofquerycore.h"
-#include "gnc-module/gnc-module.h"
-#include "engine/gnc-engine.h"
+#include "gnc-module.h"
+#include "gnc-engine.h"
 #include "Transaction.h"
 #include "Split.h"
 #include "Account.h"
@@ -79,8 +79,8 @@
 #include "gncEntry.h"
 #include "gncTaxTable.h"
 #include "gncIDSearch.h"
-#include "engine/gnc-pricedb.h"
-#include "app-utils/gnc-prefs-utils.h"
+#include "gnc-pricedb.h"
+#include "gnc-prefs-utils.h"
 #include "cap-gains.h"
 #include "Scrub3.h"
 %}
diff --git a/src/optional/python-bindings/gnucash_core.py b/bindings/python/gnucash_core.py
similarity index 100%
rename from src/optional/python-bindings/gnucash_core.py
rename to bindings/python/gnucash_core.py
diff --git a/src/optional/python-bindings/sqlite3test.c b/bindings/python/sqlite3test.c
similarity index 100%
rename from src/optional/python-bindings/sqlite3test.c
rename to bindings/python/sqlite3test.c
diff --git a/src/optional/python-bindings/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
similarity index 100%
rename from src/optional/python-bindings/tests/CMakeLists.txt
rename to bindings/python/tests/CMakeLists.txt
diff --git a/bindings/python/tests/Makefile.am b/bindings/python/tests/Makefile.am
new file mode 100644
index 0000000000..d8ac3eb6c5
--- /dev/null
+++ b/bindings/python/tests/Makefile.am
@@ -0,0 +1,53 @@
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/common/test-core
+  
+TESTS_ENVIRONMENT = \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  PYTHON=${PYTHON} \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/bindings/python \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/bindings/python/.libs \
+  PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/bindings/python/tests \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/common/test-core/ \
+  PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/common/test-core/ \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/common/test-core/.libs \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+  
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets below, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.  *sigh*
+
+runTests.py: runTests.py.in ${top_builddir}/config.status Makefile
+	rm -f $@.tmp
+	sed < $< > $@.tmp \
+	    -e 's#@-PYTHON-@#${PYTHON}#'
+	mv $@.tmp $@
+	chmod u+x $@
+
+CLEANFILES = runTests.py
+
+TESTS = runTests.py
+
+clean-local:
+	rm -f translog.*
+
+EXTRA_DIST = \
+  runTests.py.in \
+  test_account.py \
+  test_book.py \
+  test_split.py \
+  test_transaction.py \
+  test_business.py \
+  CMakeLists.txt
diff --git a/src/optional/python-bindings/tests/runTests.py.in b/bindings/python/tests/runTests.py.in
similarity index 100%
rename from src/optional/python-bindings/tests/runTests.py.in
rename to bindings/python/tests/runTests.py.in
diff --git a/src/optional/python-bindings/tests/test_account.py b/bindings/python/tests/test_account.py
similarity index 100%
rename from src/optional/python-bindings/tests/test_account.py
rename to bindings/python/tests/test_account.py
diff --git a/src/optional/python-bindings/tests/test_book.py b/bindings/python/tests/test_book.py
similarity index 100%
rename from src/optional/python-bindings/tests/test_book.py
rename to bindings/python/tests/test_book.py
diff --git a/src/optional/python-bindings/tests/test_business.py b/bindings/python/tests/test_business.py
similarity index 100%
rename from src/optional/python-bindings/tests/test_business.py
rename to bindings/python/tests/test_business.py
diff --git a/src/optional/python-bindings/tests/test_commodity.py b/bindings/python/tests/test_commodity.py
similarity index 100%
rename from src/optional/python-bindings/tests/test_commodity.py
rename to bindings/python/tests/test_commodity.py
diff --git a/src/optional/python-bindings/tests/test_split.py b/bindings/python/tests/test_split.py
similarity index 100%
rename from src/optional/python-bindings/tests/test_split.py
rename to bindings/python/tests/test_split.py
diff --git a/src/optional/python-bindings/tests/test_transaction.py b/bindings/python/tests/test_transaction.py
similarity index 100%
rename from src/optional/python-bindings/tests/test_transaction.py
rename to bindings/python/tests/test_transaction.py
diff --git a/src/optional/python-bindings/timespec.i b/bindings/python/timespec.i
similarity index 100%
rename from src/optional/python-bindings/timespec.i
rename to bindings/python/timespec.i
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
new file mode 100644
index 0000000000..84ca246c80
--- /dev/null
+++ b/common/CMakeLists.txt
@@ -0,0 +1,25 @@
+# CMakeLists.txt for common/
+
+# The subdirectories
+ADD_SUBDIRECTORY (cmake_modules)
+ADD_SUBDIRECTORY (debug)
+ADD_SUBDIRECTORY (test-core)
+
+SET(common_EXTRA_DIST
+        base-typemaps.i
+        config.h.cmake.in
+        gnc-test-env.pl
+        guile-mappings.h
+        platform.h
+	swig-utf8.patch)
+
+IF (BUILDING_FROM_VCS)
+  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_BINARY_DIR}/swig-runtime.h PARENT_SCOPE)
+ELSE()
+  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_SOURCE_DIR}/swig-runtime.h PARENT_SCOPE)
+ENDIF()
+
+
+SET_LOCAL_DIST(common_DIST_local CMakeLists.txt Makefile.am ${common_EXTRA_DIST})
+
+SET(common_DIST ${common_DIST_local} ${cmake_modules_DIST} ${debug_DIST} ${test_core_DIST} PARENT_SCOPE)
diff --git a/common/Makefile.am b/common/Makefile.am
new file mode 100644
index 0000000000..07c4e9eac9
--- /dev/null
+++ b/common/Makefile.am
@@ -0,0 +1,43 @@
+# These directories do not contain any gtk dependencies
+# Note the unusual ordering of some test directories. This is
+# because test-core depends on engine and the test directories
+# in turn depend on test-core.
+SUBDIRS = \
+  . \
+  debug
+# Note normally SUBDIRS should also include test-core. That directory
+# however depends on libgnucash/engine and hence is included in
+# libgnucash/Makefile.am for proper build oldering. This would not
+# be needed if our Makefiles were structured to be included one
+# in the other instead of for a recursive make invocation.
+
+noinst_HEADERS = \
+  swig-runtime.h
+
+if BUILDING_FROM_VCS
+swig-runtime.h:
+	$(SWIG) -guile -external-runtime $@
+endif
+MAINTAINERCLEANFILES = swig-runtime.h
+
+EXTRA_DIST = \
+  base-typemaps.i \
+  cmake_modules/MacroAppendForeach.cmake \
+  cmake_modules/GncAddSwigCommand.cmake \
+  cmake_modules/GncAddTest.cmake \
+  cmake_modules/MakeDist.cmake \
+  cmake_modules/COPYING-CMAKE-SCRIPTS.txt \
+  cmake_modules/MakeDistFiles.cmake \
+  cmake_modules/MacroAddSourceFileCompileFlags.cmake \
+  cmake_modules/MakeDistCheck.cmake \
+  cmake_modules/GncConfigure.cmake \
+  cmake_modules/GncAddSchemeTargets.cmake \
+  cmake_modules/GncAddGSchemaTargets.cmake \
+  cmake_modules/GncFindPkgConfig.cmake \
+  cmake_modules/CMakeLists.txt \
+  config.h.cmake.in \
+  gnc-test-env.pl \
+  guile-mappings.h \
+  platform.h \
+  swig-utf8.patch \
+  CMakeLists.txt
diff --git a/src/base-typemaps.i b/common/base-typemaps.i
similarity index 100%
rename from src/base-typemaps.i
rename to common/base-typemaps.i
diff --git a/src/cmake_modules/CMakeLists.txt b/common/cmake_modules/CMakeLists.txt
similarity index 100%
rename from src/cmake_modules/CMakeLists.txt
rename to common/cmake_modules/CMakeLists.txt
diff --git a/src/cmake_modules/COPYING-CMAKE-SCRIPTS.txt b/common/cmake_modules/COPYING-CMAKE-SCRIPTS.txt
similarity index 100%
rename from src/cmake_modules/COPYING-CMAKE-SCRIPTS.txt
rename to common/cmake_modules/COPYING-CMAKE-SCRIPTS.txt
diff --git a/src/cmake_modules/GncAddGSchemaTargets.cmake b/common/cmake_modules/GncAddGSchemaTargets.cmake
similarity index 100%
rename from src/cmake_modules/GncAddGSchemaTargets.cmake
rename to common/cmake_modules/GncAddGSchemaTargets.cmake
diff --git a/src/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
similarity index 98%
rename from src/cmake_modules/GncAddSchemeTargets.cmake
rename to common/cmake_modules/GncAddSchemeTargets.cmake
index f30b9c2092..2d2478d511 100644
--- a/src/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -90,7 +90,7 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR
     # Construct the guile source and compiled load paths
 
     SET(_GUILE_LOAD_PATH "${current_srcdir}"
-        "${current_bindir}" "${CMAKE_BINARY_DIR}/src/scm")  # to pick up generated build-config.scm
+        "${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm")  # to pick up generated build-config.scm
     SET(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
     FOREACH (load_item ${_GUILE_LOAD_DIRS})
       LIST(APPEND _GUILE_LOAD_PATH "${CMAKE_SOURCE_DIR}/${load_item}")
diff --git a/src/cmake_modules/GncAddSwigCommand.cmake b/common/cmake_modules/GncAddSwigCommand.cmake
similarity index 63%
rename from src/cmake_modules/GncAddSwigCommand.cmake
rename to common/cmake_modules/GncAddSwigCommand.cmake
index cffd61195f..440b6b9ae6 100644
--- a/src/cmake_modules/GncAddSwigCommand.cmake
+++ b/common/cmake_modules/GncAddSwigCommand.cmake
@@ -8,8 +8,8 @@ MACRO (GNC_ADD_SWIG_COMMAND _target _output _input)
 
 ADD_CUSTOM_COMMAND (
   OUTPUT ${_output}
-  DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN}
-COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src  -o ${_output} ${_input}
+  DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/common/base-typemaps.i ${ARGN}
+COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/libgnucash/engine -I${CMAKE_SOURCE_DIR}/common  -o ${_output} ${_input}
 )
 
 ADD_CUSTOM_TARGET(${_target} DEPENDS ${_output})
@@ -22,10 +22,10 @@ MACRO (GNC_ADD_SWIG_PYTHON_COMMAND _target _output _input)
   ADD_CUSTOM_COMMAND(OUTPUT ${_output}
 
     COMMAND ${SWIG_EXECUTABLE} -python -Wall -Werror ${SWIG_ARGS}
-       -I${CMAKE_SOURCE_DIR}/src
-       -I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src/app-utils
+       -I${CMAKE_SOURCE_DIR}/common
+       -I${CMAKE_SOURCE_DIR}/libgnucash/engine -I${CMAKE_SOURCE_DIR}/libgnucash/app-utils
        -o ${_output} ${_input}
-    DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN}
+    DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/common/base-typemaps.i ${ARGN}
   )
-  ADD_CUSTOM_TARGET(${_target} ALL DEPENDS ${_output} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${_input} ${ARGN})
+  ADD_CUSTOM_TARGET(${_target} ALL DEPENDS ${_output} ${CMAKE_SOURCE_DIR}/common/base-typemaps.i ${_input} ${ARGN})
 ENDMACRO()
diff --git a/src/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
similarity index 97%
rename from src/cmake_modules/GncAddTest.cmake
rename to common/cmake_modules/GncAddTest.cmake
index fc8771468c..e3df3af719 100644
--- a/src/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -132,7 +132,7 @@ FUNCTION(GNC_GTEST_CONFIGURE)
       UNSET(GTEST_SRC_DIR CACHE)
     ELSE()
       SET(GTEST_SRC "${GTEST_SRC_DIR}/src/gtest_main.cc" PARENT_SCOPE)
-      SET(GTEST_LIB "${CMAKE_BINARY_DIR}/src/test-core/libgtest.a" PARENT_SCOPE)
+      SET(GTEST_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgtest.a" PARENT_SCOPE)
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "GTEST not found. Please install it or set GTEST_ROOT or GMOCK_ROOT")
@@ -156,7 +156,7 @@ FUNCTION(GNC_GTEST_CONFIGURE)
   if (GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
     SET(GMOCK_FOUND YES PARENT_SCOPE)
     SET(GMOCK_SRC "${GMOCK_MAIN_SRC_DIR}/gmock-all.cc" PARENT_SCOPE)
-    SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/src/test-core/libgmock.a" PARENT_SCOPE)
+    SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgmock.a" PARENT_SCOPE)
   ELSE()
     MESSAGE(FATAL_ERROR "GMOCK not found. Please install it or set GMOCK_ROOT")
   ENDIF()
diff --git a/src/cmake_modules/GncConfigure.cmake b/common/cmake_modules/GncConfigure.cmake
similarity index 100%
rename from src/cmake_modules/GncConfigure.cmake
rename to common/cmake_modules/GncConfigure.cmake
diff --git a/src/cmake_modules/GncFindPkgConfig.cmake b/common/cmake_modules/GncFindPkgConfig.cmake
similarity index 100%
rename from src/cmake_modules/GncFindPkgConfig.cmake
rename to common/cmake_modules/GncFindPkgConfig.cmake
diff --git a/src/cmake_modules/MacroAddSourceFileCompileFlags.cmake b/common/cmake_modules/MacroAddSourceFileCompileFlags.cmake
similarity index 100%
rename from src/cmake_modules/MacroAddSourceFileCompileFlags.cmake
rename to common/cmake_modules/MacroAddSourceFileCompileFlags.cmake
diff --git a/src/cmake_modules/MacroAppendForeach.cmake b/common/cmake_modules/MacroAppendForeach.cmake
similarity index 100%
rename from src/cmake_modules/MacroAppendForeach.cmake
rename to common/cmake_modules/MacroAppendForeach.cmake
diff --git a/src/cmake_modules/MakeDist.cmake b/common/cmake_modules/MakeDist.cmake
similarity index 98%
rename from src/cmake_modules/MakeDist.cmake
rename to common/cmake_modules/MakeDist.cmake
index b31f946c8e..a83965bfff 100644
--- a/src/cmake_modules/MakeDist.cmake
+++ b/common/cmake_modules/MakeDist.cmake
@@ -153,7 +153,7 @@ FUNCTION(MAKE_DIST PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_F
                 FILE(COPY ${realpath} DESTINATION ${PACKAGE_PREFIX})
             ENDFOREACH(link)
 
-            FOREACH(link src/doc/design/mdate-sh src/doc/design/texinfo.tex)
+            FOREACH(link libgnucash/doc/design/mdate-sh libgnucash/doc/design/texinfo.tex)
                 GET_FILENAME_COMPONENT(dir ${link} DIRECTORY)
                 GET_FILENAME_COMPONENT(realpath ${PACKAGE_PREFIX}/${link} REALPATH)
                 FILE(REMOVE ${PACKAGE_PREFIX}/${link})
diff --git a/src/cmake_modules/MakeDistCheck.cmake b/common/cmake_modules/MakeDistCheck.cmake
similarity index 100%
rename from src/cmake_modules/MakeDistCheck.cmake
rename to common/cmake_modules/MakeDistCheck.cmake
diff --git a/common/cmake_modules/MakeDistFiles.cmake b/common/cmake_modules/MakeDistFiles.cmake
new file mode 100644
index 0000000000..1c6dc9bdea
--- /dev/null
+++ b/common/cmake_modules/MakeDistFiles.cmake
@@ -0,0 +1,110 @@
+
+IF (${CMAKE_VERSION} VERSION_LESS 3.3)
+    INCLUDE(CMakeParseArguments)
+ENDIF()
+
+
+FUNCTION(SET_LOCAL_DIST output)
+    SET(dist_files "")
+    FOREACH(file ${ARGN})
+        FILE(RELATIVE_PATH relative ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+        LIST(APPEND dist_files ${relative})
+    ENDFOREACH()
+    SET (${output} ${dist_files} PARENT_SCOPE)
+ENDFUNCTION()
+
+MACRO(SET_DIST_LIST output)
+    SET_LOCAL_DIST(${output}_TMP ${ARGN})
+    SET(${output} ${${output}_TMP} PARENT_SCOPE)
+ENDMACRO()
+
+FUNCTION(EXECUTE_PROCESS_AND_CHECK_RESULT)
+    cmake_parse_arguments(VARS "" "WORKING_DIRECTORY;ERROR_MSG" "COMMAND" ${ARGN})
+    EXECUTE_PROCESS(
+            COMMAND ${VARS_COMMAND}
+            WORKING_DIRECTORY ${VARS_WORKING_DIRECTORY}
+            RESULT_VARIABLE RESULT
+    )
+    IF (NOT "${RESULT}" STREQUAL "0")
+        MESSAGE(FATAL_ERROR ${VARS_ERROR_MSG})
+    ENDIF()
+ENDFUNCTION()
+
+
+# This is a list of files generated at build time that
+# should be copied into the dist tarball. An item in
+# this list should be a file, not a directory or glob.
+# File in this list become dependenices of the 'dist'
+# target.
+
+
+SET(COPY_FROM_BUILD
+  ChangeLog
+  libgnucash/app-utils/migratable-prefs.xml
+  libgnucash/app-utils/swig-app-utils-guile.c
+  libgnucash/app-utils/swig-app-utils-python.c
+  libgnucash/app-utils/test/test-load-module
+  libgnucash/backend/xml/test/test-real-data.sh
+  gnucash/bin/gnucash.rc
+  gnucash/bin/overrides/gnucash-make-guids
+  gnucash/bin/test/test-version
+  libgnucash/core-utils/gnc-vcs-info.h
+  libgnucash/core-utils/swig-core-utils-guile.c
+  libgnucash/core-utils/swig-core-utils-python.c
+  libgnucash/doc/design/gnucash-design.info
+  libgnucash/engine/iso-4217-currencies.c
+  libgnucash/engine/swig-engine.c
+  libgnucash/engine/test/test-create-account
+  libgnucash/engine/test/test-scm-query-import
+  libgnucash/gnc-module/swig-gnc-module.c
+  libgnucash/gnc-module/test/mod-bar/swig-bar.c
+  libgnucash/gnc-module/test/mod-baz/swig-baz.c
+  libgnucash/gnc-module/test/mod-foo/swig-foo.c
+  libgnucash/gnc-module/test/test-gwrapped-c
+  libgnucash/gnc-module/test/test-load-deps
+  libgnucash/gnc-module/test/test-load-scm
+  libgnucash/gnc-module/test/test-scm-dynload
+  libgnucash/gnc-module/test/test-scm-init
+  libgnucash/gnc-module/test/test-scm-module
+  libgnucash/gnc-module/test/test-scm-multi
+  gnucash/gnome/gnucash.desktop.in
+  gnucash/gnome/swig-gnome.c
+  gnucash/gnome-utils/gnc-warnings.c
+  gnucash/gnome-utils/swig-gnome-utils.c
+  gnucash/gnome-utils/test/test-load-module
+  gnucash/html/swig-gnc-html.c
+  bindings/python/gnucash_core.c
+  gnucash/report/report-gnome/swig-report-gnome.c
+  gnucash/report/report-gnome/test/test-load-module
+  gnucash/report/report-system/swig-report-system.c
+  gnucash/report/report-system/test/test-load-module
+  gnucash/report/stylesheets/test/test-load-module
+  libgnucash/scm/build-config.scm
+  common/swig-runtime.h
+  common/test-core/swig-unittest-support-guile.c
+  common/test-core/swig-unittest-support-python.c
+)
+
+# This list is similiar to the COPY_FROM_BUILD list
+# above, except that we don't create an explicit
+# dependency on this for the 'dist' target. I need
+# to fix the creation of these files so that we
+# can add the as dependencies for 'dist'. These
+# file are not generated using CONFIGURE_FILE(),
+# so CMake does not realize these are generated files.
+
+# Items marked with GNC_CONFIGURE can be
+# properly generated when we drop autotools, because
+# then the source file can use the @XXX@ convention
+# instead of @-XXX-@
+
+SET(COPY_FROM_BUILD_2
+        doc/gnucash.1  # Uses GNC_CONFIGURE
+        packaging/gnucash.spec # Uses GNC_CONFIGURE
+        po/gnucash.pot
+        libgnucash/doc/design/stamp-vti
+        libgnucash/doc/design/version.texi
+        bindings/python/gnucash_core_c.py
+        common/test-core/unittest_support.py
+
+        )
diff --git a/src/config.h.cmake.in b/common/config.h.cmake.in
similarity index 100%
rename from src/config.h.cmake.in
rename to common/config.h.cmake.in
diff --git a/src/debug/CMakeLists.txt b/common/debug/CMakeLists.txt
similarity index 100%
rename from src/debug/CMakeLists.txt
rename to common/debug/CMakeLists.txt
diff --git a/src/debug/Makefile.am b/common/debug/Makefile.am
similarity index 100%
rename from src/debug/Makefile.am
rename to common/debug/Makefile.am
diff --git a/src/debug/splint-defs.h b/common/debug/splint-defs.h
similarity index 100%
rename from src/debug/splint-defs.h
rename to common/debug/splint-defs.h
diff --git a/src/debug/valgrind/CMakeLists.txt b/common/debug/valgrind/CMakeLists.txt
similarity index 100%
rename from src/debug/valgrind/CMakeLists.txt
rename to common/debug/valgrind/CMakeLists.txt
diff --git a/src/debug/valgrind/Makefile.am b/common/debug/valgrind/Makefile.am
similarity index 100%
rename from src/debug/valgrind/Makefile.am
rename to common/debug/valgrind/Makefile.am
diff --git a/src/debug/valgrind/valgrind-gdk.supp b/common/debug/valgrind/valgrind-gdk.supp
similarity index 100%
rename from src/debug/valgrind/valgrind-gdk.supp
rename to common/debug/valgrind/valgrind-gdk.supp
diff --git a/src/debug/valgrind/valgrind-glib.supp b/common/debug/valgrind/valgrind-glib.supp
similarity index 100%
rename from src/debug/valgrind/valgrind-glib.supp
rename to common/debug/valgrind/valgrind-glib.supp
diff --git a/src/debug/valgrind/valgrind-gnucash.supp b/common/debug/valgrind/valgrind-gnucash.supp
similarity index 100%
rename from src/debug/valgrind/valgrind-gnucash.supp
rename to common/debug/valgrind/valgrind-gnucash.supp
diff --git a/src/debug/valgrind/valgrind-libfontconfig.supp b/common/debug/valgrind/valgrind-libfontconfig.supp
similarity index 100%
rename from src/debug/valgrind/valgrind-libfontconfig.supp
rename to common/debug/valgrind/valgrind-libfontconfig.supp
diff --git a/src/debug/valgrind/valgrind-libgda.supp b/common/debug/valgrind/valgrind-libgda.supp
similarity index 100%
rename from src/debug/valgrind/valgrind-libgda.supp
rename to common/debug/valgrind/valgrind-libgda.supp
diff --git a/src/debug/valgrind/valgrind-libguile.supp b/common/debug/valgrind/valgrind-libguile.supp
similarity index 100%
rename from src/debug/valgrind/valgrind-libguile.supp
rename to common/debug/valgrind/valgrind-libguile.supp
diff --git a/src/debug/valgrind/valgrind-x11.supp b/common/debug/valgrind/valgrind-x11.supp
similarity index 100%
rename from src/debug/valgrind/valgrind-x11.supp
rename to common/debug/valgrind/valgrind-x11.supp
diff --git a/src/gnc-test-env.pl b/common/gnc-test-env.pl
similarity index 100%
rename from src/gnc-test-env.pl
rename to common/gnc-test-env.pl
diff --git a/src/guile-mappings.h b/common/guile-mappings.h
similarity index 100%
rename from src/guile-mappings.h
rename to common/guile-mappings.h
diff --git a/src/platform.h b/common/platform.h
similarity index 100%
rename from src/platform.h
rename to common/platform.h
diff --git a/src/swig-utf8.patch b/common/swig-utf8.patch
similarity index 100%
rename from src/swig-utf8.patch
rename to common/swig-utf8.patch
diff --git a/src/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
similarity index 89%
rename from src/test-core/CMakeLists.txt
rename to common/test-core/CMakeLists.txt
index 1cb2ca376e..70ccecee88 100644
--- a/src/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -9,10 +9,10 @@ SET(test_core_noinst_HEADERS
 )
 
 INCLUDE_DIRECTORIES(
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/common/test-core
 
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
@@ -54,7 +54,7 @@ SET(test_core_SCHEME unittest-support.scm)
 SET(GUILE_OUTPUT_DIR   gnucash)
 SET(GUILE_MODULES      "")
 SET(GUILE_LOAD_DIRS    "")
-SET(GUILE_LIBRARY_DIRS src/test-core src/engine)
+SET(GUILE_LIBRARY_DIRS common/test-core libgnucash/engine)
 SET(GUILE_DEPENDS      test-core-guile)
 
 
@@ -78,4 +78,4 @@ ADD_LIBRARY(gmock STATIC  ${lib_gmock_SOURCES})
 TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC
   ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}
   ${GMOCK_INCLUDE_DIR} ${GMOCK_SRC_DIR})
-INSTALL(FILES unittest-support.h DESTINATION libexec/gnucash/src/engine/test)
+INSTALL(FILES unittest-support.h DESTINATION libexec/gnucash/libgnucash/engine/test)
diff --git a/src/test-core/Makefile.am b/common/test-core/Makefile.am
similarity index 86%
rename from src/test-core/Makefile.am
rename to common/test-core/Makefile.am
index 5a59b8ed85..8b57f25a34 100644
--- a/src/test-core/Makefile.am
+++ b/common/test-core/Makefile.am
@@ -8,7 +8,7 @@ libtest_core_la_SOURCES = \
 	unittest-support.c
 
 libtest_core_la_LIBADD = \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS = \
@@ -16,29 +16,29 @@ noinst_HEADERS = \
 	unittest-support.h
 
 libtest_core_la_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/engine \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/engine \
   ${GLIB_CFLAGS}
 
 libtest_core_la_LDFLAGS = \
   -rpath ${exec-prefix}/lib
 
 if BUILDING_FROM_VCS
-swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
+swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src \
+	-I${top_srcdir}/common \
 	${AM_CPPFLAGS} -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
 
-swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
+swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i
 	$(SWIG) -python  -Wall -Werror $(SWIG_ARGS) \
-	-I${top_srcdir}/src \
+	-I${top_srcdir}/common \
 	${AM_CPPFLAGS} -o $@ $<
 
 unittest-support.py: swig-unittest-support-python.c ${SWIG_FILES}
@@ -112,13 +112,13 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --library-dir    ${top_builddir}/src/test-core \
-  --library-dir    ${top_builddir}/src/engine
+  --library-dir    ${top_builddir}/common/test-core \
+  --library-dir    ${top_builddir}/libgnucash/engine
 
 %.go : %.scm .scm-links $(noinst_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
diff --git a/src/test-core/test-stuff.c b/common/test-core/test-stuff.c
similarity index 100%
rename from src/test-core/test-stuff.c
rename to common/test-core/test-stuff.c
diff --git a/src/test-core/test-stuff.h b/common/test-core/test-stuff.h
similarity index 100%
rename from src/test-core/test-stuff.h
rename to common/test-core/test-stuff.h
diff --git a/src/test-core/unittest-support.c b/common/test-core/unittest-support.c
similarity index 100%
rename from src/test-core/unittest-support.c
rename to common/test-core/unittest-support.c
diff --git a/src/test-core/unittest-support.h b/common/test-core/unittest-support.h
similarity index 100%
rename from src/test-core/unittest-support.h
rename to common/test-core/unittest-support.h
diff --git a/src/test-core/unittest-support.i b/common/test-core/unittest-support.i
similarity index 100%
rename from src/test-core/unittest-support.i
rename to common/test-core/unittest-support.i
diff --git a/src/test-core/unittest-support.scm b/common/test-core/unittest-support.scm
similarity index 100%
rename from src/test-core/unittest-support.scm
rename to common/test-core/unittest-support.scm
diff --git a/common/test-core/unittest_support.py b/common/test-core/unittest_support.py
new file mode 100644
index 0000000000..cdf7ecf439
--- /dev/null
+++ b/common/test-core/unittest_support.py
@@ -0,0 +1,166 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 3.0.10
+#
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
+
+
+
+
+
+from sys import version_info as _swig_python_version_info
+if _swig_python_version_info >= (2, 7, 0):
+    def swig_import_helper():
+        import importlib
+        pkg = __name__.rpartition('.')[0]
+        mname = '.'.join((pkg, '_unittest_support')).lstrip('.')
+        try:
+            return importlib.import_module(mname)
+        except ImportError:
+            return importlib.import_module('_unittest_support')
+    _unittest_support = swig_import_helper()
+    del swig_import_helper
+elif _swig_python_version_info >= (2, 6, 0):
+    def swig_import_helper():
+        from os.path import dirname
+        import imp
+        fp = None
+        try:
+            fp, pathname, description = imp.find_module('_unittest_support', [dirname(__file__)])
+        except ImportError:
+            import _unittest_support
+            return _unittest_support
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_unittest_support', fp, pathname, description)
+            finally:
+                fp.close()
+            return _mod
+    _unittest_support = swig_import_helper()
+    del swig_import_helper
+else:
+    import _unittest_support
+del _swig_python_version_info
+try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
+    import builtins as __builtin__
+except ImportError:
+    import __builtin__
+
+def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
+    if (name == "thisown"):
+        return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'SwigPyObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name, None)
+    if method:
+        return method(self, value)
+    if (not static):
+        if _newclass:
+            object.__setattr__(self, name, value)
+        else:
+            self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+
+def _swig_setattr(self, class_type, name, value):
+    return _swig_setattr_nondynamic(self, class_type, name, value, 0)
+
+
+def _swig_getattr(self, class_type, name):
+    if (name == "thisown"):
+        return self.this.own()
+    method = class_type.__swig_getmethods__.get(name, None)
+    if method:
+        return method(self)
+    raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
+
+
+def _swig_repr(self):
+    try:
+        strthis = "proxy of " + self.this.__repr__()
+    except __builtin__.Exception:
+        strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+try:
+    _object = object
+    _newclass = 1
+except __builtin__.Exception:
+    class _object:
+        pass
+    _newclass = 0
+
+class TestErrorStruct(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TestErrorStruct, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, TestErrorStruct, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["log_level"] = _unittest_support.TestErrorStruct_log_level_set
+    __swig_getmethods__["log_level"] = _unittest_support.TestErrorStruct_log_level_get
+    if _newclass:
+        log_level = _swig_property(_unittest_support.TestErrorStruct_log_level_get, _unittest_support.TestErrorStruct_log_level_set)
+    __swig_setmethods__["log_domain"] = _unittest_support.TestErrorStruct_log_domain_set
+    __swig_getmethods__["log_domain"] = _unittest_support.TestErrorStruct_log_domain_get
+    if _newclass:
+        log_domain = _swig_property(_unittest_support.TestErrorStruct_log_domain_get, _unittest_support.TestErrorStruct_log_domain_set)
+    __swig_setmethods__["msg"] = _unittest_support.TestErrorStruct_msg_set
+    __swig_getmethods__["msg"] = _unittest_support.TestErrorStruct_msg_get
+    if _newclass:
+        msg = _swig_property(_unittest_support.TestErrorStruct_msg_get, _unittest_support.TestErrorStruct_msg_set)
+
+    def __init__(self):
+        this = _unittest_support.new_TestErrorStruct()
+        try:
+            self.this.append(this)
+        except __builtin__.Exception:
+            self.this = this
+    __swig_destroy__ = _unittest_support.delete_TestErrorStruct
+    __del__ = lambda self: None
+TestErrorStruct_swigregister = _unittest_support.TestErrorStruct_swigregister
+TestErrorStruct_swigregister(TestErrorStruct)
+
+G_LOG_FLAG_RECURSION = _unittest_support.G_LOG_FLAG_RECURSION
+G_LOG_FLAG_FATAL = _unittest_support.G_LOG_FLAG_FATAL
+G_LOG_LEVEL_ERROR = _unittest_support.G_LOG_LEVEL_ERROR
+G_LOG_LEVEL_CRITICAL = _unittest_support.G_LOG_LEVEL_CRITICAL
+G_LOG_LEVEL_WARNING = _unittest_support.G_LOG_LEVEL_WARNING
+G_LOG_LEVEL_MESSAGE = _unittest_support.G_LOG_LEVEL_MESSAGE
+G_LOG_LEVEL_INFO = _unittest_support.G_LOG_LEVEL_INFO
+G_LOG_LEVEL_DEBUG = _unittest_support.G_LOG_LEVEL_DEBUG
+G_LOG_LEVEL_MASK = _unittest_support.G_LOG_LEVEL_MASK
+
+def test_add_error(error):
+    return _unittest_support.test_add_error(error)
+test_add_error = _unittest_support.test_add_error
+
+def test_clear_error_list():
+    return _unittest_support.test_clear_error_list()
+test_clear_error_list = _unittest_support.test_clear_error_list
+
+def test_set_checked_handler(domain, level, data):
+    return _unittest_support.test_set_checked_handler(domain, level, data)
+test_set_checked_handler = _unittest_support.test_set_checked_handler
+
+def test_set_list_handler(domain, level, data):
+    return _unittest_support.test_set_list_handler(domain, level, data)
+test_set_list_handler = _unittest_support.test_set_list_handler
+
+def test_set_null_handler(domain, level, data):
+    return _unittest_support.test_set_null_handler(domain, level, data)
+test_set_null_handler = _unittest_support.test_set_null_handler
+
+def g_log_remove_handler(log_domain, handler):
+    return _unittest_support.g_log_remove_handler(log_domain, handler)
+g_log_remove_handler = _unittest_support.g_log_remove_handler
+# This file is compatible with both classic and new-style classes.
+
+
diff --git a/configure.ac b/configure.ac
index 2e4354a112..500c845ac6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.60)
 AC_INIT([GnuCash], [2.6.99], [gnucash-devel@gnucash.org])
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_SRCDIR(src/engine/Transaction.h)
+AC_CONFIG_SRCDIR(libgnucash/engine/Transaction.h)
 AC_CONFIG_MACRO_DIR([macros])
 
 #Change this in development versions when changing anything that
@@ -31,7 +31,7 @@ GNUCASH_NANO_VERSION=0
 #This should be the earliest version in the form XXMMUUNN (XX=MAJOR,
 #MM=MINOR, UU=MICRO, NN=NANO) or SVN revision if before 2.4.1 which is
 #storage-compatible with the current version. See the comments in
-#src/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load.
+#libgnucash/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load.
 GNUCASH_RESAVE_VERSION=19920
 # Initialize automake -- make sure we have at least version 1.9 Note:
 # Automake 1.14 & 1.15 issue a ton of warnings about subdir-objects, which
@@ -42,7 +42,7 @@ GNUCASH_RESAVE_VERSION=19920
 # http://lists.gnu.org/archive/html/automake/2014-04/msg00002.html and
 # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 for details.
 # In the meantime the best option is to use Automake 1.13 or earlier.
-AM_INIT_AUTOMAKE([1.9 dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2])
 
 # Parse out the version number
 GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION
@@ -276,7 +276,7 @@ else
   VCS_TYPE=
 
   # Make sure we've got swig-runtime.h and gnc-vcs-info.h
-  AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
+  AC_CHECK_FILE(${srcdir}/common/swig-runtime.h, [],
     [AC_MSG_ERROR([
 
 It looks like you are NOT building from Subversion, svk, git or bzr
@@ -286,7 +286,7 @@ Either that or contact gnucash-devel@gnucash.org because
 the tarball you downloaded is broken.
 
     ])])
-  AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-vcs-info.h, [],
+  AC_CHECK_FILE(${srcdir}/libgnucash/core-utils/gnc-vcs-info.h, [],
     [AC_MSG_ERROR([
 
 It looks like you are NOT building from Subversion, svk, git or bzr
@@ -941,7 +941,7 @@ if test "x$ac_cv_have_gtest_libs" = xyes; then
 else
 dnl Google test requires pthreads and this seems the easiest way to check.
     AX_PTHREAD([
-    ac_cv_gtest_libs="\$(top_builddir)/src/test-core/libgtest.a $PTHREAD_CFLAGS"
+    ac_cv_gtest_libs="\$(top_builddir)/common/test-core/libgtest.a $PTHREAD_CFLAGS"
     ],[
     AC_MSG_ERROR(
       [GTest requires pthreads, but this wasn't found.])
@@ -1000,7 +1000,7 @@ fi
 MIGRATABLE_PREFS_OFX="/dev/null"
 if test x${have_ofx} = xyes ; then
   _COMPONENTS="$_COMPONENTS ofx"
-  MIGRATABLE_PREFS_OFX="$srcdir/src/import-export/ofx/migratable-prefs-ofx.xml"
+  MIGRATABLE_PREFS_OFX="$srcdir/gnucash/import-export/ofx/migratable-prefs-ofx.xml"
 fi
 
 ofx_has_bug_39=no
@@ -1087,7 +1087,7 @@ then
   AC_SUBST(AQBANKING_LIBS)
   AC_SUBST(AQBANKING_CFLAGS)
   _COMPONENTS="$_COMPONENTS aqbanking"
-  MIGRATABLE_PREFS_AQBANKING="$srcdir/src/import-export/aqb/migratable-prefs-aqbanking.xml"
+  MIGRATABLE_PREFS_AQBANKING="$srcdir/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml"
 fi
 AM_CONDITIONAL([WITH_AQBANKING], [test x${want_aqbanking} = xyes])
 AC_SUBST_FILE([MIGRATABLE_PREFS_AQBANKING])
@@ -1587,7 +1587,7 @@ AC_MSG_RESULT($warnFLAGS)
 ### makefiles, so that we don't have an opportunity to adjust them
 ### there.
 
-chmod u+x ${srcdir}/src/bin/generate-gnc-script
+chmod u+x ${srcdir}/gnucash/bin/generate-gnc-script
 
 ### --------------------------------------------------------------------------
 ### Makefile creation
@@ -1637,188 +1637,188 @@ AC_CONFIG_FILES(
   accounts/zh_CN/Makefile
   accounts/zh_HK/Makefile
   accounts/zh_TW/Makefile
+  bindings/Makefile
+  bindings/python/Makefile
+  bindings/python/tests/Makefile
   checks/Makefile
+  common/Makefile
+  common/debug/Makefile
+  common/debug/valgrind/Makefile
+  common/test-core/Makefile
   doc/Makefile
   doc/examples/Makefile
+  gnucash/Makefile
+  gnucash/bin/Makefile
+  gnucash/bin/overrides/Makefile
+  gnucash/bin/test/Makefile
+  gnucash/gnome/Makefile
+  gnucash/gnome/gtkbuilder/Makefile
+  gnucash/gnome/gschemas/Makefile
+  gnucash/gnome/ui/Makefile
+  gnucash/gnome-utils/Makefile
+  gnucash/gnome-utils/gtkbuilder/Makefile
+  gnucash/gnome-utils/gschemas/Makefile
+  gnucash/gnome-utils/test/Makefile
+  gnucash/gnome-utils/ui/Makefile
+  gnucash/gnome-search/Makefile
+  gnucash/html/Makefile
+  gnucash/import-export/Makefile
+  gnucash/import-export/test/Makefile
+  gnucash/import-export/ofx/gschemas/Makefile
+  gnucash/import-export/qif-imp/Makefile
+  gnucash/import-export/qif/Makefile
+  gnucash/import-export/qif/test/Makefile
+  gnucash/import-export/qif-imp/gschemas/Makefile
+  gnucash/import-export/qif-imp/test/Makefile
+  gnucash/import-export/gschemas/Makefile
+  gnucash/import-export/ofx/Makefile
+  gnucash/import-export/ofx/test/Makefile
+  gnucash/import-export/csv-imp/Makefile
+  gnucash/import-export/csv-imp/gschemas/Makefile
+  gnucash/import-export/csv-imp/test/Makefile
+  gnucash/import-export/csv-exp/Makefile
+  gnucash/import-export/csv-exp/gschemas/Makefile
+  gnucash/import-export/log-replay/Makefile
+  gnucash/import-export/aqb/Makefile
+  gnucash/import-export/aqb/gschemas/Makefile
+  gnucash/import-export/aqb/test/Makefile
+  gnucash/plugins/Makefile
+  gnucash/plugins/bi_import/Makefile
+  gnucash/plugins/bi_import/gtkbuilder/Makefile
+  gnucash/plugins/bi_import/ui/Makefile
+  gnucash/plugins/customer_import/Makefile
+  gnucash/plugins/customer_import/gtkbuilder/Makefile
+  gnucash/plugins/customer_import/ui/Makefile
+  gnucash/python/Makefile
+  gnucash/python/pycons/Makefile
+  gnucash/register/Makefile
+  gnucash/register/ledger-core/Makefile
+  gnucash/register/ledger-core/test/Makefile
+  gnucash/register/register-core/Makefile
+  gnucash/register/register-core/test/Makefile
+  gnucash/register/register-gnome/Makefile
+  gnucash/register/register-gnome/test/Makefile
+  gnucash/report/Makefile
+  gnucash/report/report-gnome/Makefile
+  gnucash/report/report-gnome/test/Makefile
+  gnucash/report/report-system/Makefile
+  gnucash/report/report-system/test/Makefile
+  gnucash/report/standard-reports/Makefile
+  gnucash/report/standard-reports/test/Makefile
+  gnucash/report/business-reports/Makefile
+  gnucash/report/locale-specific/Makefile
+  gnucash/report/locale-specific/us/Makefile
+  gnucash/report/locale-specific/us/test/Makefile
+  gnucash/report/stylesheets/Makefile
+  gnucash/report/stylesheets/test/Makefile
+  gnucash/report/utility-reports/Makefile
+  gnucash/report/jqplot/Makefile
   lib/Makefile
   lib/goffice/Makefile
   lib/libc/Makefile
+  libgnucash/Makefile
+  libgnucash/app-utils/Makefile
+  libgnucash/app-utils/test/Makefile
+  libgnucash/backend/Makefile
+  libgnucash/backend/dbi/Makefile
+  libgnucash/backend/dbi/test/Makefile
+  libgnucash/backend/xml/Makefile
+  libgnucash/backend/xml/test/Makefile
+  libgnucash/backend/xml/test/test-files/Makefile
+  libgnucash/backend/xml/test/test-files/xml2/Makefile
+  libgnucash/backend/sql/Makefile
+  libgnucash/backend/sql/test/Makefile
+  libgnucash/core-utils/Makefile
+  libgnucash/core-utils/test/Makefile
+  libgnucash/doc/Makefile
+  libgnucash/doc/design/Makefile
+  libgnucash/doc/xml/Makefile
+  libgnucash/engine/Makefile
+  libgnucash/engine/test/Makefile
+  libgnucash/engine/test-core/Makefile
+  libgnucash/gnc-module/Makefile
+  libgnucash/gnc-module/test/Makefile
+  libgnucash/gnc-module/test/mod-foo/Makefile
+  libgnucash/gnc-module/test/mod-bar/Makefile
+  libgnucash/gnc-module/test/mod-baz/Makefile
+  libgnucash/gnc-module/test/misc-mods/Makefile
+  libgnucash/pixmaps/Makefile
+  libgnucash/quotes/Makefile
+  libgnucash/scm/Makefile
+  libgnucash/scm/gnumeric/Makefile
+  libgnucash/tax/Makefile
+  libgnucash/tax/us/Makefile
+  libgnucash/tax/us/test/Makefile
   packaging/Makefile
-  src/Makefile
-  src/app-utils/Makefile
-  src/app-utils/test/Makefile
-  src/backend/Makefile
-  src/backend/dbi/Makefile
-  src/backend/dbi/test/Makefile
-  src/backend/xml/Makefile
-  src/backend/xml/test/Makefile
-  src/backend/xml/test/test-files/Makefile
-  src/backend/xml/test/test-files/xml2/Makefile
-  src/backend/sql/Makefile
-  src/backend/sql/test/Makefile
-  src/bin/Makefile
-  src/bin/overrides/Makefile
-  src/bin/test/Makefile
-  src/core-utils/Makefile
-  src/core-utils/test/Makefile
-  src/debug/Makefile
-  src/debug/valgrind/Makefile
-  src/doc/Makefile
-  src/doc/design/Makefile
-  src/doc/xml/Makefile
-  src/engine/Makefile
-  src/engine/test/Makefile
-  src/engine/test-core/Makefile
-  src/gnc-module/Makefile
-  src/gnc-module/test/Makefile
-  src/gnc-module/test/mod-foo/Makefile
-  src/gnc-module/test/mod-bar/Makefile
-  src/gnc-module/test/mod-baz/Makefile
-  src/gnc-module/test/misc-mods/Makefile
-  src/gnome/Makefile
-  src/gnome/gtkbuilder/Makefile
-  src/gnome/gschemas/Makefile
-  src/gnome/ui/Makefile
-  src/gnome-utils/Makefile
-  src/gnome-utils/gtkbuilder/Makefile
-  src/gnome-utils/gschemas/Makefile
-  src/gnome-utils/test/Makefile
-  src/gnome-utils/ui/Makefile
-  src/gnome-search/Makefile
-  src/html/Makefile
-  src/import-export/Makefile
-  src/import-export/test/Makefile
-  src/import-export/ofx/gschemas/Makefile
-  src/import-export/qif-imp/Makefile
-  src/import-export/qif/Makefile
-  src/import-export/qif/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-imp/Makefile
-  src/import-export/csv-imp/gschemas/Makefile
-  src/import-export/csv-imp/test/Makefile
-  src/import-export/csv-exp/Makefile
-  src/import-export/csv-exp/gschemas/Makefile
-  src/import-export/log-replay/Makefile
-  src/import-export/aqb/Makefile
-  src/import-export/aqb/gschemas/Makefile
-  src/import-export/aqb/test/Makefile
-  src/optional/Makefile
-  src/optional/python-bindings/Makefile
-  src/optional/python-bindings/tests/Makefile
-  src/pixmaps/Makefile
-  src/python/Makefile
-  src/python/pycons/Makefile
-  src/quotes/Makefile
-  src/register/Makefile
-  src/register/ledger-core/Makefile
-  src/register/ledger-core/test/Makefile
-  src/register/register-core/Makefile
-  src/register/register-core/test/Makefile
-  src/register/register-gnome/Makefile
-  src/register/register-gnome/test/Makefile
-  src/report/Makefile
-  src/report/report-gnome/Makefile
-  src/report/report-gnome/test/Makefile
-  src/report/report-system/Makefile
-  src/report/report-system/test/Makefile
-  src/report/standard-reports/Makefile
-  src/report/standard-reports/test/Makefile
-  src/report/business-reports/Makefile
-  src/report/locale-specific/Makefile
-  src/report/locale-specific/us/Makefile
-  src/report/locale-specific/us/test/Makefile
-  src/report/stylesheets/Makefile
-  src/report/stylesheets/test/Makefile
-  src/report/utility-reports/Makefile
-  src/report/jqplot/Makefile
-  src/scm/Makefile
-  src/scm/gnumeric/Makefile
-  src/tax/Makefile
-  src/tax/us/Makefile
-  src/tax/us/test/Makefile
-  src/test-core/Makefile
-  dnl # Stuff for bill/invoice import plugin
-  src/plugins/Makefile
-  src/plugins/bi_import/Makefile
-  src/plugins/bi_import/gtkbuilder/Makefile
-  src/plugins/bi_import/ui/Makefile
-  dnl # Stuff for customer import.
-  src/plugins/customer_import/Makefile
-  src/plugins/customer_import/gtkbuilder/Makefile
-  src/plugins/customer_import/ui/Makefile
   dnl # non-makefiles
-  src/bin/gnucash.rc
-  src/app-utils/migratable-prefs.xml
-  src/gnome/gnucash.desktop.in
+  gnucash/bin/gnucash.rc
+  libgnucash/app-utils/migratable-prefs.xml
+  gnucash/gnome/gnucash.desktop.in
   dnl # GSettings schema files
-  src/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
-  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/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-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in
+  gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in
+  gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in
+  gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
+  gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
+  gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
+  gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
+  gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
+  gnucash/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
 )
 dnl # Shell scripts, to have their shells set
-AC_CONFIG_FILES([src/app-utils/test/test-load-module],
-                [chmod +x src/app-utils/test/test-load-module])
-AC_CONFIG_FILES([src/backend/xml/test/test-real-data.sh],
-                [chmod +x src/backend/xml/test/test-real-data.sh])
-AC_CONFIG_FILES([src/bin/test/test-version],
-                [chmod +x src/bin/test/test-version])
-AC_CONFIG_FILES([src/engine/test/test-create-account],
-                [chmod +x src/engine/test/test-create-account])
-AC_CONFIG_FILES([src/engine/test/test-scm-query-import],
-                [chmod +x src/engine/test/test-scm-query-import])
-AC_CONFIG_FILES([src/gnc-module/test/test-gwrapped-c],
-                [chmod +x src/gnc-module/test/test-gwrapped-c])
-AC_CONFIG_FILES([src/gnc-module/test/test-load-deps],
-                [chmod +x src/gnc-module/test/test-load-deps])
-AC_CONFIG_FILES([src/gnc-module/test/test-load-scm],
-                [chmod +x src/gnc-module/test/test-load-scm])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-dynload],
-                [chmod +x src/gnc-module/test/test-scm-dynload])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-init],
-                [chmod +x src/gnc-module/test/test-scm-init])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-module],
-                [chmod +x src/gnc-module/test/test-scm-module])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-multi],
-                [chmod +x src/gnc-module/test/test-scm-multi])
-AC_CONFIG_FILES([src/gnome-utils/test/test-load-module],
-                [chmod +x src/gnome-utils/test/test-load-module])
-AC_CONFIG_FILES([src/report/locale-specific/us/test/test-load-module],
-                [chmod +x src/report/locale-specific/us/test/test-load-module])
-AC_CONFIG_FILES([src/report/report-gnome/test/test-load-module],
-                [chmod +x src/report/report-gnome/test/test-load-module])
-AC_CONFIG_FILES([src/report/report-system/test/test-load-module],
-                [chmod +x src/report/report-system/test/test-load-module])
-AC_CONFIG_FILES([src/report/stylesheets/test/test-load-module],
-                [chmod +x src/report/stylesheets/test/test-load-module])
-AC_CONFIG_FILES([src/tax/us/test/test-load-module],
-                [chmod +x src/tax/us/test/test-load-module])
+AC_CONFIG_FILES([libgnucash/app-utils/test/test-load-module],
+                [chmod +x libgnucash/app-utils/test/test-load-module])
+AC_CONFIG_FILES([libgnucash/backend/xml/test/test-real-data.sh],
+                [chmod +x libgnucash/backend/xml/test/test-real-data.sh])
+AC_CONFIG_FILES([gnucash/bin/test/test-version],
+                [chmod +x gnucash/bin/test/test-version])
+AC_CONFIG_FILES([libgnucash/engine/test/test-create-account],
+                [chmod +x libgnucash/engine/test/test-create-account])
+AC_CONFIG_FILES([libgnucash/engine/test/test-scm-query-import],
+                [chmod +x libgnucash/engine/test/test-scm-query-import])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-gwrapped-c],
+                [chmod +x libgnucash/gnc-module/test/test-gwrapped-c])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-load-deps],
+                [chmod +x libgnucash/gnc-module/test/test-load-deps])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-load-scm],
+                [chmod +x libgnucash/gnc-module/test/test-load-scm])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-dynload],
+                [chmod +x libgnucash/gnc-module/test/test-scm-dynload])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-init],
+                [chmod +x libgnucash/gnc-module/test/test-scm-init])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-module],
+                [chmod +x libgnucash/gnc-module/test/test-scm-module])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-multi],
+                [chmod +x libgnucash/gnc-module/test/test-scm-multi])
+AC_CONFIG_FILES([gnucash/gnome-utils/test/test-load-module],
+                [chmod +x gnucash/gnome-utils/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/locale-specific/us/test/test-load-module],
+                [chmod +x gnucash/report/locale-specific/us/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/report-gnome/test/test-load-module],
+                [chmod +x gnucash/report/report-gnome/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/report-system/test/test-load-module],
+                [chmod +x gnucash/report/report-system/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/stylesheets/test/test-load-module],
+                [chmod +x gnucash/report/stylesheets/test/test-load-module])
+AC_CONFIG_FILES([libgnucash/tax/us/test/test-load-module],
+                [chmod +x libgnucash/tax/us/test/test-load-module])
 
 # A few files need extra actions at creation time
-AC_CONFIG_FILES([src/bin/overrides/gnucash-make-guids], [chmod u+x src/bin/overrides/gnucash-make-guids])
+AC_CONFIG_FILES([gnucash/bin/overrides/gnucash-make-guids], [chmod u+x gnucash/bin/overrides/gnucash-make-guids])
 #Link (copy on Windows) test data files:
-AC_CONFIG_LINKS([src/import-export/csv-imp/test/sample1.csv:src/import-export/csv-imp/test/sample1.csv])
+AC_CONFIG_LINKS([gnucash/import-export/csv-imp/test/sample1.csv:gnucash/import-export/csv-imp/test/sample1.csv])
 LDFLAGS="${LDFLAGS} ${NOUNDEF}"
 AC_OUTPUT
 
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
new file mode 100644
index 0000000000..bd6353e893
--- /dev/null
+++ b/gnucash/CMakeLists.txt
@@ -0,0 +1,21 @@
+# CMakeLists.txt for gnucash/
+
+# The subdirectories
+ADD_SUBDIRECTORY (bin)
+ADD_SUBDIRECTORY (gnome)
+ADD_SUBDIRECTORY (gnome-utils)
+ADD_SUBDIRECTORY (gnome-search)
+ADD_SUBDIRECTORY (html)
+ADD_SUBDIRECTORY (import-export)
+ADD_SUBDIRECTORY (plugins)
+ADD_SUBDIRECTORY (python)
+ADD_SUBDIRECTORY (register)
+ADD_SUBDIRECTORY(report)
+
+ADD_DEFINITIONS (-DHAVE_CONFIG_H)
+
+SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt Makefile.am ${gnucash_EXTRA_DIST})
+
+SET(gnucash_DIST ${gnucash_DIST_local} ${bin_DIST} ${gnome_DIST} ${gnome_search_DIST}
+             ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${plugins_DIST} ${python_DIST}
+             ${register_DIST} ${report_DIST} PARENT_SCOPE)
diff --git a/gnucash/Makefile.am b/gnucash/Makefile.am
new file mode 100644
index 0000000000..fd7b46792f
--- /dev/null
+++ b/gnucash/Makefile.am
@@ -0,0 +1,15 @@
+if WITH_PYTHON
+   PYTHON_DIR = python
+endif
+
+SUBDIRS = \
+  ${PYTHON_DIR} \
+  gnome-utils \
+  html \
+  gnome-search \
+  report \
+  register \
+  gnome \
+  import-export \
+  plugins \
+  bin
diff --git a/src/bin/CMakeLists.txt b/gnucash/bin/CMakeLists.txt
similarity index 100%
rename from src/bin/CMakeLists.txt
rename to gnucash/bin/CMakeLists.txt
diff --git a/src/bin/Makefile.am b/gnucash/bin/Makefile.am
similarity index 79%
rename from src/bin/Makefile.am
rename to gnucash/bin/Makefile.am
index e6e254cb26..5bbbbed1ae 100644
--- a/src/bin/Makefile.am
+++ b/gnucash/bin/Makefile.am
@@ -8,17 +8,17 @@ endif
 AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
   -DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
   -DPKGDATADIR=\"${GNC_SHAREDIR}\" \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnome \
-  -I${top_builddir}/src \
-  -I${top_builddir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/report/report-system \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_builddir}/common \
+  -I${top_builddir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/gnucash/report/report-system \
   ${GUILE_CFLAGS} \
   ${GTK_MAC_CFLAGS}
 
@@ -34,7 +34,7 @@ GNUCASH_RESOURCE_FILE = gnucash.rc
 dist_noinst_DATA = gnucash.rc
 
 .rc.o:
-	$(AM_V_GEN)$(RC) -I${top_srcdir}/src/pixmaps -i '$<' --input-format=rc -o '$@' -O coff
+	$(AM_V_GEN)$(RC) -I${top_srcdir}/libgnucash/pixmaps -i '$<' --input-format=rc -o '$@' -O coff
 
 else !PLATFORM_WIN32
 # All other platforms use these settings:
@@ -46,15 +46,15 @@ BIN_NAME = gnucash
 bin_PROGRAMS = ${BIN_NAME}
 gnucash_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE}
 gnucash_LDADD = \
-  ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
-  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
+  ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \
+  ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${GTK_LIBS}
diff --git a/src/bin/environment.in b/gnucash/bin/environment.in
similarity index 100%
rename from src/bin/environment.in
rename to gnucash/bin/environment.in
diff --git a/src/bin/generate-gnc-script b/gnucash/bin/generate-gnc-script
similarity index 100%
rename from src/bin/generate-gnc-script
rename to gnucash/bin/generate-gnc-script
diff --git a/src/bin/gnucash-bin.c b/gnucash/bin/gnucash-bin.c
similarity index 99%
rename from src/bin/gnucash-bin.c
rename to gnucash/bin/gnucash-bin.c
index 2a1187a6bc..cea1f8bfcf 100644
--- a/src/bin/gnucash-bin.c
+++ b/gnucash/bin/gnucash-bin.c
@@ -33,7 +33,7 @@
 #include "gnc-path.h"
 #include "binreloc.h"
 #include "gnc-locale-utils.h"
-#include "core-utils/gnc-version.h"
+#include "gnc-version.h"
 #include "gnc-engine.h"
 #include "gnc-environment.h"
 #include "gnc-filepath-utils.h"
diff --git a/src/bin/gnucash-strip-svn-datafile.sh b/gnucash/bin/gnucash-strip-svn-datafile.sh
similarity index 100%
rename from src/bin/gnucash-strip-svn-datafile.sh
rename to gnucash/bin/gnucash-strip-svn-datafile.sh
diff --git a/src/bin/gnucash-valgrind.in b/gnucash/bin/gnucash-valgrind.in
similarity index 100%
rename from src/bin/gnucash-valgrind.in
rename to gnucash/bin/gnucash-valgrind.in
diff --git a/src/bin/gnucash.rc.in b/gnucash/bin/gnucash.rc.in
similarity index 100%
rename from src/bin/gnucash.rc.in
rename to gnucash/bin/gnucash.rc.in
diff --git a/src/bin/overrides/CMakeLists.txt b/gnucash/bin/overrides/CMakeLists.txt
similarity index 100%
rename from src/bin/overrides/CMakeLists.txt
rename to gnucash/bin/overrides/CMakeLists.txt
diff --git a/src/bin/overrides/Makefile.am b/gnucash/bin/overrides/Makefile.am
similarity index 100%
rename from src/bin/overrides/Makefile.am
rename to gnucash/bin/overrides/Makefile.am
diff --git a/gnucash/bin/overrides/gnucash-build-env.in b/gnucash/bin/overrides/gnucash-build-env.in
new file mode 100644
index 0000000000..0a3fb65176
--- /dev/null
+++ b/gnucash/bin/overrides/gnucash-build-env.in
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Usage: gnucash-build-env
+
+# Usage: gnucash-build-env any-cmd [ args ... ]
+# runs any-cmd in gnucash's build environment.
+
+# As with all the other gnucash overrides scripts, expects PATH to be
+# set appropriately.
+
+top_srcdir="@-GNC_SRCDIR-@"
+top_builddir="@-GNC_BUILDDIR-@"
+
+if test "${GNC_CONFIG_PATH}"x = x
+then
+  GNC_CONFIG_PATH="(\"${top_srcdir}/libgnucash/scm\")"
+  export GNC_CONFIG_PATH
+fi
+
+if test "${GNC_SHARE_PATH}"x = x
+then
+  GNC_SHARE_PATH="(\"${top_srcdir}/libgnucash/scm\" \"${top_srcdir}/libgnucash/quotes\")"
+  export GNC_SHARE_PATH
+fi
+
+if test "${GNC_DOC_PATH}"x = x
+then
+  GNC_DOC_PATH="(\"${top_srcdir}/libgnucash/scm\")"
+  export GNC_DOC_PATH
+fi
+
+set +x
+eval `${top_srcdir}/common/gnc-test-env.pl \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/tax/us \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-search \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export/hbci \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export/log-replay \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export/ofx \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export/qif-import \
+  --gnc-module-dir ${top_builddir}/gnucash/report/locale-specific/us \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-gnome \
+  --gnc-module-dir ${top_builddir}/gnucash/report/stylesheets \
+  --gnc-module-dir ${top_builddir}/gnucash/register/register-core \
+  --gnc-module-dir ${top_builddir}/gnucash/register/register-gnome \
+  --gnc-module-dir ${top_builddir}/gnucash/register/ledger-core \
+\
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/tax/us \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/import-export/qif-import \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/business-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/locale-specific/us \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-gnome \
+  --guile-load-dir ${top_builddir}/gnucash/report/stylesheets \
+\
+  --library-dir    ${top_builddir}/common/test-core \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/app-utils/calculation \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql  \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome \
+  --library-dir    ${top_builddir}/gnucash/gnome-search \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/import-export \
+  --library-dir    ${top_builddir}/gnucash/register/register-gnome \
+  --library-dir    ${top_builddir}/gnucash/register/ledger-core \
+  --library-dir    ${top_builddir}/gnucash/register/register-core \
+  --library-dir    ${top_builddir}/gnucash/report/report-gnome \
+  --library-dir    ${top_builddir}/gnucash/report/report-system
+  `
+LD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}"
+
+exec "$@"
diff --git a/src/bin/overrides/gnucash-env.in b/gnucash/bin/overrides/gnucash-env.in
similarity index 100%
rename from src/bin/overrides/gnucash-env.in
rename to gnucash/bin/overrides/gnucash-env.in
diff --git a/src/bin/overrides/gnucash-make-guids.in b/gnucash/bin/overrides/gnucash-make-guids.in
similarity index 100%
rename from src/bin/overrides/gnucash-make-guids.in
rename to gnucash/bin/overrides/gnucash-make-guids.in
diff --git a/src/bin/overrides/guile.in b/gnucash/bin/overrides/guile.in
similarity index 100%
rename from src/bin/overrides/guile.in
rename to gnucash/bin/overrides/guile.in
diff --git a/src/bin/test/CMakeLists.txt b/gnucash/bin/test/CMakeLists.txt
similarity index 100%
rename from src/bin/test/CMakeLists.txt
rename to gnucash/bin/test/CMakeLists.txt
diff --git a/src/bin/test/Makefile.am b/gnucash/bin/test/Makefile.am
similarity index 100%
rename from src/bin/test/Makefile.am
rename to gnucash/bin/test/Makefile.am
diff --git a/src/bin/test/test-version.in b/gnucash/bin/test/test-version.in
similarity index 100%
rename from src/bin/test/test-version.in
rename to gnucash/bin/test/test-version.in
diff --git a/src/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt
similarity index 100%
rename from src/gnome-search/CMakeLists.txt
rename to gnucash/gnome-search/CMakeLists.txt
diff --git a/src/gnome-search/Makefile.am b/gnucash/gnome-search/Makefile.am
similarity index 67%
rename from src/gnome-search/Makefile.am
rename to gnucash/gnome-search/Makefile.am
index 8056c048e8..6dcae68550 100644
--- a/src/gnome-search/Makefile.am
+++ b/gnucash/gnome-search/Makefile.am
@@ -1,12 +1,12 @@
 pkglib_LTLIBRARIES = libgncmod-gnome-search.la
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
@@ -46,11 +46,11 @@ noinst_HEADERS = \
 libgncmod_gnome_search_la_LDFLAGS = -avoid-version
 
 libgncmod_gnome_search_la_LIBADD = \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${REGEX_LIBS}
diff --git a/src/gnome-search/dialog-search.c b/gnucash/gnome-search/dialog-search.c
similarity index 100%
rename from src/gnome-search/dialog-search.c
rename to gnucash/gnome-search/dialog-search.c
diff --git a/src/gnome-search/dialog-search.glade b/gnucash/gnome-search/dialog-search.glade
similarity index 100%
rename from src/gnome-search/dialog-search.glade
rename to gnucash/gnome-search/dialog-search.glade
diff --git a/src/gnome-search/dialog-search.h b/gnucash/gnome-search/dialog-search.h
similarity index 100%
rename from src/gnome-search/dialog-search.h
rename to gnucash/gnome-search/dialog-search.h
diff --git a/src/gnome-search/gnc-general-search.c b/gnucash/gnome-search/gnc-general-search.c
similarity index 100%
rename from src/gnome-search/gnc-general-search.c
rename to gnucash/gnome-search/gnc-general-search.c
diff --git a/src/gnome-search/gnc-general-search.h b/gnucash/gnome-search/gnc-general-search.h
similarity index 100%
rename from src/gnome-search/gnc-general-search.h
rename to gnucash/gnome-search/gnc-general-search.h
diff --git a/src/gnome-search/gncmod-gnome-search.c b/gnucash/gnome-search/gncmod-gnome-search.c
similarity index 100%
rename from src/gnome-search/gncmod-gnome-search.c
rename to gnucash/gnome-search/gncmod-gnome-search.c
diff --git a/src/gnome-search/search-account.c b/gnucash/gnome-search/search-account.c
similarity index 100%
rename from src/gnome-search/search-account.c
rename to gnucash/gnome-search/search-account.c
diff --git a/src/gnome-search/search-account.h b/gnucash/gnome-search/search-account.h
similarity index 100%
rename from src/gnome-search/search-account.h
rename to gnucash/gnome-search/search-account.h
diff --git a/src/gnome-search/search-boolean.c b/gnucash/gnome-search/search-boolean.c
similarity index 100%
rename from src/gnome-search/search-boolean.c
rename to gnucash/gnome-search/search-boolean.c
diff --git a/src/gnome-search/search-boolean.h b/gnucash/gnome-search/search-boolean.h
similarity index 100%
rename from src/gnome-search/search-boolean.h
rename to gnucash/gnome-search/search-boolean.h
diff --git a/src/gnome-search/search-core-type.c b/gnucash/gnome-search/search-core-type.c
similarity index 100%
rename from src/gnome-search/search-core-type.c
rename to gnucash/gnome-search/search-core-type.c
diff --git a/src/gnome-search/search-core-type.h b/gnucash/gnome-search/search-core-type.h
similarity index 100%
rename from src/gnome-search/search-core-type.h
rename to gnucash/gnome-search/search-core-type.h
diff --git a/src/gnome-search/search-core-utils.c b/gnucash/gnome-search/search-core-utils.c
similarity index 100%
rename from src/gnome-search/search-core-utils.c
rename to gnucash/gnome-search/search-core-utils.c
diff --git a/src/gnome-search/search-core-utils.h b/gnucash/gnome-search/search-core-utils.h
similarity index 100%
rename from src/gnome-search/search-core-utils.h
rename to gnucash/gnome-search/search-core-utils.h
diff --git a/src/gnome-search/search-date.c b/gnucash/gnome-search/search-date.c
similarity index 100%
rename from src/gnome-search/search-date.c
rename to gnucash/gnome-search/search-date.c
diff --git a/src/gnome-search/search-date.h b/gnucash/gnome-search/search-date.h
similarity index 100%
rename from src/gnome-search/search-date.h
rename to gnucash/gnome-search/search-date.h
diff --git a/src/gnome-search/search-double.c b/gnucash/gnome-search/search-double.c
similarity index 100%
rename from src/gnome-search/search-double.c
rename to gnucash/gnome-search/search-double.c
diff --git a/src/gnome-search/search-double.h b/gnucash/gnome-search/search-double.h
similarity index 100%
rename from src/gnome-search/search-double.h
rename to gnucash/gnome-search/search-double.h
diff --git a/src/gnome-search/search-int64.c b/gnucash/gnome-search/search-int64.c
similarity index 100%
rename from src/gnome-search/search-int64.c
rename to gnucash/gnome-search/search-int64.c
diff --git a/src/gnome-search/search-int64.h b/gnucash/gnome-search/search-int64.h
similarity index 100%
rename from src/gnome-search/search-int64.h
rename to gnucash/gnome-search/search-int64.h
diff --git a/src/gnome-search/search-numeric.c b/gnucash/gnome-search/search-numeric.c
similarity index 100%
rename from src/gnome-search/search-numeric.c
rename to gnucash/gnome-search/search-numeric.c
diff --git a/src/gnome-search/search-numeric.h b/gnucash/gnome-search/search-numeric.h
similarity index 100%
rename from src/gnome-search/search-numeric.h
rename to gnucash/gnome-search/search-numeric.h
diff --git a/src/gnome-search/search-reconciled.c b/gnucash/gnome-search/search-reconciled.c
similarity index 100%
rename from src/gnome-search/search-reconciled.c
rename to gnucash/gnome-search/search-reconciled.c
diff --git a/src/gnome-search/search-reconciled.h b/gnucash/gnome-search/search-reconciled.h
similarity index 100%
rename from src/gnome-search/search-reconciled.h
rename to gnucash/gnome-search/search-reconciled.h
diff --git a/src/gnome-search/search-string.c b/gnucash/gnome-search/search-string.c
similarity index 100%
rename from src/gnome-search/search-string.c
rename to gnucash/gnome-search/search-string.c
diff --git a/src/gnome-search/search-string.h b/gnucash/gnome-search/search-string.h
similarity index 100%
rename from src/gnome-search/search-string.h
rename to gnucash/gnome-search/search-string.h
diff --git a/src/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
similarity index 97%
rename from src/gnome-utils/CMakeLists.txt
rename to gnucash/gnome-utils/CMakeLists.txt
index fd90e0080c..fd5043fa34 100644
--- a/src/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Note that src/gnome-utils CANNOT depend on src/gnome!
+# Note that gnucash/gnome-utils CANNOT depend on gnucash/gnome!
 
 ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(gtkbuilder)
@@ -243,8 +243,8 @@ INSTALL(FILES ${gnome_utils_HEADERS} DESTINATION include/gnucash)
 # Scheme
 
 SET(GUILE_MODULES      "")
-SET(GUILE_LOAD_DIRS    src/core-utils src/gnc-module src/scm)
-SET(GUILE_LIBRARY_DIRS src/core-utils src/gnc-module)
+SET(GUILE_LOAD_DIRS    libgnucash/core-utils libgnucash/gnc-module libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module)
 SET(GUILE_DEPENDS      gncmod-gnome-utils scm-core-utils scm-gnc-module scm-scm)
 
 GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
diff --git a/src/gnome-utils/Makefile.am b/gnucash/gnome-utils/Makefile.am
similarity index 84%
rename from src/gnome-utils/Makefile.am
rename to gnucash/gnome-utils/Makefile.am
index c94e88b19b..d92bb93dd5 100644
--- a/src/gnome-utils/Makefile.am
+++ b/gnucash/gnome-utils/Makefile.am
@@ -5,14 +5,14 @@ pkglib_LTLIBRARIES = libgncmod-gnome-utils.la
 # Note that src/gnome-utils CANNOT depend on src/gnome!
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/backend/xml \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_builddir}/src/core-utils \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/backend/xml \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_builddir}/libgnucash/core-utils \
   -I${top_srcdir}/lib/libc \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
@@ -193,11 +193,11 @@ noinst_HEADERS = \
 libgncmod_gnome_utils_la_LDFLAGS = -avoid-version
 
 libgncmod_gnome_utils_la_LIBADD = \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
   $(top_builddir)/lib/libc/libc-missing.la \
   ${GTK_LIBS} \
   ${GNOME_KEYRING_LIBS} \
@@ -223,13 +223,13 @@ endif
 
 if BUILDING_FROM_VCS
 swig-gnome-utils.c: gnome-utils.i \
-                    ${top_srcdir}/src/base-typemaps.i
+                    ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
@@ -273,20 +273,20 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/gnome-utils
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
diff --git a/src/gnome-utils/account-quickfill.c b/gnucash/gnome-utils/account-quickfill.c
similarity index 100%
rename from src/gnome-utils/account-quickfill.c
rename to gnucash/gnome-utils/account-quickfill.c
diff --git a/src/gnome-utils/account-quickfill.h b/gnucash/gnome-utils/account-quickfill.h
similarity index 100%
rename from src/gnome-utils/account-quickfill.h
rename to gnucash/gnome-utils/account-quickfill.h
diff --git a/src/gnome-utils/assistant-xml-encoding.c b/gnucash/gnome-utils/assistant-xml-encoding.c
similarity index 100%
rename from src/gnome-utils/assistant-xml-encoding.c
rename to gnucash/gnome-utils/assistant-xml-encoding.c
diff --git a/src/gnome-utils/assistant-xml-encoding.h b/gnucash/gnome-utils/assistant-xml-encoding.h
similarity index 100%
rename from src/gnome-utils/assistant-xml-encoding.h
rename to gnucash/gnome-utils/assistant-xml-encoding.h
diff --git a/src/gnome-utils/cursors.c b/gnucash/gnome-utils/cursors.c
similarity index 100%
rename from src/gnome-utils/cursors.c
rename to gnucash/gnome-utils/cursors.c
diff --git a/src/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
similarity index 100%
rename from src/gnome-utils/dialog-account.c
rename to gnucash/gnome-utils/dialog-account.c
diff --git a/src/gnome-utils/dialog-account.h b/gnucash/gnome-utils/dialog-account.h
similarity index 100%
rename from src/gnome-utils/dialog-account.h
rename to gnucash/gnome-utils/dialog-account.h
diff --git a/src/gnome-utils/dialog-book-close.c b/gnucash/gnome-utils/dialog-book-close.c
similarity index 99%
rename from src/gnome-utils/dialog-book-close.c
rename to gnucash/gnome-utils/dialog-book-close.c
index 3fe4ed8c93..c130f24f51 100644
--- a/src/gnome-utils/dialog-book-close.c
+++ b/gnucash/gnome-utils/dialog-book-close.c
@@ -41,7 +41,7 @@
 #include "gnc-component-manager.h"
 #include "gnc-date-edit.h"
 #include "gnc-session.h"
-#include "app-utils/gnc-ui-util.h"
+#include "gnc-ui-util.h"
 
 #define DIALOG_BOOK_CLOSE_CM_CLASS "dialog-book-close"
 
diff --git a/src/gnome-utils/dialog-book-close.h b/gnucash/gnome-utils/dialog-book-close.h
similarity index 100%
rename from src/gnome-utils/dialog-book-close.h
rename to gnucash/gnome-utils/dialog-book-close.h
diff --git a/src/gnome-utils/dialog-commodity.c b/gnucash/gnome-utils/dialog-commodity.c
similarity index 100%
rename from src/gnome-utils/dialog-commodity.c
rename to gnucash/gnome-utils/dialog-commodity.c
diff --git a/src/gnome-utils/dialog-commodity.h b/gnucash/gnome-utils/dialog-commodity.h
similarity index 100%
rename from src/gnome-utils/dialog-commodity.h
rename to gnucash/gnome-utils/dialog-commodity.h
diff --git a/src/gnome-utils/dialog-dup-trans.c b/gnucash/gnome-utils/dialog-dup-trans.c
similarity index 100%
rename from src/gnome-utils/dialog-dup-trans.c
rename to gnucash/gnome-utils/dialog-dup-trans.c
diff --git a/src/gnome-utils/dialog-dup-trans.h b/gnucash/gnome-utils/dialog-dup-trans.h
similarity index 100%
rename from src/gnome-utils/dialog-dup-trans.h
rename to gnucash/gnome-utils/dialog-dup-trans.h
diff --git a/src/gnome-utils/dialog-file-access.c b/gnucash/gnome-utils/dialog-file-access.c
similarity index 100%
rename from src/gnome-utils/dialog-file-access.c
rename to gnucash/gnome-utils/dialog-file-access.c
diff --git a/src/gnome-utils/dialog-file-access.h b/gnucash/gnome-utils/dialog-file-access.h
similarity index 100%
rename from src/gnome-utils/dialog-file-access.h
rename to gnucash/gnome-utils/dialog-file-access.h
diff --git a/src/gnome-utils/dialog-object-references.c b/gnucash/gnome-utils/dialog-object-references.c
similarity index 100%
rename from src/gnome-utils/dialog-object-references.c
rename to gnucash/gnome-utils/dialog-object-references.c
diff --git a/src/gnome-utils/dialog-object-references.h b/gnucash/gnome-utils/dialog-object-references.h
similarity index 100%
rename from src/gnome-utils/dialog-object-references.h
rename to gnucash/gnome-utils/dialog-object-references.h
diff --git a/src/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
similarity index 100%
rename from src/gnome-utils/dialog-options.c
rename to gnucash/gnome-utils/dialog-options.c
diff --git a/src/gnome-utils/dialog-options.h b/gnucash/gnome-utils/dialog-options.h
similarity index 99%
rename from src/gnome-utils/dialog-options.h
rename to gnucash/gnome-utils/dialog-options.h
index 2ac3a1e574..cfbe013f16 100644
--- a/src/gnome-utils/dialog-options.h
+++ b/gnucash/gnome-utils/dialog-options.h
@@ -24,7 +24,7 @@
 #define OPTIONS_DIALOG_H
 
 #include <libguile.h>
-#include "app-utils/option-util.h"
+#include "option-util.h"
 #include <gtk/gtk.h>
 
 /** A simple wrapper that casts the gpointer result of
diff --git a/src/gnome-utils/dialog-preferences.c b/gnucash/gnome-utils/dialog-preferences.c
similarity index 100%
rename from src/gnome-utils/dialog-preferences.c
rename to gnucash/gnome-utils/dialog-preferences.c
diff --git a/src/gnome-utils/dialog-preferences.h b/gnucash/gnome-utils/dialog-preferences.h
similarity index 100%
rename from src/gnome-utils/dialog-preferences.h
rename to gnucash/gnome-utils/dialog-preferences.h
diff --git a/src/gnome-utils/dialog-query-view.c b/gnucash/gnome-utils/dialog-query-view.c
similarity index 100%
rename from src/gnome-utils/dialog-query-view.c
rename to gnucash/gnome-utils/dialog-query-view.c
diff --git a/src/gnome-utils/dialog-query-view.h b/gnucash/gnome-utils/dialog-query-view.h
similarity index 100%
rename from src/gnome-utils/dialog-query-view.h
rename to gnucash/gnome-utils/dialog-query-view.h
diff --git a/src/gnome-utils/dialog-reset-warnings.c b/gnucash/gnome-utils/dialog-reset-warnings.c
similarity index 99%
rename from src/gnome-utils/dialog-reset-warnings.c
rename to gnucash/gnome-utils/dialog-reset-warnings.c
index 2b9252d186..794ce20787 100644
--- a/src/gnome-utils/dialog-reset-warnings.c
+++ b/gnucash/gnome-utils/dialog-reset-warnings.c
@@ -31,7 +31,7 @@
 #include "gnc-engine.h"
 #include "gnc-prefs.h"
 #include "gnc-ui.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "gnc-component-manager.h"
 #include "dialog-reset-warnings.h"
 
diff --git a/src/gnome-utils/dialog-reset-warnings.h b/gnucash/gnome-utils/dialog-reset-warnings.h
similarity index 100%
rename from src/gnome-utils/dialog-reset-warnings.h
rename to gnucash/gnome-utils/dialog-reset-warnings.h
diff --git a/src/gnome-utils/dialog-tax-table.c b/gnucash/gnome-utils/dialog-tax-table.c
similarity index 100%
rename from src/gnome-utils/dialog-tax-table.c
rename to gnucash/gnome-utils/dialog-tax-table.c
diff --git a/src/gnome-utils/dialog-tax-table.h b/gnucash/gnome-utils/dialog-tax-table.h
similarity index 100%
rename from src/gnome-utils/dialog-tax-table.h
rename to gnucash/gnome-utils/dialog-tax-table.h
diff --git a/src/gnome-utils/dialog-totd.c b/gnucash/gnome-utils/dialog-totd.c
similarity index 100%
rename from src/gnome-utils/dialog-totd.c
rename to gnucash/gnome-utils/dialog-totd.c
diff --git a/src/gnome-utils/dialog-totd.h b/gnucash/gnome-utils/dialog-totd.h
similarity index 100%
rename from src/gnome-utils/dialog-totd.h
rename to gnucash/gnome-utils/dialog-totd.h
diff --git a/src/gnome-utils/dialog-transfer.c b/gnucash/gnome-utils/dialog-transfer.c
similarity index 99%
rename from src/gnome-utils/dialog-transfer.c
rename to gnucash/gnome-utils/dialog-transfer.c
index 59cd5499dc..2947d9bc14 100644
--- a/src/gnome-utils/dialog-transfer.c
+++ b/gnucash/gnome-utils/dialog-transfer.c
@@ -48,7 +48,7 @@
 #include "guile-mappings.h"
 #include "engine-helpers.h"
 #include "engine-helpers-guile.h"
-#include "app-utils/QuickFill.h"
+#include "QuickFill.h"
 #include <gnc-commodity.h>
 
 
diff --git a/src/gnome-utils/dialog-transfer.h b/gnucash/gnome-utils/dialog-transfer.h
similarity index 100%
rename from src/gnome-utils/dialog-transfer.h
rename to gnucash/gnome-utils/dialog-transfer.h
diff --git a/src/gnome-utils/dialog-userpass.c b/gnucash/gnome-utils/dialog-userpass.c
similarity index 100%
rename from src/gnome-utils/dialog-userpass.c
rename to gnucash/gnome-utils/dialog-userpass.c
diff --git a/src/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c
similarity index 100%
rename from src/gnome-utils/dialog-utils.c
rename to gnucash/gnome-utils/dialog-utils.c
diff --git a/src/gnome-utils/dialog-utils.h b/gnucash/gnome-utils/dialog-utils.h
similarity index 100%
rename from src/gnome-utils/dialog-utils.h
rename to gnucash/gnome-utils/dialog-utils.h
diff --git a/src/gnome-utils/gnc-account-sel.c b/gnucash/gnome-utils/gnc-account-sel.c
similarity index 100%
rename from src/gnome-utils/gnc-account-sel.c
rename to gnucash/gnome-utils/gnc-account-sel.c
diff --git a/src/gnome-utils/gnc-account-sel.h b/gnucash/gnome-utils/gnc-account-sel.h
similarity index 100%
rename from src/gnome-utils/gnc-account-sel.h
rename to gnucash/gnome-utils/gnc-account-sel.h
diff --git a/src/gnome-utils/gnc-amount-edit.c b/gnucash/gnome-utils/gnc-amount-edit.c
similarity index 100%
rename from src/gnome-utils/gnc-amount-edit.c
rename to gnucash/gnome-utils/gnc-amount-edit.c
diff --git a/src/gnome-utils/gnc-amount-edit.h b/gnucash/gnome-utils/gnc-amount-edit.h
similarity index 100%
rename from src/gnome-utils/gnc-amount-edit.h
rename to gnucash/gnome-utils/gnc-amount-edit.h
diff --git a/src/gnome-utils/gnc-autosave.c b/gnucash/gnome-utils/gnc-autosave.c
similarity index 100%
rename from src/gnome-utils/gnc-autosave.c
rename to gnucash/gnome-utils/gnc-autosave.c
diff --git a/src/gnome-utils/gnc-autosave.h b/gnucash/gnome-utils/gnc-autosave.h
similarity index 100%
rename from src/gnome-utils/gnc-autosave.h
rename to gnucash/gnome-utils/gnc-autosave.h
diff --git a/src/gnome-utils/gnc-cell-renderer-date.c b/gnucash/gnome-utils/gnc-cell-renderer-date.c
similarity index 100%
rename from src/gnome-utils/gnc-cell-renderer-date.c
rename to gnucash/gnome-utils/gnc-cell-renderer-date.c
diff --git a/src/gnome-utils/gnc-cell-renderer-date.h b/gnucash/gnome-utils/gnc-cell-renderer-date.h
similarity index 100%
rename from src/gnome-utils/gnc-cell-renderer-date.h
rename to gnucash/gnome-utils/gnc-cell-renderer-date.h
diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
similarity index 100%
rename from src/gnome-utils/gnc-cell-renderer-popup-entry.c
rename to gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.h b/gnucash/gnome-utils/gnc-cell-renderer-popup-entry.h
similarity index 100%
rename from src/gnome-utils/gnc-cell-renderer-popup-entry.h
rename to gnucash/gnome-utils/gnc-cell-renderer-popup-entry.h
diff --git a/src/gnome-utils/gnc-cell-renderer-popup.c b/gnucash/gnome-utils/gnc-cell-renderer-popup.c
similarity index 100%
rename from src/gnome-utils/gnc-cell-renderer-popup.c
rename to gnucash/gnome-utils/gnc-cell-renderer-popup.c
diff --git a/src/gnome-utils/gnc-cell-renderer-popup.h b/gnucash/gnome-utils/gnc-cell-renderer-popup.h
similarity index 100%
rename from src/gnome-utils/gnc-cell-renderer-popup.h
rename to gnucash/gnome-utils/gnc-cell-renderer-popup.h
diff --git a/src/gnome-utils/gnc-combott.c b/gnucash/gnome-utils/gnc-combott.c
similarity index 100%
rename from src/gnome-utils/gnc-combott.c
rename to gnucash/gnome-utils/gnc-combott.c
diff --git a/src/gnome-utils/gnc-combott.h b/gnucash/gnome-utils/gnc-combott.h
similarity index 100%
rename from src/gnome-utils/gnc-combott.h
rename to gnucash/gnome-utils/gnc-combott.h
diff --git a/src/gnome-utils/gnc-commodity-edit.c b/gnucash/gnome-utils/gnc-commodity-edit.c
similarity index 100%
rename from src/gnome-utils/gnc-commodity-edit.c
rename to gnucash/gnome-utils/gnc-commodity-edit.c
diff --git a/src/gnome-utils/gnc-commodity-edit.h b/gnucash/gnome-utils/gnc-commodity-edit.h
similarity index 100%
rename from src/gnome-utils/gnc-commodity-edit.h
rename to gnucash/gnome-utils/gnc-commodity-edit.h
diff --git a/src/gnome-utils/gnc-currency-edit.c b/gnucash/gnome-utils/gnc-currency-edit.c
similarity index 100%
rename from src/gnome-utils/gnc-currency-edit.c
rename to gnucash/gnome-utils/gnc-currency-edit.c
diff --git a/src/gnome-utils/gnc-currency-edit.h b/gnucash/gnome-utils/gnc-currency-edit.h
similarity index 100%
rename from src/gnome-utils/gnc-currency-edit.h
rename to gnucash/gnome-utils/gnc-currency-edit.h
diff --git a/src/gnome-utils/gnc-date-delta.c b/gnucash/gnome-utils/gnc-date-delta.c
similarity index 100%
rename from src/gnome-utils/gnc-date-delta.c
rename to gnucash/gnome-utils/gnc-date-delta.c
diff --git a/src/gnome-utils/gnc-date-delta.h b/gnucash/gnome-utils/gnc-date-delta.h
similarity index 100%
rename from src/gnome-utils/gnc-date-delta.h
rename to gnucash/gnome-utils/gnc-date-delta.h
diff --git a/src/gnome-utils/gnc-date-edit.c b/gnucash/gnome-utils/gnc-date-edit.c
similarity index 100%
rename from src/gnome-utils/gnc-date-edit.c
rename to gnucash/gnome-utils/gnc-date-edit.c
diff --git a/src/gnome-utils/gnc-date-edit.h b/gnucash/gnome-utils/gnc-date-edit.h
similarity index 100%
rename from src/gnome-utils/gnc-date-edit.h
rename to gnucash/gnome-utils/gnc-date-edit.h
diff --git a/src/gnome-utils/gnc-date-format.c b/gnucash/gnome-utils/gnc-date-format.c
similarity index 100%
rename from src/gnome-utils/gnc-date-format.c
rename to gnucash/gnome-utils/gnc-date-format.c
diff --git a/src/gnome-utils/gnc-date-format.h b/gnucash/gnome-utils/gnc-date-format.h
similarity index 100%
rename from src/gnome-utils/gnc-date-format.h
rename to gnucash/gnome-utils/gnc-date-format.h
diff --git a/src/gnome-utils/gnc-dense-cal-model.c b/gnucash/gnome-utils/gnc-dense-cal-model.c
similarity index 100%
rename from src/gnome-utils/gnc-dense-cal-model.c
rename to gnucash/gnome-utils/gnc-dense-cal-model.c
diff --git a/src/gnome-utils/gnc-dense-cal-model.h b/gnucash/gnome-utils/gnc-dense-cal-model.h
similarity index 100%
rename from src/gnome-utils/gnc-dense-cal-model.h
rename to gnucash/gnome-utils/gnc-dense-cal-model.h
diff --git a/src/gnome-utils/gnc-dense-cal-store.c b/gnucash/gnome-utils/gnc-dense-cal-store.c
similarity index 100%
rename from src/gnome-utils/gnc-dense-cal-store.c
rename to gnucash/gnome-utils/gnc-dense-cal-store.c
diff --git a/src/gnome-utils/gnc-dense-cal-store.h b/gnucash/gnome-utils/gnc-dense-cal-store.h
similarity index 100%
rename from src/gnome-utils/gnc-dense-cal-store.h
rename to gnucash/gnome-utils/gnc-dense-cal-store.h
diff --git a/src/gnome-utils/gnc-dense-cal.c b/gnucash/gnome-utils/gnc-dense-cal.c
similarity index 100%
rename from src/gnome-utils/gnc-dense-cal.c
rename to gnucash/gnome-utils/gnc-dense-cal.c
diff --git a/src/gnome-utils/gnc-dense-cal.h b/gnucash/gnome-utils/gnc-dense-cal.h
similarity index 100%
rename from src/gnome-utils/gnc-dense-cal.h
rename to gnucash/gnome-utils/gnc-dense-cal.h
diff --git a/src/gnome-utils/gnc-embedded-window.c b/gnucash/gnome-utils/gnc-embedded-window.c
similarity index 100%
rename from src/gnome-utils/gnc-embedded-window.c
rename to gnucash/gnome-utils/gnc-embedded-window.c
diff --git a/src/gnome-utils/gnc-embedded-window.h b/gnucash/gnome-utils/gnc-embedded-window.h
similarity index 100%
rename from src/gnome-utils/gnc-embedded-window.h
rename to gnucash/gnome-utils/gnc-embedded-window.h
diff --git a/src/gnome-utils/gnc-file.c b/gnucash/gnome-utils/gnc-file.c
similarity index 100%
rename from src/gnome-utils/gnc-file.c
rename to gnucash/gnome-utils/gnc-file.c
diff --git a/src/gnome-utils/gnc-file.h b/gnucash/gnome-utils/gnc-file.h
similarity index 100%
rename from src/gnome-utils/gnc-file.h
rename to gnucash/gnome-utils/gnc-file.h
diff --git a/src/gnome-utils/gnc-frequency.c b/gnucash/gnome-utils/gnc-frequency.c
similarity index 100%
rename from src/gnome-utils/gnc-frequency.c
rename to gnucash/gnome-utils/gnc-frequency.c
diff --git a/src/gnome-utils/gnc-frequency.h b/gnucash/gnome-utils/gnc-frequency.h
similarity index 100%
rename from src/gnome-utils/gnc-frequency.h
rename to gnucash/gnome-utils/gnc-frequency.h
diff --git a/src/gnome-utils/gnc-general-select.c b/gnucash/gnome-utils/gnc-general-select.c
similarity index 100%
rename from src/gnome-utils/gnc-general-select.c
rename to gnucash/gnome-utils/gnc-general-select.c
diff --git a/src/gnome-utils/gnc-general-select.h b/gnucash/gnome-utils/gnc-general-select.h
similarity index 100%
rename from src/gnome-utils/gnc-general-select.h
rename to gnucash/gnome-utils/gnc-general-select.h
diff --git a/src/gnome-utils/gnc-gnome-utils.c b/gnucash/gnome-utils/gnc-gnome-utils.c
similarity index 100%
rename from src/gnome-utils/gnc-gnome-utils.c
rename to gnucash/gnome-utils/gnc-gnome-utils.c
diff --git a/src/gnome-utils/gnc-gnome-utils.h b/gnucash/gnome-utils/gnc-gnome-utils.h
similarity index 100%
rename from src/gnome-utils/gnc-gnome-utils.h
rename to gnucash/gnome-utils/gnc-gnome-utils.h
diff --git a/src/gnome-utils/gnc-gobject-utils.c b/gnucash/gnome-utils/gnc-gobject-utils.c
similarity index 100%
rename from src/gnome-utils/gnc-gobject-utils.c
rename to gnucash/gnome-utils/gnc-gobject-utils.c
diff --git a/src/gnome-utils/gnc-gobject-utils.h b/gnucash/gnome-utils/gnc-gobject-utils.h
similarity index 100%
rename from src/gnome-utils/gnc-gobject-utils.h
rename to gnucash/gnome-utils/gnc-gobject-utils.h
diff --git a/src/gnome-utils/gnc-gtk-utils.c b/gnucash/gnome-utils/gnc-gtk-utils.c
similarity index 100%
rename from src/gnome-utils/gnc-gtk-utils.c
rename to gnucash/gnome-utils/gnc-gtk-utils.c
diff --git a/src/gnome-utils/gnc-gtk-utils.h b/gnucash/gnome-utils/gnc-gtk-utils.h
similarity index 100%
rename from src/gnome-utils/gnc-gtk-utils.h
rename to gnucash/gnome-utils/gnc-gtk-utils.h
diff --git a/src/gnome-utils/gnc-gui-query.c b/gnucash/gnome-utils/gnc-gui-query.c
similarity index 100%
rename from src/gnome-utils/gnc-gui-query.c
rename to gnucash/gnome-utils/gnc-gui-query.c
diff --git a/src/gnome-utils/gnc-gui-query.h b/gnucash/gnome-utils/gnc-gui-query.h
similarity index 100%
rename from src/gnome-utils/gnc-gui-query.h
rename to gnucash/gnome-utils/gnc-gui-query.h
diff --git a/src/gnome-utils/gnc-icons.c b/gnucash/gnome-utils/gnc-icons.c
similarity index 100%
rename from src/gnome-utils/gnc-icons.c
rename to gnucash/gnome-utils/gnc-icons.c
diff --git a/src/gnome-utils/gnc-icons.h b/gnucash/gnome-utils/gnc-icons.h
similarity index 100%
rename from src/gnome-utils/gnc-icons.h
rename to gnucash/gnome-utils/gnc-icons.h
diff --git a/src/gnome-utils/gnc-keyring.c b/gnucash/gnome-utils/gnc-keyring.c
similarity index 100%
rename from src/gnome-utils/gnc-keyring.c
rename to gnucash/gnome-utils/gnc-keyring.c
diff --git a/src/gnome-utils/gnc-keyring.h b/gnucash/gnome-utils/gnc-keyring.h
similarity index 100%
rename from src/gnome-utils/gnc-keyring.h
rename to gnucash/gnome-utils/gnc-keyring.h
diff --git a/src/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
similarity index 99%
rename from src/gnome-utils/gnc-main-window.c
rename to gnucash/gnome-utils/gnc-main-window.c
index 20339ea0df..b3861bbee6 100644
--- a/src/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -64,7 +64,7 @@
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
 #include "gnc-uri-utils.h"
-#include "core-utils/gnc-version.h"
+#include "gnc-version.h"
 #include "gnc-window.h"
 #include "gnc-prefs.h"
 #include "option-util.h"
diff --git a/src/gnome-utils/gnc-main-window.h b/gnucash/gnome-utils/gnc-main-window.h
similarity index 100%
rename from src/gnome-utils/gnc-main-window.h
rename to gnucash/gnome-utils/gnc-main-window.h
diff --git a/src/gnome-utils/gnc-menu-extensions.c b/gnucash/gnome-utils/gnc-menu-extensions.c
similarity index 100%
rename from src/gnome-utils/gnc-menu-extensions.c
rename to gnucash/gnome-utils/gnc-menu-extensions.c
diff --git a/src/gnome-utils/gnc-menu-extensions.h b/gnucash/gnome-utils/gnc-menu-extensions.h
similarity index 100%
rename from src/gnome-utils/gnc-menu-extensions.h
rename to gnucash/gnome-utils/gnc-menu-extensions.h
diff --git a/src/gnome-utils/gnc-menu-extensions.scm b/gnucash/gnome-utils/gnc-menu-extensions.scm
similarity index 100%
rename from src/gnome-utils/gnc-menu-extensions.scm
rename to gnucash/gnome-utils/gnc-menu-extensions.scm
diff --git a/src/gnome-utils/gnc-period-select.c b/gnucash/gnome-utils/gnc-period-select.c
similarity index 100%
rename from src/gnome-utils/gnc-period-select.c
rename to gnucash/gnome-utils/gnc-period-select.c
diff --git a/src/gnome-utils/gnc-period-select.h b/gnucash/gnome-utils/gnc-period-select.h
similarity index 100%
rename from src/gnome-utils/gnc-period-select.h
rename to gnucash/gnome-utils/gnc-period-select.h
diff --git a/src/gnome-utils/gnc-plugin-file-history.c b/gnucash/gnome-utils/gnc-plugin-file-history.c
similarity index 100%
rename from src/gnome-utils/gnc-plugin-file-history.c
rename to gnucash/gnome-utils/gnc-plugin-file-history.c
diff --git a/src/gnome-utils/gnc-plugin-file-history.h b/gnucash/gnome-utils/gnc-plugin-file-history.h
similarity index 100%
rename from src/gnome-utils/gnc-plugin-file-history.h
rename to gnucash/gnome-utils/gnc-plugin-file-history.h
diff --git a/src/gnome-utils/gnc-plugin-manager.c b/gnucash/gnome-utils/gnc-plugin-manager.c
similarity index 100%
rename from src/gnome-utils/gnc-plugin-manager.c
rename to gnucash/gnome-utils/gnc-plugin-manager.c
diff --git a/src/gnome-utils/gnc-plugin-manager.h b/gnucash/gnome-utils/gnc-plugin-manager.h
similarity index 100%
rename from src/gnome-utils/gnc-plugin-manager.h
rename to gnucash/gnome-utils/gnc-plugin-manager.h
diff --git a/src/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
similarity index 100%
rename from src/gnome-utils/gnc-plugin-menu-additions.c
rename to gnucash/gnome-utils/gnc-plugin-menu-additions.c
diff --git a/src/gnome-utils/gnc-plugin-menu-additions.h b/gnucash/gnome-utils/gnc-plugin-menu-additions.h
similarity index 100%
rename from src/gnome-utils/gnc-plugin-menu-additions.h
rename to gnucash/gnome-utils/gnc-plugin-menu-additions.h
diff --git a/src/gnome-utils/gnc-plugin-page.c b/gnucash/gnome-utils/gnc-plugin-page.c
similarity index 100%
rename from src/gnome-utils/gnc-plugin-page.c
rename to gnucash/gnome-utils/gnc-plugin-page.c
diff --git a/src/gnome-utils/gnc-plugin-page.h b/gnucash/gnome-utils/gnc-plugin-page.h
similarity index 100%
rename from src/gnome-utils/gnc-plugin-page.h
rename to gnucash/gnome-utils/gnc-plugin-page.h
diff --git a/src/gnome-utils/gnc-plugin.c b/gnucash/gnome-utils/gnc-plugin.c
similarity index 100%
rename from src/gnome-utils/gnc-plugin.c
rename to gnucash/gnome-utils/gnc-plugin.c
diff --git a/src/gnome-utils/gnc-plugin.h b/gnucash/gnome-utils/gnc-plugin.h
similarity index 100%
rename from src/gnome-utils/gnc-plugin.h
rename to gnucash/gnome-utils/gnc-plugin.h
diff --git a/src/gnome-utils/gnc-query-view.c b/gnucash/gnome-utils/gnc-query-view.c
similarity index 100%
rename from src/gnome-utils/gnc-query-view.c
rename to gnucash/gnome-utils/gnc-query-view.c
diff --git a/src/gnome-utils/gnc-query-view.h b/gnucash/gnome-utils/gnc-query-view.h
similarity index 100%
rename from src/gnome-utils/gnc-query-view.h
rename to gnucash/gnome-utils/gnc-query-view.h
diff --git a/src/gnome-utils/gnc-recurrence.c b/gnucash/gnome-utils/gnc-recurrence.c
similarity index 100%
rename from src/gnome-utils/gnc-recurrence.c
rename to gnucash/gnome-utils/gnc-recurrence.c
diff --git a/src/gnome-utils/gnc-recurrence.h b/gnucash/gnome-utils/gnc-recurrence.h
similarity index 100%
rename from src/gnome-utils/gnc-recurrence.h
rename to gnucash/gnome-utils/gnc-recurrence.h
diff --git a/src/gnome-utils/gnc-splash.c b/gnucash/gnome-utils/gnc-splash.c
similarity index 99%
rename from src/gnome-utils/gnc-splash.c
rename to gnucash/gnome-utils/gnc-splash.c
index 7720633365..83a9f96ffe 100644
--- a/src/gnome-utils/gnc-splash.c
+++ b/gnucash/gnome-utils/gnc-splash.c
@@ -27,7 +27,7 @@
 
 #include "gnc-gnome-utils.h"
 #include "gnc-splash.h"
-#include "core-utils/gnc-version.h"
+#include "gnc-version.h"
 #include "gnc-prefs.h"
 #include "dialog-utils.h"
 
diff --git a/src/gnome-utils/gnc-splash.h b/gnucash/gnome-utils/gnc-splash.h
similarity index 100%
rename from src/gnome-utils/gnc-splash.h
rename to gnucash/gnome-utils/gnc-splash.h
diff --git a/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c b/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
similarity index 100%
rename from src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
rename to gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
diff --git a/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h b/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
similarity index 100%
rename from src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
rename to gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
diff --git a/src/gnome-utils/gnc-sx-list-tree-model-adapter.c b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
similarity index 100%
rename from src/gnome-utils/gnc-sx-list-tree-model-adapter.c
rename to gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
diff --git a/src/gnome-utils/gnc-sx-list-tree-model-adapter.h b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
similarity index 100%
rename from src/gnome-utils/gnc-sx-list-tree-model-adapter.h
rename to gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
diff --git a/src/gnome-utils/gnc-tree-control-split-reg.c b/gnucash/gnome-utils/gnc-tree-control-split-reg.c
similarity index 99%
rename from src/gnome-utils/gnc-tree-control-split-reg.c
rename to gnucash/gnome-utils/gnc-tree-control-split-reg.c
index 728f8cadfb..25ee798e96 100644
--- a/src/gnome-utils/gnc-tree-control-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-control-split-reg.c
@@ -39,7 +39,7 @@
 #include "gnc-ui.h"
 #include "gnc-prefs.h"
 #include "gnc-gdate-utils.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "dialog-utils.h"
 #include "dialog-dup-trans.h"
 #include "dialog-account.h"
diff --git a/src/gnome-utils/gnc-tree-control-split-reg.h b/gnucash/gnome-utils/gnc-tree-control-split-reg.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-control-split-reg.h
rename to gnucash/gnome-utils/gnc-tree-control-split-reg.h
diff --git a/src/gnome-utils/gnc-tree-model-account-types.c b/gnucash/gnome-utils/gnc-tree-model-account-types.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-account-types.c
rename to gnucash/gnome-utils/gnc-tree-model-account-types.c
diff --git a/src/gnome-utils/gnc-tree-model-account-types.h b/gnucash/gnome-utils/gnc-tree-model-account-types.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-account-types.h
rename to gnucash/gnome-utils/gnc-tree-model-account-types.h
diff --git a/src/gnome-utils/gnc-tree-model-account.c b/gnucash/gnome-utils/gnc-tree-model-account.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-account.c
rename to gnucash/gnome-utils/gnc-tree-model-account.c
diff --git a/src/gnome-utils/gnc-tree-model-account.h b/gnucash/gnome-utils/gnc-tree-model-account.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-account.h
rename to gnucash/gnome-utils/gnc-tree-model-account.h
diff --git a/src/gnome-utils/gnc-tree-model-budget.c b/gnucash/gnome-utils/gnc-tree-model-budget.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-budget.c
rename to gnucash/gnome-utils/gnc-tree-model-budget.c
diff --git a/src/gnome-utils/gnc-tree-model-budget.h b/gnucash/gnome-utils/gnc-tree-model-budget.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-budget.h
rename to gnucash/gnome-utils/gnc-tree-model-budget.h
diff --git a/src/gnome-utils/gnc-tree-model-commodity.c b/gnucash/gnome-utils/gnc-tree-model-commodity.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-commodity.c
rename to gnucash/gnome-utils/gnc-tree-model-commodity.c
diff --git a/src/gnome-utils/gnc-tree-model-commodity.h b/gnucash/gnome-utils/gnc-tree-model-commodity.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-commodity.h
rename to gnucash/gnome-utils/gnc-tree-model-commodity.h
diff --git a/src/gnome-utils/gnc-tree-model-owner.c b/gnucash/gnome-utils/gnc-tree-model-owner.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-owner.c
rename to gnucash/gnome-utils/gnc-tree-model-owner.c
diff --git a/src/gnome-utils/gnc-tree-model-owner.h b/gnucash/gnome-utils/gnc-tree-model-owner.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-owner.h
rename to gnucash/gnome-utils/gnc-tree-model-owner.h
diff --git a/src/gnome-utils/gnc-tree-model-price.c b/gnucash/gnome-utils/gnc-tree-model-price.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-price.c
rename to gnucash/gnome-utils/gnc-tree-model-price.c
diff --git a/src/gnome-utils/gnc-tree-model-price.h b/gnucash/gnome-utils/gnc-tree-model-price.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-price.h
rename to gnucash/gnome-utils/gnc-tree-model-price.h
diff --git a/src/gnome-utils/gnc-tree-model-selection.c b/gnucash/gnome-utils/gnc-tree-model-selection.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-selection.c
rename to gnucash/gnome-utils/gnc-tree-model-selection.c
diff --git a/src/gnome-utils/gnc-tree-model-selection.h b/gnucash/gnome-utils/gnc-tree-model-selection.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-selection.h
rename to gnucash/gnome-utils/gnc-tree-model-selection.h
diff --git a/src/gnome-utils/gnc-tree-model-split-reg.c b/gnucash/gnome-utils/gnc-tree-model-split-reg.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-split-reg.c
rename to gnucash/gnome-utils/gnc-tree-model-split-reg.c
diff --git a/src/gnome-utils/gnc-tree-model-split-reg.h b/gnucash/gnome-utils/gnc-tree-model-split-reg.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model-split-reg.h
rename to gnucash/gnome-utils/gnc-tree-model-split-reg.h
diff --git a/src/gnome-utils/gnc-tree-model.c b/gnucash/gnome-utils/gnc-tree-model.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-model.c
rename to gnucash/gnome-utils/gnc-tree-model.c
diff --git a/src/gnome-utils/gnc-tree-model.h b/gnucash/gnome-utils/gnc-tree-model.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-model.h
rename to gnucash/gnome-utils/gnc-tree-model.h
diff --git a/src/gnome-utils/gnc-tree-util-split-reg.c b/gnucash/gnome-utils/gnc-tree-util-split-reg.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-util-split-reg.c
rename to gnucash/gnome-utils/gnc-tree-util-split-reg.c
diff --git a/src/gnome-utils/gnc-tree-util-split-reg.h b/gnucash/gnome-utils/gnc-tree-util-split-reg.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-util-split-reg.h
rename to gnucash/gnome-utils/gnc-tree-util-split-reg.h
diff --git a/src/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-account.c
rename to gnucash/gnome-utils/gnc-tree-view-account.c
diff --git a/src/gnome-utils/gnc-tree-view-account.h b/gnucash/gnome-utils/gnc-tree-view-account.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-account.h
rename to gnucash/gnome-utils/gnc-tree-view-account.h
diff --git a/src/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-commodity.c
rename to gnucash/gnome-utils/gnc-tree-view-commodity.c
diff --git a/src/gnome-utils/gnc-tree-view-commodity.h b/gnucash/gnome-utils/gnc-tree-view-commodity.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-commodity.h
rename to gnucash/gnome-utils/gnc-tree-view-commodity.h
diff --git a/src/gnome-utils/gnc-tree-view-owner.c b/gnucash/gnome-utils/gnc-tree-view-owner.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-owner.c
rename to gnucash/gnome-utils/gnc-tree-view-owner.c
diff --git a/src/gnome-utils/gnc-tree-view-owner.h b/gnucash/gnome-utils/gnc-tree-view-owner.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-owner.h
rename to gnucash/gnome-utils/gnc-tree-view-owner.h
diff --git a/src/gnome-utils/gnc-tree-view-price.c b/gnucash/gnome-utils/gnc-tree-view-price.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-price.c
rename to gnucash/gnome-utils/gnc-tree-view-price.c
diff --git a/src/gnome-utils/gnc-tree-view-price.h b/gnucash/gnome-utils/gnc-tree-view-price.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-price.h
rename to gnucash/gnome-utils/gnc-tree-view-price.h
diff --git a/src/gnome-utils/gnc-tree-view-split-reg.c b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
similarity index 99%
rename from src/gnome-utils/gnc-tree-view-split-reg.c
rename to gnucash/gnome-utils/gnc-tree-view-split-reg.c
index 432970c60f..ab387a98e0 100644
--- a/src/gnome-utils/gnc-tree-view-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
@@ -38,7 +38,7 @@
 #include "gnc-tree-control-split-reg.h"
 #include "gnc-tree-util-split-reg.h"
 #include "gnc-ui.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "dialog-utils.h"
 #include "gnc-prefs.h"
 #include "Transaction.h"
diff --git a/src/gnome-utils/gnc-tree-view-split-reg.h b/gnucash/gnome-utils/gnc-tree-view-split-reg.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-split-reg.h
rename to gnucash/gnome-utils/gnc-tree-view-split-reg.h
diff --git a/src/gnome-utils/gnc-tree-view-sx-list.c b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-sx-list.c
rename to gnucash/gnome-utils/gnc-tree-view-sx-list.c
diff --git a/src/gnome-utils/gnc-tree-view-sx-list.h b/gnucash/gnome-utils/gnc-tree-view-sx-list.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-view-sx-list.h
rename to gnucash/gnome-utils/gnc-tree-view-sx-list.h
diff --git a/src/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c
similarity index 100%
rename from src/gnome-utils/gnc-tree-view.c
rename to gnucash/gnome-utils/gnc-tree-view.c
diff --git a/src/gnome-utils/gnc-tree-view.h b/gnucash/gnome-utils/gnc-tree-view.h
similarity index 100%
rename from src/gnome-utils/gnc-tree-view.h
rename to gnucash/gnome-utils/gnc-tree-view.h
diff --git a/src/gnome-utils/gnc-ui.h b/gnucash/gnome-utils/gnc-ui.h
similarity index 100%
rename from src/gnome-utils/gnc-ui.h
rename to gnucash/gnome-utils/gnc-ui.h
diff --git a/src/gnome-utils/gnc-window.c b/gnucash/gnome-utils/gnc-window.c
similarity index 100%
rename from src/gnome-utils/gnc-window.c
rename to gnucash/gnome-utils/gnc-window.c
diff --git a/src/gnome-utils/gnc-window.h b/gnucash/gnome-utils/gnc-window.h
similarity index 100%
rename from src/gnome-utils/gnc-window.h
rename to gnucash/gnome-utils/gnc-window.h
diff --git a/src/gnome-utils/gncmod-gnome-utils.c b/gnucash/gnome-utils/gncmod-gnome-utils.c
similarity index 100%
rename from src/gnome-utils/gncmod-gnome-utils.c
rename to gnucash/gnome-utils/gncmod-gnome-utils.c
diff --git a/src/gnome-utils/gnome-utils.i b/gnucash/gnome-utils/gnome-utils.i
similarity index 100%
rename from src/gnome-utils/gnome-utils.i
rename to gnucash/gnome-utils/gnome-utils.i
diff --git a/src/gnome-utils/gnome-utils.scm b/gnucash/gnome-utils/gnome-utils.scm
similarity index 100%
rename from src/gnome-utils/gnome-utils.scm
rename to gnucash/gnome-utils/gnome-utils.scm
diff --git a/src/gnome-utils/gschemas/CMakeLists.txt b/gnucash/gnome-utils/gschemas/CMakeLists.txt
similarity index 100%
rename from src/gnome-utils/gschemas/CMakeLists.txt
rename to gnucash/gnome-utils/gschemas/CMakeLists.txt
diff --git a/src/gnome-utils/gschemas/Makefile.am b/gnucash/gnome-utils/gschemas/Makefile.am
similarity index 100%
rename from src/gnome-utils/gschemas/Makefile.am
rename to gnucash/gnome-utils/gschemas/Makefile.am
diff --git a/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in b/gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in
similarity index 100%
rename from src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in
rename to gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in
diff --git a/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in b/gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in
similarity index 100%
rename from src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in
rename to gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in
diff --git a/src/gnome-utils/gtkbuilder/CMakeLists.txt b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
similarity index 100%
rename from src/gnome-utils/gtkbuilder/CMakeLists.txt
rename to gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
diff --git a/src/gnome-utils/gtkbuilder/Makefile.am b/gnucash/gnome-utils/gtkbuilder/Makefile.am
similarity index 100%
rename from src/gnome-utils/gtkbuilder/Makefile.am
rename to gnucash/gnome-utils/gtkbuilder/Makefile.am
diff --git a/src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade b/gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
rename to gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-account.glade b/gnucash/gnome-utils/gtkbuilder/dialog-account.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-account.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-account.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-book-close.glade b/gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-book-close.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-commodity.glade b/gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-commodity.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-file-access.glade b/gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-file-access.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-object-references.glade b/gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-object-references.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-options.glade b/gnucash/gnome-utils/gtkbuilder/dialog-options.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-options.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-options.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-preferences.glade b/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-preferences.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-query-view.glade b/gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-query-view.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-reset-warnings.glade b/gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-tax-table.glade b/gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-tax-table.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-totd.glade b/gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-totd.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-transfer.glade b/gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-transfer.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade
diff --git a/src/gnome-utils/gtkbuilder/dialog-userpass.glade b/gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/dialog-userpass.glade
rename to gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade
diff --git a/src/gnome-utils/gtkbuilder/gnc-date-format.glade b/gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/gnc-date-format.glade
rename to gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade
diff --git a/src/gnome-utils/gtkbuilder/gnc-frequency.glade b/gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/gnc-frequency.glade
rename to gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade
diff --git a/src/gnome-utils/gtkbuilder/gnc-recurrence.glade b/gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/gnc-recurrence.glade
rename to gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade
diff --git a/src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade b/gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
similarity index 100%
rename from src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
rename to gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
diff --git a/src/gnome-utils/make-gnc-warnings-c.xsl b/gnucash/gnome-utils/make-gnc-warnings-c.xsl
similarity index 100%
rename from src/gnome-utils/make-gnc-warnings-c.xsl
rename to gnucash/gnome-utils/make-gnc-warnings-c.xsl
diff --git a/src/gnome-utils/make-gnc-warnings-h.xsl b/gnucash/gnome-utils/make-gnc-warnings-h.xsl
similarity index 100%
rename from src/gnome-utils/make-gnc-warnings-h.xsl
rename to gnucash/gnome-utils/make-gnc-warnings-h.xsl
diff --git a/src/gnome-utils/misc-gnome-utils.c b/gnucash/gnome-utils/misc-gnome-utils.c
similarity index 100%
rename from src/gnome-utils/misc-gnome-utils.c
rename to gnucash/gnome-utils/misc-gnome-utils.c
diff --git a/src/gnome-utils/misc-gnome-utils.h b/gnucash/gnome-utils/misc-gnome-utils.h
similarity index 100%
rename from src/gnome-utils/misc-gnome-utils.h
rename to gnucash/gnome-utils/misc-gnome-utils.h
diff --git a/src/gnome-utils/print-session.c b/gnucash/gnome-utils/print-session.c
similarity index 100%
rename from src/gnome-utils/print-session.c
rename to gnucash/gnome-utils/print-session.c
diff --git a/src/gnome-utils/print-session.h b/gnucash/gnome-utils/print-session.h
similarity index 100%
rename from src/gnome-utils/print-session.h
rename to gnucash/gnome-utils/print-session.h
diff --git a/src/gnome-utils/search-param.c b/gnucash/gnome-utils/search-param.c
similarity index 100%
rename from src/gnome-utils/search-param.c
rename to gnucash/gnome-utils/search-param.c
diff --git a/src/gnome-utils/search-param.h b/gnucash/gnome-utils/search-param.h
similarity index 100%
rename from src/gnome-utils/search-param.h
rename to gnucash/gnome-utils/search-param.h
diff --git a/src/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
similarity index 84%
rename from src/gnome-utils/test/CMakeLists.txt
rename to gnucash/gnome-utils/test/CMakeLists.txt
index 4244d10d3c..647c61cfa7 100644
--- a/src/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 SET(GNOME_UTILS_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
@@ -13,9 +13,9 @@ GNC_ADD_TEST_WITH_GUILE(test-link-module-gnome-utils test-link-module.c
 
 SET(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
   ${GNOME_UTILS_TEST_INCLUDE_DIRS}
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/gnome-utils
-  ${CMAKE_SOURCE_DIR}/src/engine
+  ${CMAKE_BINARY_DIR}/common
+  ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
   ${GTK3_INCLUDE_DIRS}
 )
 SET(GNOME_UTILS_GUI_TEST_LIBS
diff --git a/gnucash/gnome-utils/test/Makefile.am b/gnucash/gnome-utils/test/Makefile.am
new file mode 100644
index 0000000000..f06d47b778
--- /dev/null
+++ b/gnucash/gnome-utils/test/Makefile.am
@@ -0,0 +1,75 @@
+TESTS =  \
+  test-link-module test-load-module
+
+# The following tests are nice, but have absolutely no place in an
+# automated testing system.
+#
+TESTS_GUI = test-gnc-recurrence
+
+##lib_LTLIBRARIES = libgncgnome.la
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/libgnucash/app-utils
+
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  SRCDIR=${srcdir} \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
+  test-link-module test-gnc-recurrence
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/engine/test-core \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/common/test-core \
+  ${GLIB_CFLAGS} \
+  ${GTK_CFLAGS} \
+  ${GUILE_CFLAGS}
+
+LDADD = \
+  ${GNOME_LIBS} \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \
+  ${top_builddir}/common/test-core/libtest-core.la
+
+test_gnc_recurrence_SOURCES=test-gnc-recurrence.c
+test_gnc_recurrence_LDADD = \
+  ${GTK_LIBS} \
+  ${LDADD}
+
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD = \
+  ${GUILE_LIBS} \
+  ${GLIB_LIBS} \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la
+
+EXTRA_DIST = \
+  test-load-module \
+  CMakeLists.txt
+
+testit:
+	libtool --mode execute gdb test-link-module
diff --git a/src/gnome-utils/test/test-gnc-recurrence.c b/gnucash/gnome-utils/test/test-gnc-recurrence.c
similarity index 100%
rename from src/gnome-utils/test/test-gnc-recurrence.c
rename to gnucash/gnome-utils/test/test-gnc-recurrence.c
diff --git a/src/gnome-utils/test/test-link-module.c b/gnucash/gnome-utils/test/test-link-module.c
similarity index 100%
rename from src/gnome-utils/test/test-link-module.c
rename to gnucash/gnome-utils/test/test-link-module.c
diff --git a/src/gnome-utils/test/test-load-module.in b/gnucash/gnome-utils/test/test-load-module.in
similarity index 100%
rename from src/gnome-utils/test/test-load-module.in
rename to gnucash/gnome-utils/test/test-load-module.in
diff --git a/src/gnome-utils/tree-view-utils.c b/gnucash/gnome-utils/tree-view-utils.c
similarity index 100%
rename from src/gnome-utils/tree-view-utils.c
rename to gnucash/gnome-utils/tree-view-utils.c
diff --git a/src/gnome-utils/tree-view-utils.h b/gnucash/gnome-utils/tree-view-utils.h
similarity index 100%
rename from src/gnome-utils/tree-view-utils.h
rename to gnucash/gnome-utils/tree-view-utils.h
diff --git a/src/gnome-utils/ui/CMakeLists.txt b/gnucash/gnome-utils/ui/CMakeLists.txt
similarity index 100%
rename from src/gnome-utils/ui/CMakeLists.txt
rename to gnucash/gnome-utils/ui/CMakeLists.txt
diff --git a/src/gnome-utils/ui/Makefile.am b/gnucash/gnome-utils/ui/Makefile.am
similarity index 100%
rename from src/gnome-utils/ui/Makefile.am
rename to gnucash/gnome-utils/ui/Makefile.am
diff --git a/src/gnome-utils/ui/gnc-main-window-ui.xml b/gnucash/gnome-utils/ui/gnc-main-window-ui.xml
similarity index 100%
rename from src/gnome-utils/ui/gnc-main-window-ui.xml
rename to gnucash/gnome-utils/ui/gnc-main-window-ui.xml
diff --git a/src/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml b/gnucash/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml
similarity index 100%
rename from src/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml
rename to gnucash/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml
diff --git a/src/gnome-utils/ui/gnc-windows-menu-ui.xml b/gnucash/gnome-utils/ui/gnc-windows-menu-ui.xml
similarity index 100%
rename from src/gnome-utils/ui/gnc-windows-menu-ui.xml
rename to gnucash/gnome-utils/ui/gnc-windows-menu-ui.xml
diff --git a/src/gnome-utils/ui/gnucash.css b/gnucash/gnome-utils/ui/gnucash.css
similarity index 100%
rename from src/gnome-utils/ui/gnucash.css
rename to gnucash/gnome-utils/ui/gnucash.css
diff --git a/src/gnome-utils/ui/osx_accel_map b/gnucash/gnome-utils/ui/osx_accel_map
similarity index 100%
rename from src/gnome-utils/ui/osx_accel_map
rename to gnucash/gnome-utils/ui/osx_accel_map
diff --git a/src/gnome-utils/window-main-summarybar.c b/gnucash/gnome-utils/window-main-summarybar.c
similarity index 100%
rename from src/gnome-utils/window-main-summarybar.c
rename to gnucash/gnome-utils/window-main-summarybar.c
diff --git a/src/gnome-utils/window-main-summarybar.h b/gnucash/gnome-utils/window-main-summarybar.h
similarity index 100%
rename from src/gnome-utils/window-main-summarybar.h
rename to gnucash/gnome-utils/window-main-summarybar.h
diff --git a/src/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
similarity index 97%
rename from src/gnome/CMakeLists.txt
rename to gnucash/gnome/CMakeLists.txt
index b8fc331da4..bc32f4948f 100644
--- a/src/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -142,7 +142,10 @@ TARGET_COMPILE_DEFINITIONS (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_M
 
 TARGET_INCLUDE_DIRECTORIES(gnc-gnome
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE ${CMAKE_SOURCE_DIR}/src/app-utils/calculation ${GTK_MAC_INCLUDE_DIRS}
+  PRIVATE
+    ${CMAKE_SOURCE_DIR}/libgnucash/app-utils/calculation
+    ${CMAKE_BINARY_DIR}/gnucash/gnome-utils # for gnc-warnings.h
+    ${GTK_MAC_INCLUDE_DIRS}
 )
 
 
diff --git a/src/gnome/Makefile.am b/gnucash/gnome/Makefile.am
similarity index 70%
rename from src/gnome/Makefile.am
rename to gnucash/gnome/Makefile.am
index 1aa5de1ee3..de44696428 100644
--- a/src/gnome/Makefile.am
+++ b/gnucash/gnome/Makefile.am
@@ -3,18 +3,18 @@ SUBDIRS = gtkbuilder gschemas ui
 lib_LTLIBRARIES = libgnc-gnome.la
 
 libgnc_gnome_la_LIBADD = \
-  ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
-  ${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
-  ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
-  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
-  ${top_builddir}/src/gnome-search/libgncmod-gnome-search.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/html/libgncmod-html.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \
+  ${top_builddir}/gnucash/register/register-gnome/libgncmod-register-gnome.la \
+  ${top_builddir}/gnucash/register/register-core/libgncmod-register-core.la \
+  ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \
+  ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \
+  ${top_builddir}/gnucash/gnome-search/libgncmod-gnome-search.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/html/libgncmod-html.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
   ${LIBXML2_LIBS} \
   ${GUILE_LIBS} \
   ${GTK_LIBS} \
@@ -149,13 +149,13 @@ noinst_HEADERS = \
   window-autoclear.h
 
 if BUILDING_FROM_VCS
-swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
+swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
@@ -168,21 +168,22 @@ EXTRA_DIST = \
   CMakeLists.txt
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/app-utils/calculation \
-  -I${top_srcdir}/src/backend/xml \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/gnome-search \
-  -I${top_srcdir}/src/html \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/report/report-system \
-  -I${top_srcdir}/src/report/report-gnome \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/app-utils/calculation \
+  -I${top_srcdir}/libgnucash/backend/xml \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_builddir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/gnome-search \
+  -I${top_srcdir}/gnucash/html \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/report/report-system \
+  -I${top_srcdir}/gnucash/report/report-gnome \
   -I${top_srcdir}/lib/libc \
   ${LIBXML2_CFLAGS} \
   ${GUILE_CFLAGS} \
diff --git a/src/gnome/assistant-acct-period.c b/gnucash/gnome/assistant-acct-period.c
similarity index 100%
rename from src/gnome/assistant-acct-period.c
rename to gnucash/gnome/assistant-acct-period.c
diff --git a/src/gnome/assistant-acct-period.h b/gnucash/gnome/assistant-acct-period.h
similarity index 100%
rename from src/gnome/assistant-acct-period.h
rename to gnucash/gnome/assistant-acct-period.h
diff --git a/src/gnome/assistant-hierarchy.c b/gnucash/gnome/assistant-hierarchy.c
similarity index 100%
rename from src/gnome/assistant-hierarchy.c
rename to gnucash/gnome/assistant-hierarchy.c
diff --git a/src/gnome/assistant-hierarchy.h b/gnucash/gnome/assistant-hierarchy.h
similarity index 100%
rename from src/gnome/assistant-hierarchy.h
rename to gnucash/gnome/assistant-hierarchy.h
diff --git a/src/gnome/assistant-loan.c b/gnucash/gnome/assistant-loan.c
similarity index 100%
rename from src/gnome/assistant-loan.c
rename to gnucash/gnome/assistant-loan.c
diff --git a/src/gnome/assistant-loan.h b/gnucash/gnome/assistant-loan.h
similarity index 100%
rename from src/gnome/assistant-loan.h
rename to gnucash/gnome/assistant-loan.h
diff --git a/src/gnome/assistant-stock-split.c b/gnucash/gnome/assistant-stock-split.c
similarity index 100%
rename from src/gnome/assistant-stock-split.c
rename to gnucash/gnome/assistant-stock-split.c
diff --git a/src/gnome/assistant-stock-split.h b/gnucash/gnome/assistant-stock-split.h
similarity index 100%
rename from src/gnome/assistant-stock-split.h
rename to gnucash/gnome/assistant-stock-split.h
diff --git a/src/gnome/business-gnome-utils.c b/gnucash/gnome/business-gnome-utils.c
similarity index 100%
rename from src/gnome/business-gnome-utils.c
rename to gnucash/gnome/business-gnome-utils.c
diff --git a/src/gnome/business-gnome-utils.h b/gnucash/gnome/business-gnome-utils.h
similarity index 100%
rename from src/gnome/business-gnome-utils.h
rename to gnucash/gnome/business-gnome-utils.h
diff --git a/src/gnome/business-options-gnome.c b/gnucash/gnome/business-options-gnome.c
similarity index 100%
rename from src/gnome/business-options-gnome.c
rename to gnucash/gnome/business-options-gnome.c
diff --git a/src/gnome/business-options-gnome.h b/gnucash/gnome/business-options-gnome.h
similarity index 100%
rename from src/gnome/business-options-gnome.h
rename to gnucash/gnome/business-options-gnome.h
diff --git a/src/gnome/business-urls.c b/gnucash/gnome/business-urls.c
similarity index 100%
rename from src/gnome/business-urls.c
rename to gnucash/gnome/business-urls.c
diff --git a/src/gnome/business-urls.h b/gnucash/gnome/business-urls.h
similarity index 100%
rename from src/gnome/business-urls.h
rename to gnucash/gnome/business-urls.h
diff --git a/src/gnome/dialog-billterms.c b/gnucash/gnome/dialog-billterms.c
similarity index 100%
rename from src/gnome/dialog-billterms.c
rename to gnucash/gnome/dialog-billterms.c
diff --git a/src/gnome/dialog-billterms.h b/gnucash/gnome/dialog-billterms.h
similarity index 100%
rename from src/gnome/dialog-billterms.h
rename to gnucash/gnome/dialog-billterms.h
diff --git a/src/gnome/dialog-choose-owner.c b/gnucash/gnome/dialog-choose-owner.c
similarity index 100%
rename from src/gnome/dialog-choose-owner.c
rename to gnucash/gnome/dialog-choose-owner.c
diff --git a/src/gnome/dialog-choose-owner.h b/gnucash/gnome/dialog-choose-owner.h
similarity index 100%
rename from src/gnome/dialog-choose-owner.h
rename to gnucash/gnome/dialog-choose-owner.h
diff --git a/src/gnome/dialog-commodities.c b/gnucash/gnome/dialog-commodities.c
similarity index 99%
rename from src/gnome/dialog-commodities.c
rename to gnucash/gnome/dialog-commodities.c
index b317f3bce6..3b45d97a94 100644
--- a/src/gnome/dialog-commodities.c
+++ b/gnucash/gnome/dialog-commodities.c
@@ -38,7 +38,7 @@
 #include "gnc-ui-util.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-session.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 
 
 #define DIALOG_COMMODITIES_CM_CLASS "dialog-commodities"
diff --git a/src/gnome/dialog-customer.c b/gnucash/gnome/dialog-customer.c
similarity index 99%
rename from src/gnome/dialog-customer.c
rename to gnucash/gnome/dialog-customer.c
index 50092410a4..63c2e1c084 100644
--- a/src/gnome/dialog-customer.c
+++ b/gnucash/gnome/dialog-customer.c
@@ -38,8 +38,8 @@
 
 #include "dialog-search.h"
 #include "search-param.h"
-#include "app-utils/QuickFill.h"
-#include "app-utils/gnc-addr-quickfill.h"
+#include "QuickFill.h"
+#include "gnc-addr-quickfill.h"
 
 #include "gncAddress.h"
 #include "gncCustomer.h"
diff --git a/src/gnome/dialog-customer.h b/gnucash/gnome/dialog-customer.h
similarity index 100%
rename from src/gnome/dialog-customer.h
rename to gnucash/gnome/dialog-customer.h
diff --git a/src/gnome/dialog-date-close.c b/gnucash/gnome/dialog-date-close.c
similarity index 100%
rename from src/gnome/dialog-date-close.c
rename to gnucash/gnome/dialog-date-close.c
diff --git a/src/gnome/dialog-date-close.h b/gnucash/gnome/dialog-date-close.h
similarity index 100%
rename from src/gnome/dialog-date-close.h
rename to gnucash/gnome/dialog-date-close.h
diff --git a/src/gnome/dialog-employee.c b/gnucash/gnome/dialog-employee.c
similarity index 100%
rename from src/gnome/dialog-employee.c
rename to gnucash/gnome/dialog-employee.c
diff --git a/src/gnome/dialog-employee.h b/gnucash/gnome/dialog-employee.h
similarity index 100%
rename from src/gnome/dialog-employee.h
rename to gnucash/gnome/dialog-employee.h
diff --git a/src/gnome/dialog-fincalc.c b/gnucash/gnome/dialog-fincalc.c
similarity index 100%
rename from src/gnome/dialog-fincalc.c
rename to gnucash/gnome/dialog-fincalc.c
diff --git a/src/gnome/dialog-fincalc.h b/gnucash/gnome/dialog-fincalc.h
similarity index 100%
rename from src/gnome/dialog-fincalc.h
rename to gnucash/gnome/dialog-fincalc.h
diff --git a/src/gnome/dialog-find-account.c b/gnucash/gnome/dialog-find-account.c
similarity index 100%
rename from src/gnome/dialog-find-account.c
rename to gnucash/gnome/dialog-find-account.c
diff --git a/src/gnome/dialog-find-account.h b/gnucash/gnome/dialog-find-account.h
similarity index 100%
rename from src/gnome/dialog-find-account.h
rename to gnucash/gnome/dialog-find-account.h
diff --git a/src/gnome/dialog-find-transactions.c b/gnucash/gnome/dialog-find-transactions.c
similarity index 100%
rename from src/gnome/dialog-find-transactions.c
rename to gnucash/gnome/dialog-find-transactions.c
diff --git a/src/gnome/dialog-find-transactions.h b/gnucash/gnome/dialog-find-transactions.h
similarity index 100%
rename from src/gnome/dialog-find-transactions.h
rename to gnucash/gnome/dialog-find-transactions.h
diff --git a/src/gnome/dialog-find-transactions2.c b/gnucash/gnome/dialog-find-transactions2.c
similarity index 100%
rename from src/gnome/dialog-find-transactions2.c
rename to gnucash/gnome/dialog-find-transactions2.c
diff --git a/src/gnome/dialog-find-transactions2.h b/gnucash/gnome/dialog-find-transactions2.h
similarity index 100%
rename from src/gnome/dialog-find-transactions2.h
rename to gnucash/gnome/dialog-find-transactions2.h
diff --git a/src/gnome/dialog-imap-editor.c b/gnucash/gnome/dialog-imap-editor.c
similarity index 100%
rename from src/gnome/dialog-imap-editor.c
rename to gnucash/gnome/dialog-imap-editor.c
diff --git a/src/gnome/dialog-imap-editor.h b/gnucash/gnome/dialog-imap-editor.h
similarity index 100%
rename from src/gnome/dialog-imap-editor.h
rename to gnucash/gnome/dialog-imap-editor.h
diff --git a/src/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c
similarity index 100%
rename from src/gnome/dialog-invoice.c
rename to gnucash/gnome/dialog-invoice.c
diff --git a/src/gnome/dialog-invoice.h b/gnucash/gnome/dialog-invoice.h
similarity index 100%
rename from src/gnome/dialog-invoice.h
rename to gnucash/gnome/dialog-invoice.h
diff --git a/src/gnome/dialog-job.c b/gnucash/gnome/dialog-job.c
similarity index 100%
rename from src/gnome/dialog-job.c
rename to gnucash/gnome/dialog-job.c
diff --git a/src/gnome/dialog-job.h b/gnucash/gnome/dialog-job.h
similarity index 100%
rename from src/gnome/dialog-job.h
rename to gnucash/gnome/dialog-job.h
diff --git a/src/gnome/dialog-lot-viewer.c b/gnucash/gnome/dialog-lot-viewer.c
similarity index 100%
rename from src/gnome/dialog-lot-viewer.c
rename to gnucash/gnome/dialog-lot-viewer.c
diff --git a/src/gnome/dialog-lot-viewer.h b/gnucash/gnome/dialog-lot-viewer.h
similarity index 100%
rename from src/gnome/dialog-lot-viewer.h
rename to gnucash/gnome/dialog-lot-viewer.h
diff --git a/src/gnome/dialog-new-user.c b/gnucash/gnome/dialog-new-user.c
similarity index 98%
rename from src/gnome/dialog-new-user.c
rename to gnucash/gnome/dialog-new-user.c
index 52075cef13..2b0ad3de60 100644
--- a/src/gnome/dialog-new-user.c
+++ b/gnucash/gnome/dialog-new-user.c
@@ -37,7 +37,7 @@
 #include "gnc-main-window.h"
 #include "gnc-plugin-page-account-tree.h"
 #include "gnc-session.h"
-#include "app-utils/gnc-ui-util.h" // for gnc_get_current_book
+#include "gnc-ui-util.h" // for gnc_get_current_book
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = GNC_MOD_GUI;
diff --git a/src/gnome/dialog-new-user.h b/gnucash/gnome/dialog-new-user.h
similarity index 100%
rename from src/gnome/dialog-new-user.h
rename to gnucash/gnome/dialog-new-user.h
diff --git a/src/gnome/dialog-order.c b/gnucash/gnome/dialog-order.c
similarity index 99%
rename from src/gnome/dialog-order.c
rename to gnucash/gnome/dialog-order.c
index 099b3effea..981ae918cf 100644
--- a/src/gnome/dialog-order.c
+++ b/gnucash/gnome/dialog-order.c
@@ -47,7 +47,7 @@
 #include "dialog-invoice.h"
 #include "business-gnome-utils.h"
 #include "dialog-date-close.h"
-#include "gnome-search/gnc-general-search.h"
+#include "gnc-general-search.h"
 
 #define DIALOG_NEW_ORDER_CM_CLASS "dialog-new-order"
 #define DIALOG_EDIT_ORDER_CM_CLASS "dialog-edit-order"
diff --git a/src/gnome/dialog-order.h b/gnucash/gnome/dialog-order.h
similarity index 100%
rename from src/gnome/dialog-order.h
rename to gnucash/gnome/dialog-order.h
diff --git a/src/gnome/dialog-payment.c b/gnucash/gnome/dialog-payment.c
similarity index 99%
rename from src/gnome/dialog-payment.c
rename to gnucash/gnome/dialog-payment.c
index c05ed3defe..e684bc09f4 100644
--- a/src/gnome/dialog-payment.c
+++ b/gnucash/gnome/dialog-payment.c
@@ -52,7 +52,7 @@
 
 #include "dialog-transfer.h"
 #include "dialog-print-check.h"
-#include "gnome-search/gnc-general-search.h"
+#include "gnc-general-search.h"
 
 #define DIALOG_PAYMENT_CUSTOMER_CM_CLASS "customer-payment-dialog"
 #define DIALOG_PAYMENT_VENDOR_CM_CLASS "vendor-payment-dialog"
diff --git a/src/gnome/dialog-payment.h b/gnucash/gnome/dialog-payment.h
similarity index 100%
rename from src/gnome/dialog-payment.h
rename to gnucash/gnome/dialog-payment.h
diff --git a/src/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
similarity index 99%
rename from src/gnome/dialog-price-edit-db.c
rename to gnucash/gnome/dialog-price-edit-db.c
index 0cb8cf5d47..9d8cc04ed3 100644
--- a/src/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -45,7 +45,7 @@
 #include "gnc-tree-view-price.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "guile-util.h"
 #include "engine-helpers-guile.h"
 #include "swig-runtime.h"
diff --git a/src/gnome/dialog-price-editor.c b/gnucash/gnome/dialog-price-editor.c
similarity index 100%
rename from src/gnome/dialog-price-editor.c
rename to gnucash/gnome/dialog-price-editor.c
diff --git a/src/gnome/dialog-print-check.c b/gnucash/gnome/dialog-print-check.c
similarity index 100%
rename from src/gnome/dialog-print-check.c
rename to gnucash/gnome/dialog-print-check.c
diff --git a/src/gnome/dialog-print-check.h b/gnucash/gnome/dialog-print-check.h
similarity index 100%
rename from src/gnome/dialog-print-check.h
rename to gnucash/gnome/dialog-print-check.h
diff --git a/src/gnome/dialog-progress.c b/gnucash/gnome/dialog-progress.c
similarity index 100%
rename from src/gnome/dialog-progress.c
rename to gnucash/gnome/dialog-progress.c
diff --git a/src/gnome/dialog-progress.h b/gnucash/gnome/dialog-progress.h
similarity index 100%
rename from src/gnome/dialog-progress.h
rename to gnucash/gnome/dialog-progress.h
diff --git a/src/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c
similarity index 100%
rename from src/gnome/dialog-sx-editor.c
rename to gnucash/gnome/dialog-sx-editor.c
diff --git a/src/gnome/dialog-sx-editor.h b/gnucash/gnome/dialog-sx-editor.h
similarity index 100%
rename from src/gnome/dialog-sx-editor.h
rename to gnucash/gnome/dialog-sx-editor.h
diff --git a/src/gnome/dialog-sx-editor2.c b/gnucash/gnome/dialog-sx-editor2.c
similarity index 100%
rename from src/gnome/dialog-sx-editor2.c
rename to gnucash/gnome/dialog-sx-editor2.c
diff --git a/src/gnome/dialog-sx-editor2.h b/gnucash/gnome/dialog-sx-editor2.h
similarity index 100%
rename from src/gnome/dialog-sx-editor2.h
rename to gnucash/gnome/dialog-sx-editor2.h
diff --git a/src/gnome/dialog-sx-from-trans.c b/gnucash/gnome/dialog-sx-from-trans.c
similarity index 100%
rename from src/gnome/dialog-sx-from-trans.c
rename to gnucash/gnome/dialog-sx-from-trans.c
diff --git a/src/gnome/dialog-sx-from-trans.h b/gnucash/gnome/dialog-sx-from-trans.h
similarity index 100%
rename from src/gnome/dialog-sx-from-trans.h
rename to gnucash/gnome/dialog-sx-from-trans.h
diff --git a/src/gnome/dialog-sx-since-last-run.c b/gnucash/gnome/dialog-sx-since-last-run.c
similarity index 100%
rename from src/gnome/dialog-sx-since-last-run.c
rename to gnucash/gnome/dialog-sx-since-last-run.c
diff --git a/src/gnome/dialog-sx-since-last-run.h b/gnucash/gnome/dialog-sx-since-last-run.h
similarity index 100%
rename from src/gnome/dialog-sx-since-last-run.h
rename to gnucash/gnome/dialog-sx-since-last-run.h
diff --git a/src/gnome/dialog-tax-info.c b/gnucash/gnome/dialog-tax-info.c
similarity index 100%
rename from src/gnome/dialog-tax-info.c
rename to gnucash/gnome/dialog-tax-info.c
diff --git a/src/gnome/dialog-trans-assoc.c b/gnucash/gnome/dialog-trans-assoc.c
similarity index 100%
rename from src/gnome/dialog-trans-assoc.c
rename to gnucash/gnome/dialog-trans-assoc.c
diff --git a/src/gnome/dialog-trans-assoc.h b/gnucash/gnome/dialog-trans-assoc.h
similarity index 100%
rename from src/gnome/dialog-trans-assoc.h
rename to gnucash/gnome/dialog-trans-assoc.h
diff --git a/src/gnome/dialog-vendor.c b/gnucash/gnome/dialog-vendor.c
similarity index 100%
rename from src/gnome/dialog-vendor.c
rename to gnucash/gnome/dialog-vendor.c
diff --git a/src/gnome/dialog-vendor.h b/gnucash/gnome/dialog-vendor.h
similarity index 100%
rename from src/gnome/dialog-vendor.h
rename to gnucash/gnome/dialog-vendor.h
diff --git a/src/gnome/gnc-budget-view.c b/gnucash/gnome/gnc-budget-view.c
similarity index 100%
rename from src/gnome/gnc-budget-view.c
rename to gnucash/gnome/gnc-budget-view.c
diff --git a/src/gnome/gnc-budget-view.h b/gnucash/gnome/gnc-budget-view.h
similarity index 100%
rename from src/gnome/gnc-budget-view.h
rename to gnucash/gnome/gnc-budget-view.h
diff --git a/src/gnome/gnc-plugin-account-tree.c b/gnucash/gnome/gnc-plugin-account-tree.c
similarity index 100%
rename from src/gnome/gnc-plugin-account-tree.c
rename to gnucash/gnome/gnc-plugin-account-tree.c
diff --git a/src/gnome/gnc-plugin-account-tree.h b/gnucash/gnome/gnc-plugin-account-tree.h
similarity index 100%
rename from src/gnome/gnc-plugin-account-tree.h
rename to gnucash/gnome/gnc-plugin-account-tree.h
diff --git a/src/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c
similarity index 100%
rename from src/gnome/gnc-plugin-basic-commands.c
rename to gnucash/gnome/gnc-plugin-basic-commands.c
diff --git a/src/gnome/gnc-plugin-basic-commands.h b/gnucash/gnome/gnc-plugin-basic-commands.h
similarity index 100%
rename from src/gnome/gnc-plugin-basic-commands.h
rename to gnucash/gnome/gnc-plugin-basic-commands.h
diff --git a/src/gnome/gnc-plugin-budget.c b/gnucash/gnome/gnc-plugin-budget.c
similarity index 100%
rename from src/gnome/gnc-plugin-budget.c
rename to gnucash/gnome/gnc-plugin-budget.c
diff --git a/src/gnome/gnc-plugin-budget.h b/gnucash/gnome/gnc-plugin-budget.h
similarity index 100%
rename from src/gnome/gnc-plugin-budget.h
rename to gnucash/gnome/gnc-plugin-budget.h
diff --git a/src/gnome/gnc-plugin-business.c b/gnucash/gnome/gnc-plugin-business.c
similarity index 99%
rename from src/gnome/gnc-plugin-business.c
rename to gnucash/gnome/gnc-plugin-business.c
index 5bcc5a63c7..98d2f31499 100644
--- a/src/gnome/gnc-plugin-business.c
+++ b/gnucash/gnome/gnc-plugin-business.c
@@ -47,10 +47,10 @@
 #include "gnc-file.h"
 #include "guile-mappings.h"
 #include "gnc-session.h"
-#include "gnome-utils/gnc-icons.h" /* for GNC_ICON_INVOICE_NEW */
+#include "gnc-icons.h" /* for GNC_ICON_INVOICE_NEW */
 
 #include "gnc-prefs.h"
-#include "gnome-utils/gnc-main-window.h"
+#include "gnc-main-window.h"
 
 #include "gnc-plugin-page-register.h"
 
diff --git a/src/gnome/gnc-plugin-business.h b/gnucash/gnome/gnc-plugin-business.h
similarity index 100%
rename from src/gnome/gnc-plugin-business.h
rename to gnucash/gnome/gnc-plugin-business.h
diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c
similarity index 100%
rename from src/gnome/gnc-plugin-page-account-tree.c
rename to gnucash/gnome/gnc-plugin-page-account-tree.c
diff --git a/src/gnome/gnc-plugin-page-account-tree.h b/gnucash/gnome/gnc-plugin-page-account-tree.h
similarity index 100%
rename from src/gnome/gnc-plugin-page-account-tree.h
rename to gnucash/gnome/gnc-plugin-page-account-tree.h
diff --git a/src/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c
similarity index 100%
rename from src/gnome/gnc-plugin-page-budget.c
rename to gnucash/gnome/gnc-plugin-page-budget.c
diff --git a/src/gnome/gnc-plugin-page-budget.h b/gnucash/gnome/gnc-plugin-page-budget.h
similarity index 100%
rename from src/gnome/gnc-plugin-page-budget.h
rename to gnucash/gnome/gnc-plugin-page-budget.h
diff --git a/src/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c
similarity index 100%
rename from src/gnome/gnc-plugin-page-invoice.c
rename to gnucash/gnome/gnc-plugin-page-invoice.c
diff --git a/src/gnome/gnc-plugin-page-invoice.h b/gnucash/gnome/gnc-plugin-page-invoice.h
similarity index 100%
rename from src/gnome/gnc-plugin-page-invoice.h
rename to gnucash/gnome/gnc-plugin-page-invoice.h
diff --git a/src/gnome/gnc-plugin-page-owner-tree.c b/gnucash/gnome/gnc-plugin-page-owner-tree.c
similarity index 100%
rename from src/gnome/gnc-plugin-page-owner-tree.c
rename to gnucash/gnome/gnc-plugin-page-owner-tree.c
diff --git a/src/gnome/gnc-plugin-page-owner-tree.h b/gnucash/gnome/gnc-plugin-page-owner-tree.h
similarity index 100%
rename from src/gnome/gnc-plugin-page-owner-tree.h
rename to gnucash/gnome/gnc-plugin-page-owner-tree.h
diff --git a/src/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
similarity index 99%
rename from src/gnome/gnc-plugin-page-register.c
rename to gnucash/gnome/gnc-plugin-page-register.c
index 461b942fc7..3f7fad37e0 100644
--- a/src/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -71,7 +71,7 @@
 #include "gnc-window.h"
 #include "gnc-main-window.h"
 #include "gnc-session.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "gnucash-sheet.h"
 #include "dialog-lot-viewer.h"
 #include "Scrub.h"
diff --git a/src/gnome/gnc-plugin-page-register.h b/gnucash/gnome/gnc-plugin-page-register.h
similarity index 100%
rename from src/gnome/gnc-plugin-page-register.h
rename to gnucash/gnome/gnc-plugin-page-register.h
diff --git a/src/gnome/gnc-plugin-page-register2.c b/gnucash/gnome/gnc-plugin-page-register2.c
similarity index 99%
rename from src/gnome/gnc-plugin-page-register2.c
rename to gnucash/gnome/gnc-plugin-page-register2.c
index cfb2dfaa86..4a2ab28233 100644
--- a/src/gnome/gnc-plugin-page-register2.c
+++ b/gnucash/gnome/gnc-plugin-page-register2.c
@@ -82,7 +82,7 @@
 #include "gnc-window.h"
 #include "gnc-main-window.h"
 #include "gnc-session.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "dialog-lot-viewer.h"
 #include "Scrub.h"
 #include "qof.h"
diff --git a/src/gnome/gnc-plugin-page-register2.h b/gnucash/gnome/gnc-plugin-page-register2.h
similarity index 100%
rename from src/gnome/gnc-plugin-page-register2.h
rename to gnucash/gnome/gnc-plugin-page-register2.h
diff --git a/src/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c
similarity index 100%
rename from src/gnome/gnc-plugin-page-sx-list.c
rename to gnucash/gnome/gnc-plugin-page-sx-list.c
diff --git a/src/gnome/gnc-plugin-page-sx-list.h b/gnucash/gnome/gnc-plugin-page-sx-list.h
similarity index 100%
rename from src/gnome/gnc-plugin-page-sx-list.h
rename to gnucash/gnome/gnc-plugin-page-sx-list.h
diff --git a/src/gnome/gnc-plugin-register.c b/gnucash/gnome/gnc-plugin-register.c
similarity index 100%
rename from src/gnome/gnc-plugin-register.c
rename to gnucash/gnome/gnc-plugin-register.c
diff --git a/src/gnome/gnc-plugin-register.h b/gnucash/gnome/gnc-plugin-register.h
similarity index 100%
rename from src/gnome/gnc-plugin-register.h
rename to gnucash/gnome/gnc-plugin-register.h
diff --git a/src/gnome/gnc-plugin-register2.c b/gnucash/gnome/gnc-plugin-register2.c
similarity index 100%
rename from src/gnome/gnc-plugin-register2.c
rename to gnucash/gnome/gnc-plugin-register2.c
diff --git a/src/gnome/gnc-plugin-register2.h b/gnucash/gnome/gnc-plugin-register2.h
similarity index 100%
rename from src/gnome/gnc-plugin-register2.h
rename to gnucash/gnome/gnc-plugin-register2.h
diff --git a/src/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
similarity index 99%
rename from src/gnome/gnc-split-reg.c
rename to gnucash/gnome/gnc-split-reg.c
index 45602fffda..610b2b4194 100644
--- a/src/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -50,7 +50,7 @@
 #include "gnc-pricedb.h"
 #include "gnc-ui-util.h"
 #include "gnc-ui.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "gnucash-sheet.h"
 #include "gnucash-register.h"
 #include "table-allgui.h"
diff --git a/src/gnome/gnc-split-reg.h b/gnucash/gnome/gnc-split-reg.h
similarity index 100%
rename from src/gnome/gnc-split-reg.h
rename to gnucash/gnome/gnc-split-reg.h
diff --git a/src/gnome/gnc-split-reg2.c b/gnucash/gnome/gnc-split-reg2.c
similarity index 99%
rename from src/gnome/gnc-split-reg2.c
rename to gnucash/gnome/gnc-split-reg2.c
index 3e63338203..92552259ac 100644
--- a/src/gnome/gnc-split-reg2.c
+++ b/gnucash/gnome/gnc-split-reg2.c
@@ -39,7 +39,7 @@
 
 #include "gnc-euro.h"
 #include "gnc-state.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "dialog-utils.h"
 
 #define STATE_SECTION_REG_PREFIX "Register"
diff --git a/src/gnome/gnc-split-reg2.h b/gnucash/gnome/gnc-split-reg2.h
similarity index 100%
rename from src/gnome/gnc-split-reg2.h
rename to gnucash/gnome/gnc-split-reg2.h
diff --git a/src/gnome/gnome.i b/gnucash/gnome/gnome.i
similarity index 100%
rename from src/gnome/gnome.i
rename to gnucash/gnome/gnome.i
diff --git a/src/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in
similarity index 100%
rename from src/gnome/gnucash.appdata.xml.in
rename to gnucash/gnome/gnucash.appdata.xml.in
diff --git a/src/gnome/gnucash.desktop.in.in b/gnucash/gnome/gnucash.desktop.in.in
similarity index 100%
rename from src/gnome/gnucash.desktop.in.in
rename to gnucash/gnome/gnucash.desktop.in.in
diff --git a/src/gnome/gschemas/CMakeLists.txt b/gnucash/gnome/gschemas/CMakeLists.txt
similarity index 100%
rename from src/gnome/gschemas/CMakeLists.txt
rename to gnucash/gnome/gschemas/CMakeLists.txt
diff --git a/src/gnome/gschemas/Makefile.am b/gnucash/gnome/gschemas/Makefile.am
similarity index 100%
rename from src/gnome/gschemas/Makefile.am
rename to gnucash/gnome/gschemas/Makefile.am
diff --git a/src/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in
diff --git a/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in b/gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in
similarity index 100%
rename from src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in
rename to gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in
diff --git a/src/gnome/gtkbuilder/CMakeLists.txt b/gnucash/gnome/gtkbuilder/CMakeLists.txt
similarity index 100%
rename from src/gnome/gtkbuilder/CMakeLists.txt
rename to gnucash/gnome/gtkbuilder/CMakeLists.txt
diff --git a/src/gnome/gtkbuilder/Makefile.am b/gnucash/gnome/gtkbuilder/Makefile.am
similarity index 100%
rename from src/gnome/gtkbuilder/Makefile.am
rename to gnucash/gnome/gtkbuilder/Makefile.am
diff --git a/src/gnome/gtkbuilder/assistant-acct-period.glade b/gnucash/gnome/gtkbuilder/assistant-acct-period.glade
similarity index 100%
rename from src/gnome/gtkbuilder/assistant-acct-period.glade
rename to gnucash/gnome/gtkbuilder/assistant-acct-period.glade
diff --git a/src/gnome/gtkbuilder/assistant-hierarchy.glade b/gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
similarity index 100%
rename from src/gnome/gtkbuilder/assistant-hierarchy.glade
rename to gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
diff --git a/src/gnome/gtkbuilder/assistant-loan.glade b/gnucash/gnome/gtkbuilder/assistant-loan.glade
similarity index 100%
rename from src/gnome/gtkbuilder/assistant-loan.glade
rename to gnucash/gnome/gtkbuilder/assistant-loan.glade
diff --git a/src/gnome/gtkbuilder/assistant-stock-split.glade b/gnucash/gnome/gtkbuilder/assistant-stock-split.glade
similarity index 100%
rename from src/gnome/gtkbuilder/assistant-stock-split.glade
rename to gnucash/gnome/gtkbuilder/assistant-stock-split.glade
diff --git a/src/gnome/gtkbuilder/business-options-gnome.glade b/gnucash/gnome/gtkbuilder/business-options-gnome.glade
similarity index 100%
rename from src/gnome/gtkbuilder/business-options-gnome.glade
rename to gnucash/gnome/gtkbuilder/business-options-gnome.glade
diff --git a/src/gnome/gtkbuilder/business-prefs.glade b/gnucash/gnome/gtkbuilder/business-prefs.glade
similarity index 100%
rename from src/gnome/gtkbuilder/business-prefs.glade
rename to gnucash/gnome/gtkbuilder/business-prefs.glade
diff --git a/src/gnome/gtkbuilder/dialog-billterms.glade b/gnucash/gnome/gtkbuilder/dialog-billterms.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-billterms.glade
rename to gnucash/gnome/gtkbuilder/dialog-billterms.glade
diff --git a/src/gnome/gtkbuilder/dialog-choose-owner.glade b/gnucash/gnome/gtkbuilder/dialog-choose-owner.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-choose-owner.glade
rename to gnucash/gnome/gtkbuilder/dialog-choose-owner.glade
diff --git a/src/gnome/gtkbuilder/dialog-commodities.glade b/gnucash/gnome/gtkbuilder/dialog-commodities.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-commodities.glade
rename to gnucash/gnome/gtkbuilder/dialog-commodities.glade
diff --git a/src/gnome/gtkbuilder/dialog-customer.glade b/gnucash/gnome/gtkbuilder/dialog-customer.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-customer.glade
rename to gnucash/gnome/gtkbuilder/dialog-customer.glade
diff --git a/src/gnome/gtkbuilder/dialog-date-close.glade b/gnucash/gnome/gtkbuilder/dialog-date-close.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-date-close.glade
rename to gnucash/gnome/gtkbuilder/dialog-date-close.glade
diff --git a/src/gnome/gtkbuilder/dialog-employee.glade b/gnucash/gnome/gtkbuilder/dialog-employee.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-employee.glade
rename to gnucash/gnome/gtkbuilder/dialog-employee.glade
diff --git a/src/gnome/gtkbuilder/dialog-fincalc.glade b/gnucash/gnome/gtkbuilder/dialog-fincalc.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-fincalc.glade
rename to gnucash/gnome/gtkbuilder/dialog-fincalc.glade
diff --git a/src/gnome/gtkbuilder/dialog-find-account.glade b/gnucash/gnome/gtkbuilder/dialog-find-account.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-find-account.glade
rename to gnucash/gnome/gtkbuilder/dialog-find-account.glade
diff --git a/src/gnome/gtkbuilder/dialog-imap-editor.glade b/gnucash/gnome/gtkbuilder/dialog-imap-editor.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-imap-editor.glade
rename to gnucash/gnome/gtkbuilder/dialog-imap-editor.glade
diff --git a/src/gnome/gtkbuilder/dialog-invoice.glade b/gnucash/gnome/gtkbuilder/dialog-invoice.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-invoice.glade
rename to gnucash/gnome/gtkbuilder/dialog-invoice.glade
diff --git a/src/gnome/gtkbuilder/dialog-job.glade b/gnucash/gnome/gtkbuilder/dialog-job.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-job.glade
rename to gnucash/gnome/gtkbuilder/dialog-job.glade
diff --git a/src/gnome/gtkbuilder/dialog-lot-viewer.glade b/gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-lot-viewer.glade
rename to gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade
diff --git a/src/gnome/gtkbuilder/dialog-new-user.glade b/gnucash/gnome/gtkbuilder/dialog-new-user.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-new-user.glade
rename to gnucash/gnome/gtkbuilder/dialog-new-user.glade
diff --git a/src/gnome/gtkbuilder/dialog-order.glade b/gnucash/gnome/gtkbuilder/dialog-order.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-order.glade
rename to gnucash/gnome/gtkbuilder/dialog-order.glade
diff --git a/src/gnome/gtkbuilder/dialog-payment.glade b/gnucash/gnome/gtkbuilder/dialog-payment.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-payment.glade
rename to gnucash/gnome/gtkbuilder/dialog-payment.glade
diff --git a/src/gnome/gtkbuilder/dialog-price.glade b/gnucash/gnome/gtkbuilder/dialog-price.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-price.glade
rename to gnucash/gnome/gtkbuilder/dialog-price.glade
diff --git a/src/gnome/gtkbuilder/dialog-print-check.glade b/gnucash/gnome/gtkbuilder/dialog-print-check.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-print-check.glade
rename to gnucash/gnome/gtkbuilder/dialog-print-check.glade
diff --git a/src/gnome/gtkbuilder/dialog-progress.glade b/gnucash/gnome/gtkbuilder/dialog-progress.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-progress.glade
rename to gnucash/gnome/gtkbuilder/dialog-progress.glade
diff --git a/src/gnome/gtkbuilder/dialog-sx.glade b/gnucash/gnome/gtkbuilder/dialog-sx.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-sx.glade
rename to gnucash/gnome/gtkbuilder/dialog-sx.glade
diff --git a/src/gnome/gtkbuilder/dialog-tax-info.glade b/gnucash/gnome/gtkbuilder/dialog-tax-info.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-tax-info.glade
rename to gnucash/gnome/gtkbuilder/dialog-tax-info.glade
diff --git a/src/gnome/gtkbuilder/dialog-trans-assoc.glade b/gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-trans-assoc.glade
rename to gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade
diff --git a/src/gnome/gtkbuilder/dialog-vendor.glade b/gnucash/gnome/gtkbuilder/dialog-vendor.glade
similarity index 100%
rename from src/gnome/gtkbuilder/dialog-vendor.glade
rename to gnucash/gnome/gtkbuilder/dialog-vendor.glade
diff --git a/src/gnome/gtkbuilder/gnc-plugin-page-budget.glade b/gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade
similarity index 100%
rename from src/gnome/gtkbuilder/gnc-plugin-page-budget.glade
rename to gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade
diff --git a/src/gnome/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
similarity index 100%
rename from src/gnome/gtkbuilder/gnc-plugin-page-register.glade
rename to gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
diff --git a/src/gnome/gtkbuilder/gnc-plugin-page-register2.glade b/gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade
similarity index 100%
rename from src/gnome/gtkbuilder/gnc-plugin-page-register2.glade
rename to gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade
diff --git a/src/gnome/gtkbuilder/window-autoclear.glade b/gnucash/gnome/gtkbuilder/window-autoclear.glade
similarity index 100%
rename from src/gnome/gtkbuilder/window-autoclear.glade
rename to gnucash/gnome/gtkbuilder/window-autoclear.glade
diff --git a/src/gnome/gtkbuilder/window-reconcile.glade b/gnucash/gnome/gtkbuilder/window-reconcile.glade
similarity index 100%
rename from src/gnome/gtkbuilder/window-reconcile.glade
rename to gnucash/gnome/gtkbuilder/window-reconcile.glade
diff --git a/src/gnome/reconcile-view.c b/gnucash/gnome/reconcile-view.c
similarity index 100%
rename from src/gnome/reconcile-view.c
rename to gnucash/gnome/reconcile-view.c
diff --git a/src/gnome/reconcile-view.h b/gnucash/gnome/reconcile-view.h
similarity index 100%
rename from src/gnome/reconcile-view.h
rename to gnucash/gnome/reconcile-view.h
diff --git a/src/gnome/search-owner.c b/gnucash/gnome/search-owner.c
similarity index 100%
rename from src/gnome/search-owner.c
rename to gnucash/gnome/search-owner.c
diff --git a/src/gnome/search-owner.h b/gnucash/gnome/search-owner.h
similarity index 100%
rename from src/gnome/search-owner.h
rename to gnucash/gnome/search-owner.h
diff --git a/src/gnome/top-level.c b/gnucash/gnome/top-level.c
similarity index 100%
rename from src/gnome/top-level.c
rename to gnucash/gnome/top-level.c
diff --git a/src/gnome/top-level.h b/gnucash/gnome/top-level.h
similarity index 100%
rename from src/gnome/top-level.h
rename to gnucash/gnome/top-level.h
diff --git a/src/gnome/ui/CMakeLists.txt b/gnucash/gnome/ui/CMakeLists.txt
similarity index 100%
rename from src/gnome/ui/CMakeLists.txt
rename to gnucash/gnome/ui/CMakeLists.txt
diff --git a/src/gnome/ui/Makefile.am b/gnucash/gnome/ui/Makefile.am
similarity index 100%
rename from src/gnome/ui/Makefile.am
rename to gnucash/gnome/ui/Makefile.am
diff --git a/src/gnome/ui/gnc-plugin-account-tree-ui.xml b/gnucash/gnome/ui/gnc-plugin-account-tree-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-account-tree-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-account-tree-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-basic-commands-ui.xml b/gnucash/gnome/ui/gnc-plugin-basic-commands-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-basic-commands-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-basic-commands-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-budget-ui.xml b/gnucash/gnome/ui/gnc-plugin-budget-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-budget-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-budget-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-business-ui.xml b/gnucash/gnome/ui/gnc-plugin-business-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-business-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-business-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-file-history-ui.xml b/gnucash/gnome/ui/gnc-plugin-file-history-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-file-history-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-file-history-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-account-tree-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-account-tree-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-budget-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-budget-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-budget-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-budget-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-invoice-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-invoice-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-invoice-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-invoice-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-owner-tree-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-owner-tree-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-owner-tree-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-owner-tree-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-register-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-register-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-register-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-register-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-register2-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-register2-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-register2-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-register2-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-sx-list-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-sx-list-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-sx-list-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-sx-list-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-sx-list2-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-sx-list2-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-sx-list2-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-sx-list2-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-page-sxregister-ui.xml b/gnucash/gnome/ui/gnc-plugin-page-sxregister-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-page-sxregister-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-page-sxregister-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-register-ui.xml b/gnucash/gnome/ui/gnc-plugin-register-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-register-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-register-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-register2-ui.xml b/gnucash/gnome/ui/gnc-plugin-register2-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-register2-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-register2-ui.xml
diff --git a/src/gnome/ui/gnc-plugin-register22-ui.xml b/gnucash/gnome/ui/gnc-plugin-register22-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-plugin-register22-ui.xml
rename to gnucash/gnome/ui/gnc-plugin-register22-ui.xml
diff --git a/src/gnome/ui/gnc-reconcile-window-ui.xml b/gnucash/gnome/ui/gnc-reconcile-window-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-reconcile-window-ui.xml
rename to gnucash/gnome/ui/gnc-reconcile-window-ui.xml
diff --git a/src/gnome/ui/gnc-sxed-to-create-window-ui.xml b/gnucash/gnome/ui/gnc-sxed-to-create-window-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-sxed-to-create-window-ui.xml
rename to gnucash/gnome/ui/gnc-sxed-to-create-window-ui.xml
diff --git a/src/gnome/ui/gnc-sxed-window-ui-full.xml b/gnucash/gnome/ui/gnc-sxed-window-ui-full.xml
similarity index 100%
rename from src/gnome/ui/gnc-sxed-window-ui-full.xml
rename to gnucash/gnome/ui/gnc-sxed-window-ui-full.xml
diff --git a/src/gnome/ui/gnc-sxed-window-ui.xml b/gnucash/gnome/ui/gnc-sxed-window-ui.xml
similarity index 100%
rename from src/gnome/ui/gnc-sxed-window-ui.xml
rename to gnucash/gnome/ui/gnc-sxed-window-ui.xml
diff --git a/src/gnome/window-autoclear.c b/gnucash/gnome/window-autoclear.c
similarity index 100%
rename from src/gnome/window-autoclear.c
rename to gnucash/gnome/window-autoclear.c
diff --git a/src/gnome/window-autoclear.h b/gnucash/gnome/window-autoclear.h
similarity index 100%
rename from src/gnome/window-autoclear.h
rename to gnucash/gnome/window-autoclear.h
diff --git a/src/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
similarity index 100%
rename from src/gnome/window-reconcile.c
rename to gnucash/gnome/window-reconcile.c
diff --git a/src/gnome/window-reconcile.h b/gnucash/gnome/window-reconcile.h
similarity index 100%
rename from src/gnome/window-reconcile.h
rename to gnucash/gnome/window-reconcile.h
diff --git a/src/gnome/window-reconcile2.c b/gnucash/gnome/window-reconcile2.c
similarity index 100%
rename from src/gnome/window-reconcile2.c
rename to gnucash/gnome/window-reconcile2.c
diff --git a/src/gnome/window-reconcile2.h b/gnucash/gnome/window-reconcile2.h
similarity index 100%
rename from src/gnome/window-reconcile2.h
rename to gnucash/gnome/window-reconcile2.h
diff --git a/src/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt
similarity index 100%
rename from src/html/CMakeLists.txt
rename to gnucash/html/CMakeLists.txt
diff --git a/src/html/Makefile.am b/gnucash/html/Makefile.am
similarity index 70%
rename from src/html/Makefile.am
rename to gnucash/html/Makefile.am
index 2826b43eef..94f013792a 100644
--- a/src/html/Makefile.am
+++ b/gnucash/html/Makefile.am
@@ -4,13 +4,13 @@ SUBDIRS = .
 pkglib_LTLIBRARIES = libgncmod-html.la
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
   -I${top_srcdir}/lib/libc \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \
@@ -39,11 +39,11 @@ gncinclude_HEADERS = \
 libgncmod_html_la_LDFLAGS = -avoid-version
 
 libgncmod_html_la_LIBADD = \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
   $(top_builddir)/lib/libc/libc-missing.la \
   ${WEBKIT_LIBS} \
   ${GTK_LIBS} \
@@ -54,13 +54,13 @@ libgncmod_html_la_LIBADD = \
 
 if BUILDING_FROM_VCS
 swig-gnc-html.c: gnc-html.i gnc-html.h \
-                    ${top_srcdir}/src/base-typemaps.i
+                    ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
diff --git a/src/html/gnc-html-extras.h b/gnucash/html/gnc-html-extras.h
similarity index 100%
rename from src/html/gnc-html-extras.h
rename to gnucash/html/gnc-html-extras.h
diff --git a/src/html/gnc-html-factory.c b/gnucash/html/gnc-html-factory.c
similarity index 100%
rename from src/html/gnc-html-factory.c
rename to gnucash/html/gnc-html-factory.c
diff --git a/src/html/gnc-html-factory.h b/gnucash/html/gnc-html-factory.h
similarity index 100%
rename from src/html/gnc-html-factory.h
rename to gnucash/html/gnc-html-factory.h
diff --git a/src/html/gnc-html-history.c b/gnucash/html/gnc-html-history.c
similarity index 100%
rename from src/html/gnc-html-history.c
rename to gnucash/html/gnc-html-history.c
diff --git a/src/html/gnc-html-history.h b/gnucash/html/gnc-html-history.h
similarity index 100%
rename from src/html/gnc-html-history.h
rename to gnucash/html/gnc-html-history.h
diff --git a/src/html/gnc-html-p.h b/gnucash/html/gnc-html-p.h
similarity index 100%
rename from src/html/gnc-html-p.h
rename to gnucash/html/gnc-html-p.h
diff --git a/src/html/gnc-html-webkit-p.h b/gnucash/html/gnc-html-webkit-p.h
similarity index 100%
rename from src/html/gnc-html-webkit-p.h
rename to gnucash/html/gnc-html-webkit-p.h
diff --git a/src/html/gnc-html-webkit.h b/gnucash/html/gnc-html-webkit.h
similarity index 100%
rename from src/html/gnc-html-webkit.h
rename to gnucash/html/gnc-html-webkit.h
diff --git a/src/html/gnc-html-webkit1.c b/gnucash/html/gnc-html-webkit1.c
similarity index 100%
rename from src/html/gnc-html-webkit1.c
rename to gnucash/html/gnc-html-webkit1.c
diff --git a/src/html/gnc-html-webkit1.h b/gnucash/html/gnc-html-webkit1.h
similarity index 100%
rename from src/html/gnc-html-webkit1.h
rename to gnucash/html/gnc-html-webkit1.h
diff --git a/src/html/gnc-html-webkit2.c b/gnucash/html/gnc-html-webkit2.c
similarity index 100%
rename from src/html/gnc-html-webkit2.c
rename to gnucash/html/gnc-html-webkit2.c
diff --git a/src/html/gnc-html-webkit2.h b/gnucash/html/gnc-html-webkit2.h
similarity index 100%
rename from src/html/gnc-html-webkit2.h
rename to gnucash/html/gnc-html-webkit2.h
diff --git a/src/html/gnc-html.c b/gnucash/html/gnc-html.c
similarity index 100%
rename from src/html/gnc-html.c
rename to gnucash/html/gnc-html.c
diff --git a/src/html/gnc-html.h b/gnucash/html/gnc-html.h
similarity index 100%
rename from src/html/gnc-html.h
rename to gnucash/html/gnc-html.h
diff --git a/src/html/gnc-html.i b/gnucash/html/gnc-html.i
similarity index 100%
rename from src/html/gnc-html.i
rename to gnucash/html/gnc-html.i
diff --git a/src/html/gncmod-html.c b/gnucash/html/gncmod-html.c
similarity index 100%
rename from src/html/gncmod-html.c
rename to gnucash/html/gncmod-html.c
diff --git a/src/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt
similarity index 98%
rename from src/import-export/CMakeLists.txt
rename to gnucash/import-export/CMakeLists.txt
index 904183e08d..4b9ba66d29 100644
--- a/src/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/import-export
+# CMakeLists.txt for gnucash/import-export
 
 ADD_SUBDIRECTORY(test)
 
diff --git a/src/import-export/Makefile.am b/gnucash/import-export/Makefile.am
similarity index 68%
rename from src/import-export/Makefile.am
rename to gnucash/import-export/Makefile.am
index b276d0a2b3..3fdcf96384 100644
--- a/src/import-export/Makefile.am
+++ b/gnucash/import-export/Makefile.am
@@ -39,11 +39,11 @@ noinst_HEADERS = \
 libgncmod_generic_import_la_LDFLAGS = -avoid-version
 
 libgncmod_generic_import_la_LIBADD = \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${REGEX_LIBS} \
   ${GLIB_LIBS}
 
@@ -51,13 +51,13 @@ gtkbuilderdir = ${GNC_GTKBUILDER_DIR}
 gtkbuilder_DATA = dialog-import.glade
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/gnome-utils \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/gnome-utils \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
 
diff --git a/src/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
similarity index 97%
rename from src/import-export/aqb/CMakeLists.txt
rename to gnucash/import-export/aqb/CMakeLists.txt
index 1355444270..8a64933855 100644
--- a/src/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/import-export/aqbanking
+# CMakeLists.txt for gnucash/import-export/aqbanking
 
 ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
diff --git a/src/import-export/aqb/Makefile.am b/gnucash/import-export/aqb/Makefile.am
similarity index 59%
rename from src/import-export/aqb/Makefile.am
rename to gnucash/import-export/aqb/Makefile.am
index 7ee956a821..d699d80ae3 100644
--- a/src/import-export/aqb/Makefile.am
+++ b/gnucash/import-export/aqb/Makefile.am
@@ -34,30 +34,30 @@ if OS_WIN32
 libgncmod_aqbanking_la_LDFLAGS += -export-symbols-regex .*
 endif
 libgncmod_aqbanking_la_LIBADD = \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${GTK_LIBS} \
   ${GLIB_LIBS} \
   ${GWENGUI_GTK2_LIBS} \
   ${AQBANKING_LIBS}
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/import-export \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/gnucash/import-export \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${AQBANKING_CFLAGS}
diff --git a/src/import-export/aqb/assistant-ab-initial.c b/gnucash/import-export/aqb/assistant-ab-initial.c
similarity index 100%
rename from src/import-export/aqb/assistant-ab-initial.c
rename to gnucash/import-export/aqb/assistant-ab-initial.c
diff --git a/src/import-export/aqb/assistant-ab-initial.glade b/gnucash/import-export/aqb/assistant-ab-initial.glade
similarity index 100%
rename from src/import-export/aqb/assistant-ab-initial.glade
rename to gnucash/import-export/aqb/assistant-ab-initial.glade
diff --git a/src/import-export/aqb/assistant-ab-initial.h b/gnucash/import-export/aqb/assistant-ab-initial.h
similarity index 100%
rename from src/import-export/aqb/assistant-ab-initial.h
rename to gnucash/import-export/aqb/assistant-ab-initial.h
diff --git a/src/import-export/aqb/dialog-ab-daterange.c b/gnucash/import-export/aqb/dialog-ab-daterange.c
similarity index 100%
rename from src/import-export/aqb/dialog-ab-daterange.c
rename to gnucash/import-export/aqb/dialog-ab-daterange.c
diff --git a/src/import-export/aqb/dialog-ab-daterange.h b/gnucash/import-export/aqb/dialog-ab-daterange.h
similarity index 100%
rename from src/import-export/aqb/dialog-ab-daterange.h
rename to gnucash/import-export/aqb/dialog-ab-daterange.h
diff --git a/src/import-export/aqb/dialog-ab-pref.glade b/gnucash/import-export/aqb/dialog-ab-pref.glade
similarity index 100%
rename from src/import-export/aqb/dialog-ab-pref.glade
rename to gnucash/import-export/aqb/dialog-ab-pref.glade
diff --git a/src/import-export/aqb/dialog-ab-trans.c b/gnucash/import-export/aqb/dialog-ab-trans.c
similarity index 100%
rename from src/import-export/aqb/dialog-ab-trans.c
rename to gnucash/import-export/aqb/dialog-ab-trans.c
diff --git a/src/import-export/aqb/dialog-ab-trans.h b/gnucash/import-export/aqb/dialog-ab-trans.h
similarity index 100%
rename from src/import-export/aqb/dialog-ab-trans.h
rename to gnucash/import-export/aqb/dialog-ab-trans.h
diff --git a/src/import-export/aqb/dialog-ab.glade b/gnucash/import-export/aqb/dialog-ab.glade
similarity index 100%
rename from src/import-export/aqb/dialog-ab.glade
rename to gnucash/import-export/aqb/dialog-ab.glade
diff --git a/src/import-export/aqb/gnc-ab-getbalance.c b/gnucash/import-export/aqb/gnc-ab-getbalance.c
similarity index 100%
rename from src/import-export/aqb/gnc-ab-getbalance.c
rename to gnucash/import-export/aqb/gnc-ab-getbalance.c
diff --git a/src/import-export/aqb/gnc-ab-getbalance.h b/gnucash/import-export/aqb/gnc-ab-getbalance.h
similarity index 100%
rename from src/import-export/aqb/gnc-ab-getbalance.h
rename to gnucash/import-export/aqb/gnc-ab-getbalance.h
diff --git a/src/import-export/aqb/gnc-ab-gettrans.c b/gnucash/import-export/aqb/gnc-ab-gettrans.c
similarity index 100%
rename from src/import-export/aqb/gnc-ab-gettrans.c
rename to gnucash/import-export/aqb/gnc-ab-gettrans.c
diff --git a/src/import-export/aqb/gnc-ab-gettrans.h b/gnucash/import-export/aqb/gnc-ab-gettrans.h
similarity index 100%
rename from src/import-export/aqb/gnc-ab-gettrans.h
rename to gnucash/import-export/aqb/gnc-ab-gettrans.h
diff --git a/src/import-export/aqb/gnc-ab-kvp.c b/gnucash/import-export/aqb/gnc-ab-kvp.c
similarity index 100%
rename from src/import-export/aqb/gnc-ab-kvp.c
rename to gnucash/import-export/aqb/gnc-ab-kvp.c
diff --git a/src/import-export/aqb/gnc-ab-kvp.h b/gnucash/import-export/aqb/gnc-ab-kvp.h
similarity index 100%
rename from src/import-export/aqb/gnc-ab-kvp.h
rename to gnucash/import-export/aqb/gnc-ab-kvp.h
diff --git a/src/import-export/aqb/gnc-ab-transfer.c b/gnucash/import-export/aqb/gnc-ab-transfer.c
similarity index 100%
rename from src/import-export/aqb/gnc-ab-transfer.c
rename to gnucash/import-export/aqb/gnc-ab-transfer.c
diff --git a/src/import-export/aqb/gnc-ab-transfer.h b/gnucash/import-export/aqb/gnc-ab-transfer.h
similarity index 100%
rename from src/import-export/aqb/gnc-ab-transfer.h
rename to gnucash/import-export/aqb/gnc-ab-transfer.h
diff --git a/src/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
similarity index 100%
rename from src/import-export/aqb/gnc-ab-utils.c
rename to gnucash/import-export/aqb/gnc-ab-utils.c
diff --git a/src/import-export/aqb/gnc-ab-utils.h b/gnucash/import-export/aqb/gnc-ab-utils.h
similarity index 100%
rename from src/import-export/aqb/gnc-ab-utils.h
rename to gnucash/import-export/aqb/gnc-ab-utils.h
diff --git a/src/import-export/aqb/gnc-file-aqb-import.c b/gnucash/import-export/aqb/gnc-file-aqb-import.c
similarity index 100%
rename from src/import-export/aqb/gnc-file-aqb-import.c
rename to gnucash/import-export/aqb/gnc-file-aqb-import.c
diff --git a/src/import-export/aqb/gnc-file-aqb-import.h b/gnucash/import-export/aqb/gnc-file-aqb-import.h
similarity index 100%
rename from src/import-export/aqb/gnc-file-aqb-import.h
rename to gnucash/import-export/aqb/gnc-file-aqb-import.h
diff --git a/src/import-export/aqb/gnc-gwen-gui.c b/gnucash/import-export/aqb/gnc-gwen-gui.c
similarity index 100%
rename from src/import-export/aqb/gnc-gwen-gui.c
rename to gnucash/import-export/aqb/gnc-gwen-gui.c
diff --git a/src/import-export/aqb/gnc-gwen-gui.h b/gnucash/import-export/aqb/gnc-gwen-gui.h
similarity index 100%
rename from src/import-export/aqb/gnc-gwen-gui.h
rename to gnucash/import-export/aqb/gnc-gwen-gui.h
diff --git a/src/import-export/aqb/gnc-plugin-aqbanking-ui.xml b/gnucash/import-export/aqb/gnc-plugin-aqbanking-ui.xml
similarity index 100%
rename from src/import-export/aqb/gnc-plugin-aqbanking-ui.xml
rename to gnucash/import-export/aqb/gnc-plugin-aqbanking-ui.xml
diff --git a/src/import-export/aqb/gnc-plugin-aqbanking.c b/gnucash/import-export/aqb/gnc-plugin-aqbanking.c
similarity index 100%
rename from src/import-export/aqb/gnc-plugin-aqbanking.c
rename to gnucash/import-export/aqb/gnc-plugin-aqbanking.c
diff --git a/src/import-export/aqb/gnc-plugin-aqbanking.h b/gnucash/import-export/aqb/gnc-plugin-aqbanking.h
similarity index 100%
rename from src/import-export/aqb/gnc-plugin-aqbanking.h
rename to gnucash/import-export/aqb/gnc-plugin-aqbanking.h
diff --git a/src/import-export/aqb/gncmod-aqbanking.c b/gnucash/import-export/aqb/gncmod-aqbanking.c
similarity index 100%
rename from src/import-export/aqb/gncmod-aqbanking.c
rename to gnucash/import-export/aqb/gncmod-aqbanking.c
diff --git a/src/import-export/aqb/gschemas/CMakeLists.txt b/gnucash/import-export/aqb/gschemas/CMakeLists.txt
similarity index 100%
rename from src/import-export/aqb/gschemas/CMakeLists.txt
rename to gnucash/import-export/aqb/gschemas/CMakeLists.txt
diff --git a/src/import-export/aqb/gschemas/Makefile.am b/gnucash/import-export/aqb/gschemas/Makefile.am
similarity index 100%
rename from src/import-export/aqb/gschemas/Makefile.am
rename to gnucash/import-export/aqb/gschemas/Makefile.am
diff --git a/src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in b/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in
similarity index 100%
rename from src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in
rename to gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in
diff --git a/src/import-export/aqb/migratable-prefs-aqbanking.xml b/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml
similarity index 100%
rename from src/import-export/aqb/migratable-prefs-aqbanking.xml
rename to gnucash/import-export/aqb/migratable-prefs-aqbanking.xml
diff --git a/src/import-export/aqb/test/CMakeLists.txt b/gnucash/import-export/aqb/test/CMakeLists.txt
similarity index 54%
rename from src/import-export/aqb/test/CMakeLists.txt
rename to gnucash/import-export/aqb/test/CMakeLists.txt
index 2fd2379d47..f665052fa3 100644
--- a/src/import-export/aqb/test/CMakeLists.txt
+++ b/gnucash/import-export/aqb/test/CMakeLists.txt
@@ -1,19 +1,19 @@
 set(test_aqb_SOURCES test-aqb.c test-kvp.c)
 
 set(test_aqb_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/import-export/aqb
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/import-export
-  ${CMAKE_SOURCE_DIR}/src/gnome
-  ${CMAKE_SOURCE_DIR}/src/register/ledger-core
-  ${CMAKE_SOURCE_DIR}/src/register/regiser-gnome
-  ${CMAKE_SOURCE_DIR}/src/register/regitser-core
-  ${CMAKE_SOURCE_DIR}/src/gnome-utils
-  ${CMAKE_SOURCE_DIR}/src/app-utils
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/core-utils
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_BINARY_DIR}/common
+  ${CMAKE_SOURCE_DIR}/gnucash/import-export/aqb
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/gnucash/import-export
+  ${CMAKE_SOURCE_DIR}/gnucash/gnome
+  ${CMAKE_SOURCE_DIR}/gnucash/register/ledger-core
+  ${CMAKE_SOURCE_DIR}/gnucash/register/regiser-gnome
+  ${CMAKE_SOURCE_DIR}/gnucash/register/regitser-core
+  ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
+  ${CMAKE_SOURCE_DIR}/libgnucash/app-utils
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GLIB2_INCLUDE_DIRS}
   ${GTK_INCLUDE_DIRS}
   ${AQBANKING_INCLUDE_DIRS}
diff --git a/src/import-export/aqb/test/Makefile.am b/gnucash/import-export/aqb/test/Makefile.am
similarity index 51%
rename from src/import-export/aqb/test/Makefile.am
rename to gnucash/import-export/aqb/test/Makefile.am
index e2abe129c6..830d794153 100644
--- a/src/import-export/aqb/test/Makefile.am
+++ b/gnucash/import-export/aqb/test/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/test-templates/Makefile.decl
 
 #You will only need one of these: It points to the module directory
 #after $(top_srcdir) or ${top_builddir}:
-MODULEPATH = src/import-export/aqb
+MODULEPATH = gnucash/import-export/aqb
 
 #The test program. You'll need to add to this if you have more than one module above.
 
@@ -30,33 +30,34 @@ test_aqb_HEADERSS =
 #as independent as possible.
 test_aqb_LDADD = \
   ${top_builddir}/${MODULEPATH}/libgncmod-aqbanking.la \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
-  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \
+  ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${GLIB_LIBS}
 
 test_aqb_CFLAGS = \
 	-DTESTPROG=test_aqb \
 	${DEFAULT_INCLUDES} \
 	-I$(top_srcdir)/${MODULEPATH}/ \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/import-export \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/gnucash/import-export \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/backend/xml \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${AQBANKING_CFLAGS}
diff --git a/src/import-export/aqb/test/file-book-hbcislot.gnucash b/gnucash/import-export/aqb/test/file-book-hbcislot.gnucash
similarity index 100%
rename from src/import-export/aqb/test/file-book-hbcislot.gnucash
rename to gnucash/import-export/aqb/test/file-book-hbcislot.gnucash
diff --git a/src/import-export/aqb/test/file-book.gnucash b/gnucash/import-export/aqb/test/file-book.gnucash
similarity index 100%
rename from src/import-export/aqb/test/file-book.gnucash
rename to gnucash/import-export/aqb/test/file-book.gnucash
diff --git a/src/import-export/aqb/test/test-aqb.c b/gnucash/import-export/aqb/test/test-aqb.c
similarity index 92%
rename from src/import-export/aqb/test/test-aqb.c
rename to gnucash/import-export/aqb/test/test-aqb.c
index 95c8860de8..2fd7b12d61 100644
--- a/src/import-export/aqb/test/test-aqb.c
+++ b/gnucash/import-export/aqb/test/test-aqb.c
@@ -26,10 +26,10 @@ Write and link other test files */
 #include <glib.h>
 #include "config.h"
 #include <qof.h>
-#include "backend/xml/gnc-backend-xml.h"
-#include "gnc-module/gnc-module.h"
-#include "engine/gnc-engine.h"
-#include <engine/TransLog.h>
+#include "gnc-backend-xml.h"
+#include "gnc-module.h"
+#include "gnc-engine.h"
+#include <TransLog.h>
 
 extern void test_qofsession_aqb_kvp( void );
 
@@ -53,7 +53,7 @@ main (int   argc,
      * http://library.gnome.org/devel/glib/stable/glib-Testing.html for
      * details. Unfortunately, GLib-Testing doesn't provide the automatic
      * registration features of more sophisticated frameworks. */
-    g_test_add_func ("/src/import-export/aqb/kvp", test_qofsession_aqb_kvp);
+    g_test_add_func ("/import-export/aqb/kvp", test_qofsession_aqb_kvp);
 
     return g_test_run();
 }
diff --git a/src/import-export/aqb/test/test-kvp.c b/gnucash/import-export/aqb/test/test-kvp.c
similarity index 99%
rename from src/import-export/aqb/test/test-kvp.c
rename to gnucash/import-export/aqb/test/test-kvp.c
index db1fd559a2..415eed688f 100644
--- a/src/import-export/aqb/test/test-kvp.c
+++ b/gnucash/import-export/aqb/test/test-kvp.c
@@ -24,10 +24,10 @@
 #include <glib.h>
 
 // for the gnc_ab_get_book_template_list() et al. functions
-#include "import-export/aqb/gnc-ab-kvp.h"
+#include "gnc-ab-kvp.h"
 #include <gnc-aqbanking-templates.h>
 #include <qofinstance-p.h>
-#include "engine/gnc-hooks.h"
+#include "gnc-hooks.h"
 
 void test_qofsession_aqb_kvp (void);
 
diff --git a/src/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
similarity index 100%
rename from src/import-export/csv-exp/CMakeLists.txt
rename to gnucash/import-export/csv-exp/CMakeLists.txt
diff --git a/src/import-export/csv-exp/Makefile.am b/gnucash/import-export/csv-exp/Makefile.am
similarity index 50%
rename from src/import-export/csv-exp/Makefile.am
rename to gnucash/import-export/csv-exp/Makefile.am
index b3177da1b5..4635918605 100644
--- a/src/import-export/csv-exp/Makefile.am
+++ b/gnucash/import-export/csv-exp/Makefile.am
@@ -18,29 +18,29 @@ noinst_HEADERS = \
 libgncmod_csv_export_la_LDFLAGS = -avoid-version
 
 libgncmod_csv_export_la_LIBADD = \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${top_builddir}/lib/libc/libc-missing.la \
   ${GTK_LIBS} \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/import-export \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/import-export \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/lib \
   ${GUILE_CFLAGS} \
diff --git a/src/import-export/csv-exp/assistant-csv-export.c b/gnucash/import-export/csv-exp/assistant-csv-export.c
similarity index 100%
rename from src/import-export/csv-exp/assistant-csv-export.c
rename to gnucash/import-export/csv-exp/assistant-csv-export.c
diff --git a/src/import-export/csv-exp/assistant-csv-export.glade b/gnucash/import-export/csv-exp/assistant-csv-export.glade
similarity index 100%
rename from src/import-export/csv-exp/assistant-csv-export.glade
rename to gnucash/import-export/csv-exp/assistant-csv-export.glade
diff --git a/src/import-export/csv-exp/assistant-csv-export.h b/gnucash/import-export/csv-exp/assistant-csv-export.h
similarity index 100%
rename from src/import-export/csv-exp/assistant-csv-export.h
rename to gnucash/import-export/csv-exp/assistant-csv-export.h
diff --git a/src/import-export/csv-exp/csv-transactions-export.c b/gnucash/import-export/csv-exp/csv-transactions-export.c
similarity index 100%
rename from src/import-export/csv-exp/csv-transactions-export.c
rename to gnucash/import-export/csv-exp/csv-transactions-export.c
diff --git a/src/import-export/csv-exp/csv-transactions-export.h b/gnucash/import-export/csv-exp/csv-transactions-export.h
similarity index 100%
rename from src/import-export/csv-exp/csv-transactions-export.h
rename to gnucash/import-export/csv-exp/csv-transactions-export.h
diff --git a/src/import-export/csv-exp/csv-tree-export.c b/gnucash/import-export/csv-exp/csv-tree-export.c
similarity index 100%
rename from src/import-export/csv-exp/csv-tree-export.c
rename to gnucash/import-export/csv-exp/csv-tree-export.c
diff --git a/src/import-export/csv-exp/csv-tree-export.h b/gnucash/import-export/csv-exp/csv-tree-export.h
similarity index 100%
rename from src/import-export/csv-exp/csv-tree-export.h
rename to gnucash/import-export/csv-exp/csv-tree-export.h
diff --git a/src/import-export/csv-exp/gnc-plugin-csv-export-ui.xml b/gnucash/import-export/csv-exp/gnc-plugin-csv-export-ui.xml
similarity index 100%
rename from src/import-export/csv-exp/gnc-plugin-csv-export-ui.xml
rename to gnucash/import-export/csv-exp/gnc-plugin-csv-export-ui.xml
diff --git a/src/import-export/csv-exp/gnc-plugin-csv-export.c b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
similarity index 100%
rename from src/import-export/csv-exp/gnc-plugin-csv-export.c
rename to gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
diff --git a/src/import-export/csv-exp/gnc-plugin-csv-export.h b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.h
similarity index 100%
rename from src/import-export/csv-exp/gnc-plugin-csv-export.h
rename to gnucash/import-export/csv-exp/gnc-plugin-csv-export.h
diff --git a/src/import-export/csv-exp/gncmod-csv-export.c b/gnucash/import-export/csv-exp/gncmod-csv-export.c
similarity index 100%
rename from src/import-export/csv-exp/gncmod-csv-export.c
rename to gnucash/import-export/csv-exp/gncmod-csv-export.c
diff --git a/src/import-export/csv-exp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
similarity index 100%
rename from src/import-export/csv-exp/gschemas/CMakeLists.txt
rename to gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
diff --git a/src/import-export/csv-exp/gschemas/Makefile.am b/gnucash/import-export/csv-exp/gschemas/Makefile.am
similarity index 100%
rename from src/import-export/csv-exp/gschemas/Makefile.am
rename to gnucash/import-export/csv-exp/gschemas/Makefile.am
diff --git a/src/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in b/gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in
similarity index 100%
rename from src/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in
rename to gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in
diff --git a/src/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
similarity index 100%
rename from src/import-export/csv-imp/CMakeLists.txt
rename to gnucash/import-export/csv-imp/CMakeLists.txt
diff --git a/src/import-export/csv-imp/Makefile.am b/gnucash/import-export/csv-imp/Makefile.am
similarity index 70%
rename from src/import-export/csv-imp/Makefile.am
rename to gnucash/import-export/csv-imp/Makefile.am
index d57ccbdaf9..c718b0366d 100644
--- a/src/import-export/csv-imp/Makefile.am
+++ b/gnucash/import-export/csv-imp/Makefile.am
@@ -36,12 +36,12 @@ noinst_HEADERS = \
 libgncmod_csv_import_la_LDFLAGS = -avoid-version
 
 libgncmod_csv_import_la_LIBADD = \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${top_builddir}/lib/goffice/libgnc-goffice.la \
   ${top_builddir}/lib/libc/libc-missing.la \
   ${GLIB_LIBS} \
@@ -52,14 +52,14 @@ libgncmod_csv_import_la_LIBADD = \
   -lboost_locale
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/import-export \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/import-export \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/lib/goffice \
   -I${top_srcdir}/lib \
diff --git a/src/import-export/csv-imp/assistant-csv-account-import.c b/gnucash/import-export/csv-imp/assistant-csv-account-import.c
similarity index 100%
rename from src/import-export/csv-imp/assistant-csv-account-import.c
rename to gnucash/import-export/csv-imp/assistant-csv-account-import.c
diff --git a/src/import-export/csv-imp/assistant-csv-account-import.glade b/gnucash/import-export/csv-imp/assistant-csv-account-import.glade
similarity index 100%
rename from src/import-export/csv-imp/assistant-csv-account-import.glade
rename to gnucash/import-export/csv-imp/assistant-csv-account-import.glade
diff --git a/src/import-export/csv-imp/assistant-csv-account-import.h b/gnucash/import-export/csv-imp/assistant-csv-account-import.h
similarity index 100%
rename from src/import-export/csv-imp/assistant-csv-account-import.h
rename to gnucash/import-export/csv-imp/assistant-csv-account-import.h
diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
similarity index 100%
rename from src/import-export/csv-imp/assistant-csv-trans-import.cpp
rename to gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.glade b/gnucash/import-export/csv-imp/assistant-csv-trans-import.glade
similarity index 100%
rename from src/import-export/csv-imp/assistant-csv-trans-import.glade
rename to gnucash/import-export/csv-imp/assistant-csv-trans-import.glade
diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.h b/gnucash/import-export/csv-imp/assistant-csv-trans-import.h
similarity index 100%
rename from src/import-export/csv-imp/assistant-csv-trans-import.h
rename to gnucash/import-export/csv-imp/assistant-csv-trans-import.h
diff --git a/src/import-export/csv-imp/csv-account-import.c b/gnucash/import-export/csv-imp/csv-account-import.c
similarity index 100%
rename from src/import-export/csv-imp/csv-account-import.c
rename to gnucash/import-export/csv-imp/csv-account-import.c
diff --git a/src/import-export/csv-imp/csv-account-import.h b/gnucash/import-export/csv-imp/csv-account-import.h
similarity index 100%
rename from src/import-export/csv-imp/csv-account-import.h
rename to gnucash/import-export/csv-imp/csv-account-import.h
diff --git a/src/import-export/csv-imp/gnc-csv-account-map.c b/gnucash/import-export/csv-imp/gnc-csv-account-map.c
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-account-map.c
rename to gnucash/import-export/csv-imp/gnc-csv-account-map.c
diff --git a/src/import-export/csv-imp/gnc-csv-account-map.h b/gnucash/import-export/csv-imp/gnc-csv-account-map.h
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-account-map.h
rename to gnucash/import-export/csv-imp/gnc-csv-account-map.h
diff --git a/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c b/gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-gnumeric-popup.c
rename to gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
diff --git a/src/import-export/csv-imp/gnc-csv-gnumeric-popup.h b/gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.h
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-gnumeric-popup.h
rename to gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.h
diff --git a/src/import-export/csv-imp/gnc-csv-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
diff --git a/src/import-export/csv-imp/gnc-csv-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp
diff --git a/src/import-export/csv-imp/gnc-csv-trans-settings.cpp b/gnucash/import-export/csv-imp/gnc-csv-trans-settings.cpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-trans-settings.cpp
rename to gnucash/import-export/csv-imp/gnc-csv-trans-settings.cpp
diff --git a/src/import-export/csv-imp/gnc-csv-trans-settings.hpp b/gnucash/import-export/csv-imp/gnc-csv-trans-settings.hpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-csv-trans-settings.hpp
rename to gnucash/import-export/csv-imp/gnc-csv-trans-settings.hpp
diff --git a/src/import-export/csv-imp/gnc-dummy-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-dummy-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
diff --git a/src/import-export/csv-imp/gnc-dummy-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-dummy-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp
diff --git a/src/import-export/csv-imp/gnc-fw-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-fw-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
diff --git a/src/import-export/csv-imp/gnc-fw-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-fw-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp
diff --git a/src/import-export/csv-imp/gnc-plugin-csv-import-ui.xml b/gnucash/import-export/csv-imp/gnc-plugin-csv-import-ui.xml
similarity index 100%
rename from src/import-export/csv-imp/gnc-plugin-csv-import-ui.xml
rename to gnucash/import-export/csv-imp/gnc-plugin-csv-import-ui.xml
diff --git a/src/import-export/csv-imp/gnc-plugin-csv-import.c b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
similarity index 100%
rename from src/import-export/csv-imp/gnc-plugin-csv-import.c
rename to gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
diff --git a/src/import-export/csv-imp/gnc-plugin-csv-import.h b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.h
similarity index 100%
rename from src/import-export/csv-imp/gnc-plugin-csv-import.h
rename to gnucash/import-export/csv-imp/gnc-plugin-csv-import.h
diff --git a/src/import-export/csv-imp/gnc-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer.cpp
diff --git a/src/import-export/csv-imp/gnc-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer.hpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer.hpp
diff --git a/src/import-export/csv-imp/gnc-trans-props.cpp b/gnucash/import-export/csv-imp/gnc-trans-props.cpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-trans-props.cpp
rename to gnucash/import-export/csv-imp/gnc-trans-props.cpp
diff --git a/src/import-export/csv-imp/gnc-trans-props.hpp b/gnucash/import-export/csv-imp/gnc-trans-props.hpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-trans-props.hpp
rename to gnucash/import-export/csv-imp/gnc-trans-props.hpp
diff --git a/src/import-export/csv-imp/gnc-tx-import.cpp b/gnucash/import-export/csv-imp/gnc-tx-import.cpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-tx-import.cpp
rename to gnucash/import-export/csv-imp/gnc-tx-import.cpp
diff --git a/src/import-export/csv-imp/gnc-tx-import.hpp b/gnucash/import-export/csv-imp/gnc-tx-import.hpp
similarity index 100%
rename from src/import-export/csv-imp/gnc-tx-import.hpp
rename to gnucash/import-export/csv-imp/gnc-tx-import.hpp
diff --git a/src/import-export/csv-imp/gncmod-csv-import.c b/gnucash/import-export/csv-imp/gncmod-csv-import.c
similarity index 100%
rename from src/import-export/csv-imp/gncmod-csv-import.c
rename to gnucash/import-export/csv-imp/gncmod-csv-import.c
diff --git a/src/import-export/csv-imp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
similarity index 100%
rename from src/import-export/csv-imp/gschemas/CMakeLists.txt
rename to gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
diff --git a/src/import-export/csv-imp/gschemas/Makefile.am b/gnucash/import-export/csv-imp/gschemas/Makefile.am
similarity index 100%
rename from src/import-export/csv-imp/gschemas/Makefile.am
rename to gnucash/import-export/csv-imp/gschemas/Makefile.am
diff --git a/src/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in b/gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in
similarity index 100%
rename from src/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in
rename to gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in
diff --git a/src/import-export/csv-imp/test/CMakeLists.txt b/gnucash/import-export/csv-imp/test/CMakeLists.txt
similarity index 75%
rename from src/import-export/csv-imp/test/CMakeLists.txt
rename to gnucash/import-export/csv-imp/test/CMakeLists.txt
index 66bd44071b..6fc282d7bc 100644
--- a/src/import-export/csv-imp/test/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/test/CMakeLists.txt
@@ -1,9 +1,9 @@
 
 SET(CSV_IMP_TEST_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/common/test-core
   ${CMAKE_SOURCE_DIR}/lib
   ${GLIB2_INCLUDE_DIRS}
 )
@@ -11,7 +11,7 @@ SET(CSV_IMP_TEST_LIBS gncmod-csv-import gncmod-engine test-core)
 
 # This test does not run in Win32
 IF (NOT WIN32)
-  SET(MODULEPATH ${CMAKE_SOURCE_DIR}/src/import-export/csv-imp)
+  SET(MODULEPATH ${CMAKE_SOURCE_DIR}/gnucash/import-export/csv-imp)
   SET(gtest_csv_imp_LIBS gncmod-csv-import ${GLIB2_LDFLAGS} ${GTEST_LIB})
   SET(gtest_csv_imp_INCLUDES
     ${MODULEPATH}
@@ -23,7 +23,7 @@ IF (NOT WIN32)
     ${GTEST_SRC})
   GNC_ADD_TEST(test-tokenizer "${test_tokenizer_SOURCES}"
     gtest_csv_imp_INCLUDES gtest_csv_imp_LIBS
-    SRCDIR=${CMAKE_SOURCE_DIR}/src/import-export/csv-imp/test)
+    SRCDIR=${CMAKE_SOURCE_DIR}/gnucash/import-export/csv-imp/test)
 
   SET(test_tx_import_SOURCES
     test-tx-import.cpp
diff --git a/gnucash/import-export/csv-imp/test/Makefile.am b/gnucash/import-export/csv-imp/test/Makefile.am
new file mode 100644
index 0000000000..7fd0e80d82
--- /dev/null
+++ b/gnucash/import-export/csv-imp/test/Makefile.am
@@ -0,0 +1,118 @@
+# A template Makefile.am for GLib g_test-based test directories.
+# Copyright 2011 John Ralls <jralls@ceridwen.us>
+
+include $(top_srcdir)/test-templates/Makefile.decl
+
+
+#You will only need one of these: It points to the module directory
+#after $(top_srcdir) or ${top_builddir}:
+MODULEPATH = gnucash/import-export/csv-imp
+
+#The test program. You'll need to add to this if you have more than one module above.
+
+check_PROGRAMS = test-tokenizer \
+                 test-tx-import
+
+TESTS = ${check_PROGRAMS}
+
+#Program files for tests go here. It's probably best to have one for
+#each file in the parent directory. Include
+#test_foo_support.c if you have one and aren't building the
+#support library.
+test_tokenizer_SOURCES = \
+    test-tokenizer.cpp
+
+test_tx_import_SOURCES = \
+    test-tx-import.cpp
+
+if !GOOGLE_TEST_LIBS
+nodist_test_tokenizer_SOURCES = \
+        ${GTEST_SRC}/src/gtest_main.cc
+
+nodist_test_tx_import_SOURCES = \
+        ${GTEST_SRC}/src/gtest_main.cc
+endif
+
+IMP_TEST_CPPFLAGS =  \
+	${DEFAULT_INCLUDES} \
+	-I$(top_srcdir)/${MODULEPATH}/ \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/gnucash/import-export \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/lib \
+  ${GTK_CFLAGS} \
+  ${GLIB_CFLAGS} \
+  $(BOOST_CPPFLAGS)
+
+test_tokenizer_CPPFLAGS = \
+  -I$(GTEST_HEADERS) \
+  $(IMP_TEST_CPPFLAGS)
+
+test_tx_import_CPPFLAGS = \
+  -I$(GTEST_HEADERS) \
+  $(IMP_TEST_CPPFLAGS)
+
+#The tests might require more libraries, but try to keep them
+#as independent as possible.
+IMP_TEST_LDFLAGS = \
+  ${top_builddir}/${MODULEPATH}/libgncmod-csv-import.la \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \
+  ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${GLIB_LIBS} \
+  $(BOOST_LDFLAGS)
+
+test_tokenizer_LDADD = \
+  ${IMP_TEST_LDFLAGS} \
+  $(GTEST_LIBS)
+
+test_tx_import_LDADD = \
+  ${IMP_TEST_LDFLAGS} \
+  $(GTEST_LIBS)
+
+GNC_TEST_DEPS = \
+--library-dir    ${top_builddir}/${MODULEPATH} \
+--library-dir    ${top_builddir}/gnucash/import-export \
+--library-dir    ${top_builddir}/gnucash/gnome \
+--library-dir    ${top_builddir}/gnucash/gnome-utils \
+--library-dir    ${top_builddir}/gnucash/gnome-search \
+--library-dir    ${top_builddir}/gnucash/register/ledger-core \
+--library-dir    ${top_builddir}/gnucash/register/register-core \
+--library-dir    ${top_builddir}/gnucash/register/register-gnome \
+--library-dir    ${top_builddir}/gnucash/report/report-system \
+--library-dir    ${top_builddir}/gnucash/report/report-gnome \
+--library-dir    ${top_builddir}/gnucash/html \
+--library-dir    ${top_builddir}/libgnucash/app-utils \
+--library-dir    ${top_builddir}/libgnucash/backend/xml \
+--library-dir    ${top_builddir}/libgnucash/engine \
+--library-dir    ${top_builddir}/libgnucash/core-utils \
+--library-dir    ${top_builddir}/libgnucash/gnc-module
+
+TESTS_ENVIRONMENT = \
+  SRCDIR=${srcdir} \
+  G_DEBUG= \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+EXTRA_DIST += \
+  sample1.csv \
+  CMakeLists.txt
+
+
+AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.import.csv\"
diff --git a/src/import-export/csv-imp/test/sample1.csv b/gnucash/import-export/csv-imp/test/sample1.csv
similarity index 100%
rename from src/import-export/csv-imp/test/sample1.csv
rename to gnucash/import-export/csv-imp/test/sample1.csv
diff --git a/src/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
similarity index 100%
rename from src/import-export/csv-imp/test/test-tokenizer.cpp
rename to gnucash/import-export/csv-imp/test/test-tokenizer.cpp
diff --git a/src/import-export/csv-imp/test/test-tx-import.cpp b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
similarity index 100%
rename from src/import-export/csv-imp/test/test-tx-import.cpp
rename to gnucash/import-export/csv-imp/test/test-tx-import.cpp
diff --git a/src/import-export/dialog-import.glade b/gnucash/import-export/dialog-import.glade
similarity index 100%
rename from src/import-export/dialog-import.glade
rename to gnucash/import-export/dialog-import.glade
diff --git a/src/import-export/generic-import-design.txt b/gnucash/import-export/generic-import-design.txt
similarity index 100%
rename from src/import-export/generic-import-design.txt
rename to gnucash/import-export/generic-import-design.txt
diff --git a/src/import-export/gncmod-generic-import.c b/gnucash/import-export/gncmod-generic-import.c
similarity index 100%
rename from src/import-export/gncmod-generic-import.c
rename to gnucash/import-export/gncmod-generic-import.c
diff --git a/src/import-export/gschemas/CMakeLists.txt b/gnucash/import-export/gschemas/CMakeLists.txt
similarity index 100%
rename from src/import-export/gschemas/CMakeLists.txt
rename to gnucash/import-export/gschemas/CMakeLists.txt
diff --git a/src/import-export/gschemas/Makefile.am b/gnucash/import-export/gschemas/Makefile.am
similarity index 100%
rename from src/import-export/gschemas/Makefile.am
rename to gnucash/import-export/gschemas/Makefile.am
diff --git a/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in b/gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in
similarity index 100%
rename from src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in
rename to gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in
diff --git a/src/import-export/import-account-matcher.c b/gnucash/import-export/import-account-matcher.c
similarity index 100%
rename from src/import-export/import-account-matcher.c
rename to gnucash/import-export/import-account-matcher.c
diff --git a/src/import-export/import-account-matcher.h b/gnucash/import-export/import-account-matcher.h
similarity index 100%
rename from src/import-export/import-account-matcher.h
rename to gnucash/import-export/import-account-matcher.h
diff --git a/src/import-export/import-backend.c b/gnucash/import-export/import-backend.c
similarity index 100%
rename from src/import-export/import-backend.c
rename to gnucash/import-export/import-backend.c
diff --git a/src/import-export/import-backend.h b/gnucash/import-export/import-backend.h
similarity index 100%
rename from src/import-export/import-backend.h
rename to gnucash/import-export/import-backend.h
diff --git a/src/import-export/import-commodity-matcher.c b/gnucash/import-export/import-commodity-matcher.c
similarity index 100%
rename from src/import-export/import-commodity-matcher.c
rename to gnucash/import-export/import-commodity-matcher.c
diff --git a/src/import-export/import-commodity-matcher.h b/gnucash/import-export/import-commodity-matcher.h
similarity index 100%
rename from src/import-export/import-commodity-matcher.h
rename to gnucash/import-export/import-commodity-matcher.h
diff --git a/src/import-export/import-format-dialog.c b/gnucash/import-export/import-format-dialog.c
similarity index 100%
rename from src/import-export/import-format-dialog.c
rename to gnucash/import-export/import-format-dialog.c
diff --git a/src/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
similarity index 99%
rename from src/import-export/import-main-matcher.c
rename to gnucash/import-export/import-main-matcher.c
index 15472db4cd..cfbaa5afaa 100644
--- a/src/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -48,7 +48,7 @@
 #include "import-backend.h"
 #include "import-account-matcher.h"
 #include "import-pending-matches.h"
-#include "app-utils/gnc-component-manager.h"
+#include "gnc-component-manager.h"
 #include "guid.h"
 
 #define GNC_PREFS_GROUP "dialogs.import.generic.transaction-list"
diff --git a/src/import-export/import-main-matcher.h b/gnucash/import-export/import-main-matcher.h
similarity index 100%
rename from src/import-export/import-main-matcher.h
rename to gnucash/import-export/import-main-matcher.h
diff --git a/src/import-export/import-match-picker.c b/gnucash/import-export/import-match-picker.c
similarity index 100%
rename from src/import-export/import-match-picker.c
rename to gnucash/import-export/import-match-picker.c
diff --git a/src/import-export/import-match-picker.h b/gnucash/import-export/import-match-picker.h
similarity index 100%
rename from src/import-export/import-match-picker.h
rename to gnucash/import-export/import-match-picker.h
diff --git a/src/import-export/import-parse.c b/gnucash/import-export/import-parse.c
similarity index 100%
rename from src/import-export/import-parse.c
rename to gnucash/import-export/import-parse.c
diff --git a/src/import-export/import-parse.h b/gnucash/import-export/import-parse.h
similarity index 100%
rename from src/import-export/import-parse.h
rename to gnucash/import-export/import-parse.h
diff --git a/src/import-export/import-pending-matches.c b/gnucash/import-export/import-pending-matches.c
similarity index 100%
rename from src/import-export/import-pending-matches.c
rename to gnucash/import-export/import-pending-matches.c
diff --git a/src/import-export/import-pending-matches.h b/gnucash/import-export/import-pending-matches.h
similarity index 100%
rename from src/import-export/import-pending-matches.h
rename to gnucash/import-export/import-pending-matches.h
diff --git a/src/import-export/import-settings.c b/gnucash/import-export/import-settings.c
similarity index 100%
rename from src/import-export/import-settings.c
rename to gnucash/import-export/import-settings.c
diff --git a/src/import-export/import-settings.h b/gnucash/import-export/import-settings.h
similarity index 100%
rename from src/import-export/import-settings.h
rename to gnucash/import-export/import-settings.h
diff --git a/src/import-export/import-utilities.c b/gnucash/import-export/import-utilities.c
similarity index 100%
rename from src/import-export/import-utilities.c
rename to gnucash/import-export/import-utilities.c
diff --git a/src/import-export/import-utilities.h b/gnucash/import-export/import-utilities.h
similarity index 100%
rename from src/import-export/import-utilities.h
rename to gnucash/import-export/import-utilities.h
diff --git a/src/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
similarity index 100%
rename from src/import-export/log-replay/CMakeLists.txt
rename to gnucash/import-export/log-replay/CMakeLists.txt
diff --git a/gnucash/import-export/log-replay/Makefile.am b/gnucash/import-export/log-replay/Makefile.am
new file mode 100644
index 0000000000..3529e06c20
--- /dev/null
+++ b/gnucash/import-export/log-replay/Makefile.am
@@ -0,0 +1,43 @@
+SUBDIRS = .
+
+pkglib_LTLIBRARIES=libgncmod-log-replay.la
+
+libgncmod_log_replay_la_SOURCES = \
+  gnc-log-replay.c \
+  gnc-plugin-log-replay.c \
+  gncmod-log-replay.c
+
+noinst_HEADERS = \
+  gnc-log-replay.h \
+  gnc-plugin-log-replay.h
+
+libgncmod_log_replay_la_LDFLAGS = -avoid-version
+
+libgncmod_log_replay_la_LIBADD = \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${GTK_LIBS} \
+  ${GLIB_LIBS}
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/import-export \
+  ${GTK_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+uidir = $(GNC_UI_DIR)
+dist_ui_DATA = \
+	gnc-plugin-log-replay-ui.xml
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.log-replay\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/log-replay/gnc-log-replay.c b/gnucash/import-export/log-replay/gnc-log-replay.c
similarity index 100%
rename from src/import-export/log-replay/gnc-log-replay.c
rename to gnucash/import-export/log-replay/gnc-log-replay.c
diff --git a/src/import-export/log-replay/gnc-log-replay.h b/gnucash/import-export/log-replay/gnc-log-replay.h
similarity index 100%
rename from src/import-export/log-replay/gnc-log-replay.h
rename to gnucash/import-export/log-replay/gnc-log-replay.h
diff --git a/src/import-export/log-replay/gnc-plugin-log-replay-ui.xml b/gnucash/import-export/log-replay/gnc-plugin-log-replay-ui.xml
similarity index 100%
rename from src/import-export/log-replay/gnc-plugin-log-replay-ui.xml
rename to gnucash/import-export/log-replay/gnc-plugin-log-replay-ui.xml
diff --git a/src/import-export/log-replay/gnc-plugin-log-replay.c b/gnucash/import-export/log-replay/gnc-plugin-log-replay.c
similarity index 100%
rename from src/import-export/log-replay/gnc-plugin-log-replay.c
rename to gnucash/import-export/log-replay/gnc-plugin-log-replay.c
diff --git a/src/import-export/log-replay/gnc-plugin-log-replay.h b/gnucash/import-export/log-replay/gnc-plugin-log-replay.h
similarity index 100%
rename from src/import-export/log-replay/gnc-plugin-log-replay.h
rename to gnucash/import-export/log-replay/gnc-plugin-log-replay.h
diff --git a/src/import-export/log-replay/gncmod-log-replay.c b/gnucash/import-export/log-replay/gncmod-log-replay.c
similarity index 100%
rename from src/import-export/log-replay/gncmod-log-replay.c
rename to gnucash/import-export/log-replay/gncmod-log-replay.c
diff --git a/src/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
similarity index 100%
rename from src/import-export/ofx/CMakeLists.txt
rename to gnucash/import-export/ofx/CMakeLists.txt
diff --git a/gnucash/import-export/ofx/Makefile.am b/gnucash/import-export/ofx/Makefile.am
new file mode 100644
index 0000000000..629d6d0e46
--- /dev/null
+++ b/gnucash/import-export/ofx/Makefile.am
@@ -0,0 +1,47 @@
+SUBDIRS = . gschemas test
+
+pkglib_LTLIBRARIES=libgncmod-ofx.la
+
+libgncmod_ofx_la_SOURCES = \
+  gnc-ofx-import.c \
+  gnc-ofx-kvp.c \
+  gncmod-ofx-import.c \
+  gnc-plugin-ofx.c
+
+noinst_HEADERS = \
+  gnc-ofx-import.h \
+  gnc-ofx-kvp.h \
+  gnc-plugin-ofx.h
+
+libgncmod_ofx_la_LDFLAGS = -avoid-version
+
+libgncmod_ofx_la_LIBADD = \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${GLIB_LIBS} \
+  ${LIBOFX_LIBS}
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/import-export \
+  ${GTK_CFLAGS} \
+  ${GLIB_CFLAGS} \
+  ${LIBOFX_CFLAGS} 
+
+uidir = $(GNC_UI_DIR)
+ui_DATA = \
+	gnc-plugin-ofx-ui.xml
+
+EXTRA_DIST = $(ui_DATA) migratable-prefs-ofx.xml CMakeLists.txt
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\"
diff --git a/src/import-export/ofx/gnc-ofx-import.c b/gnucash/import-export/ofx/gnc-ofx-import.c
similarity index 99%
rename from src/import-export/ofx/gnc-ofx-import.c
rename to gnucash/import-export/ofx/gnc-ofx-import.c
index 08fc2b9e92..de95859db0 100644
--- a/src/import-export/ofx/gnc-ofx-import.c
+++ b/gnucash/import-export/ofx/gnc-ofx-import.c
@@ -47,8 +47,8 @@
 #include "gnc-ui-util.h"
 #include "gnc-glib-utils.h"
 #include "gnc-prefs.h"
-#include "gnome-utils/gnc-ui.h"
-#include "gnome-utils/dialog-account.h"
+#include "gnc-ui.h"
+#include "dialog-account.h"
 #include "dialog-utils.h"
 
 #include "gnc-ofx-kvp.h"
diff --git a/src/import-export/ofx/gnc-ofx-import.h b/gnucash/import-export/ofx/gnc-ofx-import.h
similarity index 100%
rename from src/import-export/ofx/gnc-ofx-import.h
rename to gnucash/import-export/ofx/gnc-ofx-import.h
diff --git a/src/import-export/ofx/gnc-ofx-kvp.c b/gnucash/import-export/ofx/gnc-ofx-kvp.c
similarity index 100%
rename from src/import-export/ofx/gnc-ofx-kvp.c
rename to gnucash/import-export/ofx/gnc-ofx-kvp.c
diff --git a/src/import-export/ofx/gnc-ofx-kvp.h b/gnucash/import-export/ofx/gnc-ofx-kvp.h
similarity index 98%
rename from src/import-export/ofx/gnc-ofx-kvp.h
rename to gnucash/import-export/ofx/gnc-ofx-kvp.h
index cc41f6f0e2..58cd36a38a 100644
--- a/src/import-export/ofx/gnc-ofx-kvp.h
+++ b/gnucash/import-export/ofx/gnc-ofx-kvp.h
@@ -27,7 +27,7 @@
 #define GNC_OFX_KVP_H_
 
 #include <glib.h>
-#include <engine/Account.h>
+#include <Account.h>
 
 Account *gnc_ofx_kvp_get_assoc_account(const Account* investment_account);
 
diff --git a/src/import-export/ofx/gnc-plugin-ofx-ui.xml b/gnucash/import-export/ofx/gnc-plugin-ofx-ui.xml
similarity index 100%
rename from src/import-export/ofx/gnc-plugin-ofx-ui.xml
rename to gnucash/import-export/ofx/gnc-plugin-ofx-ui.xml
diff --git a/src/import-export/ofx/gnc-plugin-ofx.c b/gnucash/import-export/ofx/gnc-plugin-ofx.c
similarity index 100%
rename from src/import-export/ofx/gnc-plugin-ofx.c
rename to gnucash/import-export/ofx/gnc-plugin-ofx.c
diff --git a/src/import-export/ofx/gnc-plugin-ofx.h b/gnucash/import-export/ofx/gnc-plugin-ofx.h
similarity index 100%
rename from src/import-export/ofx/gnc-plugin-ofx.h
rename to gnucash/import-export/ofx/gnc-plugin-ofx.h
diff --git a/src/import-export/ofx/gncmod-ofx-import.c b/gnucash/import-export/ofx/gncmod-ofx-import.c
similarity index 100%
rename from src/import-export/ofx/gncmod-ofx-import.c
rename to gnucash/import-export/ofx/gncmod-ofx-import.c
diff --git a/src/import-export/ofx/gschemas/CMakeLists.txt b/gnucash/import-export/ofx/gschemas/CMakeLists.txt
similarity index 100%
rename from src/import-export/ofx/gschemas/CMakeLists.txt
rename to gnucash/import-export/ofx/gschemas/CMakeLists.txt
diff --git a/src/import-export/ofx/gschemas/Makefile.am b/gnucash/import-export/ofx/gschemas/Makefile.am
similarity index 100%
rename from src/import-export/ofx/gschemas/Makefile.am
rename to gnucash/import-export/ofx/gschemas/Makefile.am
diff --git a/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in b/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in
similarity index 100%
rename from src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in
rename to gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in
diff --git a/src/import-export/ofx/migratable-prefs-ofx.xml b/gnucash/import-export/ofx/migratable-prefs-ofx.xml
similarity index 100%
rename from src/import-export/ofx/migratable-prefs-ofx.xml
rename to gnucash/import-export/ofx/migratable-prefs-ofx.xml
diff --git a/src/import-export/ofx/test/CMakeLists.txt b/gnucash/import-export/ofx/test/CMakeLists.txt
similarity index 100%
rename from src/import-export/ofx/test/CMakeLists.txt
rename to gnucash/import-export/ofx/test/CMakeLists.txt
diff --git a/gnucash/import-export/ofx/test/Makefile.am b/gnucash/import-export/ofx/test/Makefile.am
new file mode 100644
index 0000000000..2e784d42ec
--- /dev/null
+++ b/gnucash/import-export/ofx/test/Makefile.am
@@ -0,0 +1,13 @@
+TESTS=test-link
+
+AM_CPPFLAGS=${LIBOFX_CFLAGS}
+check_PROGRAMS=test-link
+
+test_link_SOURCES=test-link.c
+test_link_LDADD=\
+	$(top_builddir)/libgnucash/engine/libgncmod-engine.la \
+	$(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \
+	${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+	../libgncmod-ofx.la
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/ofx/test/test-link.c b/gnucash/import-export/ofx/test/test-link.c
similarity index 100%
rename from src/import-export/ofx/test/test-link.c
rename to gnucash/import-export/ofx/test/test-link.c
diff --git a/src/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
similarity index 91%
rename from src/import-export/qif-imp/CMakeLists.txt
rename to gnucash/import-export/qif-imp/CMakeLists.txt
index 6c348e4519..a26fb08d49 100644
--- a/src/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/import_export/qif-imp
+# CMakeLists.txt for gnucash/import_export/qif-imp
 
 ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
@@ -51,8 +51,8 @@ SET(qif_import_SCHEME_2
 )
 
 SET(GUILE_MODULES      "")
-SET(GUILE_LOAD_DIRS    src/core-utils src/gnc-module src/scm)
-SET(GUILE_LIBRARY_DIRS src/core-utils src/gnc-module src/gnome)
+SET(GUILE_LOAD_DIRS    libgnucash/core-utils libgnucash/gnc-module libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module gnucash/gnome)
 SET(GUILE_DEPENDS      gncmod-qif-import scm-core-utils scm-gnc-module scm-scm)
 
 GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
diff --git a/src/import-export/qif-imp/Makefile.am b/gnucash/import-export/qif-imp/Makefile.am
similarity index 55%
rename from src/import-export/qif-imp/Makefile.am
rename to gnucash/import-export/qif-imp/Makefile.am
index 96b29c0be9..e23cd32d49 100644
--- a/src/import-export/qif-imp/Makefile.am
+++ b/gnucash/import-export/qif-imp/Makefile.am
@@ -16,13 +16,13 @@ noinst_HEADERS = \
 libgncmod_qif_import_la_LDFLAGS = -avoid-version
 
 libgncmod_qif_import_la_LIBADD = \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
@@ -49,15 +49,15 @@ gtkbuilder_DATA = \
    assistant-qif-import.glade
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/import-export \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/import-export \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS}
@@ -100,30 +100,30 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/gnome \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/report/report-gnome \
-  --library-dir    ${top_builddir}/src/register/register-gnome \
-  --library-dir    ${top_builddir}/src/register/register-core \
-  --library-dir    ${top_builddir}/src/register/ledger-core \
-  --library-dir    ${top_builddir}/src/gnome-search
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/gnucash/gnome \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/gnucash/report/report-gnome \
+  --library-dir    ${top_builddir}/gnucash/register/register-gnome \
+  --library-dir    ${top_builddir}/gnucash/register/register-core \
+  --library-dir    ${top_builddir}/gnucash/register/ledger-core \
+  --library-dir    ${top_builddir}/gnucash/gnome-search
 
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export
diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/gnucash/import-export/qif-imp/assistant-qif-import.c
similarity index 100%
rename from src/import-export/qif-imp/assistant-qif-import.c
rename to gnucash/import-export/qif-imp/assistant-qif-import.c
diff --git a/src/import-export/qif-imp/assistant-qif-import.glade b/gnucash/import-export/qif-imp/assistant-qif-import.glade
similarity index 100%
rename from src/import-export/qif-imp/assistant-qif-import.glade
rename to gnucash/import-export/qif-imp/assistant-qif-import.glade
diff --git a/src/import-export/qif-imp/assistant-qif-import.h b/gnucash/import-export/qif-imp/assistant-qif-import.h
similarity index 100%
rename from src/import-export/qif-imp/assistant-qif-import.h
rename to gnucash/import-export/qif-imp/assistant-qif-import.h
diff --git a/src/import-export/qif-imp/dialog-account-picker.c b/gnucash/import-export/qif-imp/dialog-account-picker.c
similarity index 100%
rename from src/import-export/qif-imp/dialog-account-picker.c
rename to gnucash/import-export/qif-imp/dialog-account-picker.c
diff --git a/src/import-export/qif-imp/dialog-account-picker.glade b/gnucash/import-export/qif-imp/dialog-account-picker.glade
similarity index 100%
rename from src/import-export/qif-imp/dialog-account-picker.glade
rename to gnucash/import-export/qif-imp/dialog-account-picker.glade
diff --git a/src/import-export/qif-imp/dialog-account-picker.h b/gnucash/import-export/qif-imp/dialog-account-picker.h
similarity index 100%
rename from src/import-export/qif-imp/dialog-account-picker.h
rename to gnucash/import-export/qif-imp/dialog-account-picker.h
diff --git a/src/import-export/qif-imp/file-format.txt b/gnucash/import-export/qif-imp/file-format.txt
similarity index 100%
rename from src/import-export/qif-imp/file-format.txt
rename to gnucash/import-export/qif-imp/file-format.txt
diff --git a/src/import-export/qif-imp/gnc-plugin-qif-import-ui.xml b/gnucash/import-export/qif-imp/gnc-plugin-qif-import-ui.xml
similarity index 100%
rename from src/import-export/qif-imp/gnc-plugin-qif-import-ui.xml
rename to gnucash/import-export/qif-imp/gnc-plugin-qif-import-ui.xml
diff --git a/src/import-export/qif-imp/gnc-plugin-qif-import.c b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
similarity index 100%
rename from src/import-export/qif-imp/gnc-plugin-qif-import.c
rename to gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
diff --git a/src/import-export/qif-imp/gnc-plugin-qif-import.h b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.h
similarity index 100%
rename from src/import-export/qif-imp/gnc-plugin-qif-import.h
rename to gnucash/import-export/qif-imp/gnc-plugin-qif-import.h
diff --git a/src/import-export/qif-imp/gncmod-qif-import.c b/gnucash/import-export/qif-imp/gncmod-qif-import.c
similarity index 100%
rename from src/import-export/qif-imp/gncmod-qif-import.c
rename to gnucash/import-export/qif-imp/gncmod-qif-import.c
diff --git a/src/import-export/qif-imp/gschemas/CMakeLists.txt b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
similarity index 100%
rename from src/import-export/qif-imp/gschemas/CMakeLists.txt
rename to gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
diff --git a/src/import-export/qif-imp/gschemas/Makefile.am b/gnucash/import-export/qif-imp/gschemas/Makefile.am
similarity index 100%
rename from src/import-export/qif-imp/gschemas/Makefile.am
rename to gnucash/import-export/qif-imp/gschemas/Makefile.am
diff --git a/src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in b/gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in
similarity index 100%
rename from src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in
rename to gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in
diff --git a/src/import-export/qif-imp/qif-dialog-utils.scm b/gnucash/import-export/qif-imp/qif-dialog-utils.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-dialog-utils.scm
rename to gnucash/import-export/qif-imp/qif-dialog-utils.scm
diff --git a/src/import-export/qif-imp/qif-file.scm b/gnucash/import-export/qif-imp/qif-file.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-file.scm
rename to gnucash/import-export/qif-imp/qif-file.scm
diff --git a/src/import-export/qif-imp/qif-guess-map.scm b/gnucash/import-export/qif-imp/qif-guess-map.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-guess-map.scm
rename to gnucash/import-export/qif-imp/qif-guess-map.scm
diff --git a/src/import-export/qif-imp/qif-import.scm b/gnucash/import-export/qif-imp/qif-import.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-import.scm
rename to gnucash/import-export/qif-imp/qif-import.scm
diff --git a/src/import-export/qif-imp/qif-merge-groups.scm b/gnucash/import-export/qif-imp/qif-merge-groups.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-merge-groups.scm
rename to gnucash/import-export/qif-imp/qif-merge-groups.scm
diff --git a/src/import-export/qif-imp/qif-objects.scm b/gnucash/import-export/qif-imp/qif-objects.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-objects.scm
rename to gnucash/import-export/qif-imp/qif-objects.scm
diff --git a/src/import-export/qif-imp/qif-parse.scm b/gnucash/import-export/qif-imp/qif-parse.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-parse.scm
rename to gnucash/import-export/qif-imp/qif-parse.scm
diff --git a/src/import-export/qif-imp/qif-to-gnc.scm b/gnucash/import-export/qif-imp/qif-to-gnc.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-to-gnc.scm
rename to gnucash/import-export/qif-imp/qif-to-gnc.scm
diff --git a/src/import-export/qif-imp/qif-utils.scm b/gnucash/import-export/qif-imp/qif-utils.scm
similarity index 100%
rename from src/import-export/qif-imp/qif-utils.scm
rename to gnucash/import-export/qif-imp/qif-utils.scm
diff --git a/src/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt
similarity index 100%
rename from src/import-export/qif-imp/test/CMakeLists.txt
rename to gnucash/import-export/qif-imp/test/CMakeLists.txt
diff --git a/gnucash/import-export/qif-imp/test/Makefile.am b/gnucash/import-export/qif-imp/test/Makefile.am
new file mode 100644
index 0000000000..712379303f
--- /dev/null
+++ b/gnucash/import-export/qif-imp/test/Makefile.am
@@ -0,0 +1,17 @@
+TESTS=test-link
+
+check_PROGRAMS=test-link
+
+test_link_SOURCES = \
+  test-link.c
+
+test_link_LDADD=../libgncmod-qif-import.la \
+  ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${LIBXML2_LIBS}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/qif-imp/test/test-link.c b/gnucash/import-export/qif-imp/test/test-link.c
similarity index 100%
rename from src/import-export/qif-imp/test/test-link.c
rename to gnucash/import-export/qif-imp/test/test-link.c
diff --git a/src/import-export/qif/CMakeLists.txt b/gnucash/import-export/qif/CMakeLists.txt
similarity index 100%
rename from src/import-export/qif/CMakeLists.txt
rename to gnucash/import-export/qif/CMakeLists.txt
diff --git a/src/import-export/qif/Makefile.am b/gnucash/import-export/qif/Makefile.am
similarity index 62%
rename from src/import-export/qif/Makefile.am
rename to gnucash/import-export/qif/Makefile.am
index 88c7280093..a9c19c29c0 100644
--- a/src/import-export/qif/Makefile.am
+++ b/gnucash/import-export/qif/Makefile.am
@@ -20,17 +20,17 @@ noinst_HEADERS = \
   qif-parse.h
 
 libgncmod_qif_la_LIBADD = \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${REGEX_LIBS} \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/import-export \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/import-export \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS}
 
diff --git a/src/import-export/qif/qif-context.c b/gnucash/import-export/qif/qif-context.c
similarity index 100%
rename from src/import-export/qif/qif-context.c
rename to gnucash/import-export/qif/qif-context.c
diff --git a/src/import-export/qif/qif-defaults.c b/gnucash/import-export/qif/qif-defaults.c
similarity index 100%
rename from src/import-export/qif/qif-defaults.c
rename to gnucash/import-export/qif/qif-defaults.c
diff --git a/src/import-export/qif/qif-defaults.h b/gnucash/import-export/qif/qif-defaults.h
similarity index 100%
rename from src/import-export/qif/qif-defaults.h
rename to gnucash/import-export/qif/qif-defaults.h
diff --git a/src/import-export/qif/qif-file.c b/gnucash/import-export/qif/qif-file.c
similarity index 100%
rename from src/import-export/qif/qif-file.c
rename to gnucash/import-export/qif/qif-file.c
diff --git a/src/import-export/qif/qif-file.h b/gnucash/import-export/qif/qif-file.h
similarity index 100%
rename from src/import-export/qif/qif-file.h
rename to gnucash/import-export/qif/qif-file.h
diff --git a/src/import-export/qif/qif-import-p.h b/gnucash/import-export/qif/qif-import-p.h
similarity index 100%
rename from src/import-export/qif/qif-import-p.h
rename to gnucash/import-export/qif/qif-import-p.h
diff --git a/src/import-export/qif/qif-import.h b/gnucash/import-export/qif/qif-import.h
similarity index 100%
rename from src/import-export/qif/qif-import.h
rename to gnucash/import-export/qif/qif-import.h
diff --git a/src/import-export/qif/qif-objects-p.h b/gnucash/import-export/qif/qif-objects-p.h
similarity index 100%
rename from src/import-export/qif/qif-objects-p.h
rename to gnucash/import-export/qif/qif-objects-p.h
diff --git a/src/import-export/qif/qif-objects.c b/gnucash/import-export/qif/qif-objects.c
similarity index 100%
rename from src/import-export/qif/qif-objects.c
rename to gnucash/import-export/qif/qif-objects.c
diff --git a/src/import-export/qif/qif-objects.h b/gnucash/import-export/qif/qif-objects.h
similarity index 100%
rename from src/import-export/qif/qif-objects.h
rename to gnucash/import-export/qif/qif-objects.h
diff --git a/src/import-export/qif/qif-parse.c b/gnucash/import-export/qif/qif-parse.c
similarity index 100%
rename from src/import-export/qif/qif-parse.c
rename to gnucash/import-export/qif/qif-parse.c
diff --git a/src/import-export/qif/qif-parse.h b/gnucash/import-export/qif/qif-parse.h
similarity index 100%
rename from src/import-export/qif/qif-parse.h
rename to gnucash/import-export/qif/qif-parse.h
diff --git a/src/import-export/qif/test/CMakeLists.txt b/gnucash/import-export/qif/test/CMakeLists.txt
similarity index 75%
rename from src/import-export/qif/test/CMakeLists.txt
rename to gnucash/import-export/qif/test/CMakeLists.txt
index eb4d2b4aa1..072fdee7c5 100644
--- a/src/import-export/qif/test/CMakeLists.txt
+++ b/gnucash/import-export/qif/test/CMakeLists.txt
@@ -1,9 +1,9 @@
 
 SET(QIF_TEST_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/import-export/qif
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common
+  ${CMAKE_SOURCE_DIR}/gnucash/import-export/qif
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/common/test-core
   ${GLIB2_INCLUDE_DIRS}
 )
 SET(QIF_TEST_LIBS gncmod-qif test-core)
diff --git a/gnucash/import-export/qif/test/Makefile.am b/gnucash/import-export/qif/test/Makefile.am
new file mode 100644
index 0000000000..bbd63054ca
--- /dev/null
+++ b/gnucash/import-export/qif/test/Makefile.am
@@ -0,0 +1,49 @@
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/import-export \
+  -I${top_srcdir}/gnucash/import-export/qif \
+  ${GUILE_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+LDADD = \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/common/test-core/libtest-core.la \
+  ../../libgncmod-generic-import.la \
+  ../libgncmod-qif.la \
+  ${GLIB_LIBS}
+
+TESTS = \
+  test-link \
+  test-qif
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/core-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/gnc-module \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export/qif \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_srcdir}/libgnucash/gnc-module \
+  --gnc-module-dir ${top_srcdir}/libgnucash/engine \
+  --gnc-module-dir ${top_srcdir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_srcdir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome \
+  --guile-load-dir ${top_srcdir}/libgnucash/scm \
+  --guile-load-dir ${top_srcdir}/gnucash/import-export \
+  --guile-load-dir ${top_srcdir}/gnucash/import-export/qif
+
+TESTS_ENVIRONMENT = \
+  GNC_TEST_FILES=${srcdir}/test-files \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
+  test-link \
+  test-qif
+
+EXTRA_DIST = \
+  test-files/test-1-bank-txn.qif CMakeLists.txt
diff --git a/src/import-export/qif/test/test-files/test-1-bank-txn.qif b/gnucash/import-export/qif/test/test-files/test-1-bank-txn.qif
similarity index 100%
rename from src/import-export/qif/test/test-files/test-1-bank-txn.qif
rename to gnucash/import-export/qif/test/test-files/test-1-bank-txn.qif
diff --git a/src/import-export/qif/test/test-link.c b/gnucash/import-export/qif/test/test-link.c
similarity index 100%
rename from src/import-export/qif/test/test-link.c
rename to gnucash/import-export/qif/test/test-link.c
diff --git a/src/import-export/qif/test/test-qif.c b/gnucash/import-export/qif/test/test-qif.c
similarity index 100%
rename from src/import-export/qif/test/test-qif.c
rename to gnucash/import-export/qif/test/test-qif.c
diff --git a/src/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt
similarity index 72%
rename from src/import-export/test/CMakeLists.txt
rename to gnucash/import-export/test/CMakeLists.txt
index 12a9ade78c..07e872b082 100644
--- a/src/import-export/test/CMakeLists.txt
+++ b/gnucash/import-export/test/CMakeLists.txt
@@ -1,12 +1,12 @@
 
 
 SET(GENERIC_IMPORT_TEST_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
-  ${CMAKE_SOURCE_DIR}/src/import-export
-  ${CMAKE_SOURCE_DIR}/src/test-core
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/engine/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
+  ${CMAKE_SOURCE_DIR}/gnucash/import-export
+  ${CMAKE_SOURCE_DIR}/common/test-core
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/test-core
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
diff --git a/gnucash/import-export/test/Makefile.am b/gnucash/import-export/test/Makefile.am
new file mode 100644
index 0000000000..3cca84af49
--- /dev/null
+++ b/gnucash/import-export/test/Makefile.am
@@ -0,0 +1,78 @@
+include $(top_srcdir)/test-templates/Makefile.decl
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/import-export \
+  -I${top_srcdir}/libgnucash/engine/test-core \
+  ${GTK_CFLAGS} \
+  ${GUILE_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+LDADD = \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/common/test-core/libtest-core.la \
+  ../libgncmod-generic-import.la \
+  $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${GLIB_LIBS} \
+  ${GUILE_LIBS}
+
+TESTS = \
+  test-link \
+  test-import-parse
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/import-export \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+\
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql  \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
+  test-link \
+  test-import-parse
+
+TEST_PROGS += test-import-pending-matches
+
+noinst_PROGRAMS = $(TEST_PROGS) $(check_PROGRAMS)
+
+test_import_pending_matches_SOURCES = test-import-pending-matches.c
+
+test_import_pending_matches_LDADD = \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ../libgncmod-generic-import.la \
+  ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \
+  ${top_builddir}/common/test-core/libtest-core.la \
+  ${GLIB_LIBS}
+
+test_import_pending_matches_CFLAGS = $(AM_CPPFLAGS)
+
+clean-local:
+	rm -f translog.*
+
+distclean-local: clean-local
+
+EXTRA_DIST += CMakeLists.txt
diff --git a/src/import-export/test/test-import-parse.c b/gnucash/import-export/test/test-import-parse.c
similarity index 100%
rename from src/import-export/test/test-import-parse.c
rename to gnucash/import-export/test/test-import-parse.c
diff --git a/src/import-export/test/test-import-pending-matches.c b/gnucash/import-export/test/test-import-pending-matches.c
similarity index 100%
rename from src/import-export/test/test-import-pending-matches.c
rename to gnucash/import-export/test/test-import-pending-matches.c
diff --git a/src/import-export/test/test-link.c b/gnucash/import-export/test/test-link.c
similarity index 100%
rename from src/import-export/test/test-link.c
rename to gnucash/import-export/test/test-link.c
diff --git a/src/plugins/CMakeLists.txt b/gnucash/plugins/CMakeLists.txt
similarity index 100%
rename from src/plugins/CMakeLists.txt
rename to gnucash/plugins/CMakeLists.txt
diff --git a/src/plugins/Makefile.am b/gnucash/plugins/Makefile.am
similarity index 100%
rename from src/plugins/Makefile.am
rename to gnucash/plugins/Makefile.am
diff --git a/src/plugins/bi_import/CMakeLists.txt b/gnucash/plugins/bi_import/CMakeLists.txt
similarity index 96%
rename from src/plugins/bi_import/CMakeLists.txt
rename to gnucash/plugins/bi_import/CMakeLists.txt
index f6b25f32c7..76d04b5918 100644
--- a/src/plugins/bi_import/CMakeLists.txt
+++ b/gnucash/plugins/bi_import/CMakeLists.txt
@@ -34,7 +34,7 @@ TARGET_LINK_LIBRARIES(gncmod-bi_import
 
 TARGET_INCLUDE_DIRECTORIES(gncmod-bi_import
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE ${CMAKE_SOURCE_DIR}/src/gnome
+  PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/gnome
 )
 
 TARGET_COMPILE_DEFINITIONS(gncmod-bi_import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\")
diff --git a/gnucash/plugins/bi_import/Makefile.am b/gnucash/plugins/bi_import/Makefile.am
new file mode 100644
index 0000000000..e1a87e9b91
--- /dev/null
+++ b/gnucash/plugins/bi_import/Makefile.am
@@ -0,0 +1,51 @@
+SUBDIRS = ui gtkbuilder .
+
+pkglib_LTLIBRARIES = libgncmod-bi_import.la
+
+libgncmod_bi_import_la_SOURCES = \
+  gnc-plugin-bi-import.c \
+  gncmod-bi-import.c \
+  dialog-bi-import-gui.c \
+  dialog-bi-import-helper.c \
+  dialog-bi-import.c
+
+noinst_HEADERS = \
+  gnc-plugin-bi-import.h \
+  dialog-bi-import-gui.h \
+  dialog-bi-import-helper.h \
+  dialog-bi-import.h
+
+libgncmod_bi_import_la_LDFLAGS = -avoid-version
+
+libgncmod_bi_import_la_LIBADD = \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/lib/libc/libc-missing.la \
+  ${GLIB_LIBS}
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/report/report-gnome \
+  -I${top_srcdir}/gnucash/gnome-search/ \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/ledger-business \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/lib/libc \
+  ${GTK_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/plugins/bi_import/README b/gnucash/plugins/bi_import/README
similarity index 100%
rename from src/plugins/bi_import/README
rename to gnucash/plugins/bi_import/README
diff --git a/src/plugins/bi_import/dialog-bi-import-gui.c b/gnucash/plugins/bi_import/dialog-bi-import-gui.c
similarity index 100%
rename from src/plugins/bi_import/dialog-bi-import-gui.c
rename to gnucash/plugins/bi_import/dialog-bi-import-gui.c
diff --git a/src/plugins/bi_import/dialog-bi-import-gui.h b/gnucash/plugins/bi_import/dialog-bi-import-gui.h
similarity index 100%
rename from src/plugins/bi_import/dialog-bi-import-gui.h
rename to gnucash/plugins/bi_import/dialog-bi-import-gui.h
diff --git a/src/plugins/bi_import/dialog-bi-import-helper.c b/gnucash/plugins/bi_import/dialog-bi-import-helper.c
similarity index 100%
rename from src/plugins/bi_import/dialog-bi-import-helper.c
rename to gnucash/plugins/bi_import/dialog-bi-import-helper.c
diff --git a/src/plugins/bi_import/dialog-bi-import-helper.h b/gnucash/plugins/bi_import/dialog-bi-import-helper.h
similarity index 100%
rename from src/plugins/bi_import/dialog-bi-import-helper.h
rename to gnucash/plugins/bi_import/dialog-bi-import-helper.h
diff --git a/src/plugins/bi_import/dialog-bi-import.c b/gnucash/plugins/bi_import/dialog-bi-import.c
similarity index 100%
rename from src/plugins/bi_import/dialog-bi-import.c
rename to gnucash/plugins/bi_import/dialog-bi-import.c
diff --git a/src/plugins/bi_import/dialog-bi-import.h b/gnucash/plugins/bi_import/dialog-bi-import.h
similarity index 100%
rename from src/plugins/bi_import/dialog-bi-import.h
rename to gnucash/plugins/bi_import/dialog-bi-import.h
diff --git a/src/plugins/bi_import/gnc-plugin-bi-import.c b/gnucash/plugins/bi_import/gnc-plugin-bi-import.c
similarity index 100%
rename from src/plugins/bi_import/gnc-plugin-bi-import.c
rename to gnucash/plugins/bi_import/gnc-plugin-bi-import.c
diff --git a/src/plugins/bi_import/gnc-plugin-bi-import.h b/gnucash/plugins/bi_import/gnc-plugin-bi-import.h
similarity index 100%
rename from src/plugins/bi_import/gnc-plugin-bi-import.h
rename to gnucash/plugins/bi_import/gnc-plugin-bi-import.h
diff --git a/src/plugins/bi_import/gncmod-bi-import.c b/gnucash/plugins/bi_import/gncmod-bi-import.c
similarity index 100%
rename from src/plugins/bi_import/gncmod-bi-import.c
rename to gnucash/plugins/bi_import/gncmod-bi-import.c
diff --git a/src/plugins/bi_import/gtkbuilder/CMakeLists.txt b/gnucash/plugins/bi_import/gtkbuilder/CMakeLists.txt
similarity index 100%
rename from src/plugins/bi_import/gtkbuilder/CMakeLists.txt
rename to gnucash/plugins/bi_import/gtkbuilder/CMakeLists.txt
diff --git a/src/plugins/bi_import/gtkbuilder/Makefile.am b/gnucash/plugins/bi_import/gtkbuilder/Makefile.am
similarity index 100%
rename from src/plugins/bi_import/gtkbuilder/Makefile.am
rename to gnucash/plugins/bi_import/gtkbuilder/Makefile.am
diff --git a/src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade b/gnucash/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade
similarity index 100%
rename from src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade
rename to gnucash/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade
diff --git a/src/plugins/bi_import/regex.txt b/gnucash/plugins/bi_import/regex.txt
similarity index 100%
rename from src/plugins/bi_import/regex.txt
rename to gnucash/plugins/bi_import/regex.txt
diff --git a/src/plugins/bi_import/ui/CMakeLists.txt b/gnucash/plugins/bi_import/ui/CMakeLists.txt
similarity index 100%
rename from src/plugins/bi_import/ui/CMakeLists.txt
rename to gnucash/plugins/bi_import/ui/CMakeLists.txt
diff --git a/src/plugins/bi_import/ui/Makefile.am b/gnucash/plugins/bi_import/ui/Makefile.am
similarity index 100%
rename from src/plugins/bi_import/ui/Makefile.am
rename to gnucash/plugins/bi_import/ui/Makefile.am
diff --git a/src/plugins/bi_import/ui/gnc-plugin-bi-import-ui.xml b/gnucash/plugins/bi_import/ui/gnc-plugin-bi-import-ui.xml
similarity index 100%
rename from src/plugins/bi_import/ui/gnc-plugin-bi-import-ui.xml
rename to gnucash/plugins/bi_import/ui/gnc-plugin-bi-import-ui.xml
diff --git a/src/plugins/customer_import/CMakeLists.txt b/gnucash/plugins/customer_import/CMakeLists.txt
similarity index 96%
rename from src/plugins/customer_import/CMakeLists.txt
rename to gnucash/plugins/customer_import/CMakeLists.txt
index 36772b1689..c0b9e9bb51 100644
--- a/src/plugins/customer_import/CMakeLists.txt
+++ b/gnucash/plugins/customer_import/CMakeLists.txt
@@ -25,7 +25,7 @@ TARGET_LINK_LIBRARIES(gncmod-customer_import gnc-gnome gncmod-gnome-utils gncmod
 
 TARGET_INCLUDE_DIRECTORIES(gncmod-bi_import
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE ${CMAKE_SOURCE_DIR}/src/gnome
+  PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/gnome
 )
 
 TARGET_COMPILE_DEFINITIONS(gncmod-customer_import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\")
diff --git a/gnucash/plugins/customer_import/Makefile.am b/gnucash/plugins/customer_import/Makefile.am
new file mode 100644
index 0000000000..a6577c82bf
--- /dev/null
+++ b/gnucash/plugins/customer_import/Makefile.am
@@ -0,0 +1,48 @@
+SUBDIRS = ui gtkbuilder .
+
+pkglib_LTLIBRARIES = libgncmod-customer_import.la
+
+libgncmod_customer_import_la_SOURCES = \
+  gnc-plugin-customer_import.c \
+  libgncmod-customer_import.c \
+  dialog-customer-import-gui.c \
+  dialog-customer-import.c
+
+noinst_HEADERS = \
+  gnc-plugin-customer_import.h \
+  dialog-customer-import-gui.h \
+  dialog-customer-import.h
+
+libgncmod_customer_import_la_LDFLAGS = -avoid-version
+
+libgncmod_customer_import_la_LIBADD = \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/lib/libc/libc-missing.la \
+  ${GLIB_LIBS}
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/report/report-gnome \
+  -I${top_srcdir}/gnucash/gnome-search/ \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/lib/libc \
+  ${GTK_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/plugins/customer_import/dialog-customer-import-gui.c b/gnucash/plugins/customer_import/dialog-customer-import-gui.c
similarity index 100%
rename from src/plugins/customer_import/dialog-customer-import-gui.c
rename to gnucash/plugins/customer_import/dialog-customer-import-gui.c
diff --git a/src/plugins/customer_import/dialog-customer-import-gui.h b/gnucash/plugins/customer_import/dialog-customer-import-gui.h
similarity index 100%
rename from src/plugins/customer_import/dialog-customer-import-gui.h
rename to gnucash/plugins/customer_import/dialog-customer-import-gui.h
diff --git a/src/plugins/customer_import/dialog-customer-import.c b/gnucash/plugins/customer_import/dialog-customer-import.c
similarity index 100%
rename from src/plugins/customer_import/dialog-customer-import.c
rename to gnucash/plugins/customer_import/dialog-customer-import.c
diff --git a/src/plugins/customer_import/dialog-customer-import.h b/gnucash/plugins/customer_import/dialog-customer-import.h
similarity index 100%
rename from src/plugins/customer_import/dialog-customer-import.h
rename to gnucash/plugins/customer_import/dialog-customer-import.h
diff --git a/src/plugins/customer_import/gnc-plugin-customer_import.c b/gnucash/plugins/customer_import/gnc-plugin-customer_import.c
similarity index 100%
rename from src/plugins/customer_import/gnc-plugin-customer_import.c
rename to gnucash/plugins/customer_import/gnc-plugin-customer_import.c
diff --git a/src/plugins/customer_import/gnc-plugin-customer_import.h b/gnucash/plugins/customer_import/gnc-plugin-customer_import.h
similarity index 100%
rename from src/plugins/customer_import/gnc-plugin-customer_import.h
rename to gnucash/plugins/customer_import/gnc-plugin-customer_import.h
diff --git a/src/plugins/customer_import/gtkbuilder/CMakeLists.txt b/gnucash/plugins/customer_import/gtkbuilder/CMakeLists.txt
similarity index 100%
rename from src/plugins/customer_import/gtkbuilder/CMakeLists.txt
rename to gnucash/plugins/customer_import/gtkbuilder/CMakeLists.txt
diff --git a/src/plugins/customer_import/gtkbuilder/Makefile.am b/gnucash/plugins/customer_import/gtkbuilder/Makefile.am
similarity index 100%
rename from src/plugins/customer_import/gtkbuilder/Makefile.am
rename to gnucash/plugins/customer_import/gtkbuilder/Makefile.am
diff --git a/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
similarity index 100%
rename from src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
rename to gnucash/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
diff --git a/src/plugins/customer_import/libgncmod-customer_import.c b/gnucash/plugins/customer_import/libgncmod-customer_import.c
similarity index 100%
rename from src/plugins/customer_import/libgncmod-customer_import.c
rename to gnucash/plugins/customer_import/libgncmod-customer_import.c
diff --git a/src/plugins/customer_import/ui/CMakeLists.txt b/gnucash/plugins/customer_import/ui/CMakeLists.txt
similarity index 100%
rename from src/plugins/customer_import/ui/CMakeLists.txt
rename to gnucash/plugins/customer_import/ui/CMakeLists.txt
diff --git a/src/plugins/customer_import/ui/Makefile.am b/gnucash/plugins/customer_import/ui/Makefile.am
similarity index 100%
rename from src/plugins/customer_import/ui/Makefile.am
rename to gnucash/plugins/customer_import/ui/Makefile.am
diff --git a/src/plugins/customer_import/ui/gnc-plugin-customer_import-ui.xml b/gnucash/plugins/customer_import/ui/gnc-plugin-customer_import-ui.xml
similarity index 100%
rename from src/plugins/customer_import/ui/gnc-plugin-customer_import-ui.xml
rename to gnucash/plugins/customer_import/ui/gnc-plugin-customer_import-ui.xml
diff --git a/src/plugins/example/CMakeLists.txt b/gnucash/plugins/example/CMakeLists.txt
similarity index 100%
rename from src/plugins/example/CMakeLists.txt
rename to gnucash/plugins/example/CMakeLists.txt
diff --git a/src/plugins/example/Makefile.am b/gnucash/plugins/example/Makefile.am
similarity index 50%
rename from src/plugins/example/Makefile.am
rename to gnucash/plugins/example/Makefile.am
index 8944dcbdb2..d575ab64f4 100644
--- a/src/plugins/example/Makefile.am
+++ b/gnucash/plugins/example/Makefile.am
@@ -12,23 +12,23 @@ noinst_HEADERS = \
 libgncmod_example_la_LDFLAGS = -avoid-version
 
 libgncmod_example_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${GLIB_LIBS} \
   ${AQBANKING_LIBS}
 
 AM_CFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GLIB_CFLAGS} \
diff --git a/src/plugins/example/glade/CMakeLists.txt b/gnucash/plugins/example/glade/CMakeLists.txt
similarity index 100%
rename from src/plugins/example/glade/CMakeLists.txt
rename to gnucash/plugins/example/glade/CMakeLists.txt
diff --git a/src/plugins/example/glade/Makefile.am b/gnucash/plugins/example/glade/Makefile.am
similarity index 100%
rename from src/plugins/example/glade/Makefile.am
rename to gnucash/plugins/example/glade/Makefile.am
diff --git a/src/plugins/example/gnc-plugin.example.c b/gnucash/plugins/example/gnc-plugin.example.c
similarity index 100%
rename from src/plugins/example/gnc-plugin.example.c
rename to gnucash/plugins/example/gnc-plugin.example.c
diff --git a/src/plugins/example/gnc-plugin.example.h b/gnucash/plugins/example/gnc-plugin.example.h
similarity index 100%
rename from src/plugins/example/gnc-plugin.example.h
rename to gnucash/plugins/example/gnc-plugin.example.h
diff --git a/src/plugins/example/gncmod-example.c b/gnucash/plugins/example/gncmod-example.c
similarity index 100%
rename from src/plugins/example/gncmod-example.c
rename to gnucash/plugins/example/gncmod-example.c
diff --git a/src/plugins/example/ui/CMakeLists.txt b/gnucash/plugins/example/ui/CMakeLists.txt
similarity index 100%
rename from src/plugins/example/ui/CMakeLists.txt
rename to gnucash/plugins/example/ui/CMakeLists.txt
diff --git a/src/plugins/example/ui/Makefile.am b/gnucash/plugins/example/ui/Makefile.am
similarity index 100%
rename from src/plugins/example/ui/Makefile.am
rename to gnucash/plugins/example/ui/Makefile.am
diff --git a/src/plugins/example/ui/gnc-plugin-example-ui.xml b/gnucash/plugins/example/ui/gnc-plugin-example-ui.xml
similarity index 100%
rename from src/plugins/example/ui/gnc-plugin-example-ui.xml
rename to gnucash/plugins/example/ui/gnc-plugin-example-ui.xml
diff --git a/src/python/CMakeLists.txt b/gnucash/python/CMakeLists.txt
similarity index 100%
rename from src/python/CMakeLists.txt
rename to gnucash/python/CMakeLists.txt
diff --git a/src/python/Makefile.am b/gnucash/python/Makefile.am
similarity index 77%
rename from src/python/Makefile.am
rename to gnucash/python/Makefile.am
index 22b0184e4b..b3f79719c0 100644
--- a/src/python/Makefile.am
+++ b/gnucash/python/Makefile.am
@@ -10,17 +10,17 @@ libgncmod_python_la_LDFLAGS = -avoid-version \
   ${PYTHON_LDFLAGS}
 
 libgncmod_python_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils-python.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils-python.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils-python.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils-python.la \
   ${PYTHON_LIBS} \
   ${PYTHON_EXTRA_LIBS} \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${PYTHON_CPPFLAGS} \
   ${GLIB_CFLAGS}
 
diff --git a/src/python/gncmod-python.c b/gnucash/python/gncmod-python.c
similarity index 100%
rename from src/python/gncmod-python.c
rename to gnucash/python/gncmod-python.c
diff --git a/src/python/init.py b/gnucash/python/init.py
similarity index 100%
rename from src/python/init.py
rename to gnucash/python/init.py
diff --git a/src/python/pycons/CMakeLists.txt b/gnucash/python/pycons/CMakeLists.txt
similarity index 100%
rename from src/python/pycons/CMakeLists.txt
rename to gnucash/python/pycons/CMakeLists.txt
diff --git a/src/python/pycons/Makefile.am b/gnucash/python/pycons/Makefile.am
similarity index 100%
rename from src/python/pycons/Makefile.am
rename to gnucash/python/pycons/Makefile.am
diff --git a/src/python/pycons/__init__.py b/gnucash/python/pycons/__init__.py
similarity index 100%
rename from src/python/pycons/__init__.py
rename to gnucash/python/pycons/__init__.py
diff --git a/src/python/pycons/console.py b/gnucash/python/pycons/console.py
similarity index 100%
rename from src/python/pycons/console.py
rename to gnucash/python/pycons/console.py
diff --git a/src/python/pycons/ishell.py b/gnucash/python/pycons/ishell.py
similarity index 100%
rename from src/python/pycons/ishell.py
rename to gnucash/python/pycons/ishell.py
diff --git a/src/python/pycons/pycons b/gnucash/python/pycons/pycons
similarity index 100%
rename from src/python/pycons/pycons
rename to gnucash/python/pycons/pycons
diff --git a/src/python/pycons/setup.py b/gnucash/python/pycons/setup.py
similarity index 100%
rename from src/python/pycons/setup.py
rename to gnucash/python/pycons/setup.py
diff --git a/src/python/pycons/shell.py b/gnucash/python/pycons/shell.py
similarity index 100%
rename from src/python/pycons/shell.py
rename to gnucash/python/pycons/shell.py
diff --git a/src/python/pycons/simple_plot.py b/gnucash/python/pycons/simple_plot.py
similarity index 100%
rename from src/python/pycons/simple_plot.py
rename to gnucash/python/pycons/simple_plot.py
diff --git a/src/register/CMakeLists.txt b/gnucash/register/CMakeLists.txt
similarity index 100%
rename from src/register/CMakeLists.txt
rename to gnucash/register/CMakeLists.txt
diff --git a/src/register/Makefile.am b/gnucash/register/Makefile.am
similarity index 100%
rename from src/register/Makefile.am
rename to gnucash/register/Makefile.am
diff --git a/src/register/ledger-core/CMakeLists.txt b/gnucash/register/ledger-core/CMakeLists.txt
similarity index 90%
rename from src/register/ledger-core/CMakeLists.txt
rename to gnucash/register/ledger-core/CMakeLists.txt
index 295e76a789..df8a676bff 100644
--- a/src/register/ledger-core/CMakeLists.txt
+++ b/gnucash/register/ledger-core/CMakeLists.txt
@@ -47,7 +47,11 @@ TARGET_LINK_LIBRARIES(gncmod-ledger-core gncmod-register-gnome gncmod-register-c
 
 TARGET_COMPILE_DEFINITIONS (gncmod-ledger-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.ledger\")
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-ledger-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+TARGET_INCLUDE_DIRECTORIES(gncmod-ledger-core
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_BINARY_DIR}/gnucash/gnome-utils # for gnc-warnings.h
+)
 
 INSTALL(TARGETS gncmod-ledger-core
   LIBRARY DESTINATION lib/gnucash
diff --git a/src/register/ledger-core/Makefile.am b/gnucash/register/ledger-core/Makefile.am
similarity index 57%
rename from src/register/ledger-core/Makefile.am
rename to gnucash/register/ledger-core/Makefile.am
index 739d3113df..c0bf2ac861 100644
--- a/src/register/ledger-core/Makefile.am
+++ b/gnucash/register/ledger-core/Makefile.am
@@ -38,27 +38,28 @@ noinst_HEADERS = \
 libgncmod_ledger_core_la_LDFLAGS = -avoid-version
 
 libgncmod_ledger_core_la_LIBADD = \
-  ${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
-  ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/register/register-gnome/libgncmod-register-gnome.la \
+  ${top_builddir}/gnucash/register/register-core/libgncmod-register-core.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ${GUILE_LIBS} \
   ${GTK_LIBS} \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/register/register-gnome \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_builddir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/register/register-core \
+  -I${top_srcdir}/gnucash/register/register-gnome \
   ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS} \
diff --git a/src/register/ledger-core/gnc-ledger-display.c b/gnucash/register/ledger-core/gnc-ledger-display.c
similarity index 100%
rename from src/register/ledger-core/gnc-ledger-display.c
rename to gnucash/register/ledger-core/gnc-ledger-display.c
diff --git a/src/register/ledger-core/gnc-ledger-display.h b/gnucash/register/ledger-core/gnc-ledger-display.h
similarity index 100%
rename from src/register/ledger-core/gnc-ledger-display.h
rename to gnucash/register/ledger-core/gnc-ledger-display.h
diff --git a/src/register/ledger-core/gnc-ledger-display2.c b/gnucash/register/ledger-core/gnc-ledger-display2.c
similarity index 100%
rename from src/register/ledger-core/gnc-ledger-display2.c
rename to gnucash/register/ledger-core/gnc-ledger-display2.c
diff --git a/src/register/ledger-core/gnc-ledger-display2.h b/gnucash/register/ledger-core/gnc-ledger-display2.h
similarity index 100%
rename from src/register/ledger-core/gnc-ledger-display2.h
rename to gnucash/register/ledger-core/gnc-ledger-display2.h
diff --git a/src/register/ledger-core/gncEntryLedger.c b/gnucash/register/ledger-core/gncEntryLedger.c
similarity index 99%
rename from src/register/ledger-core/gncEntryLedger.c
rename to gnucash/register/ledger-core/gncEntryLedger.c
index 8257c5107e..a4315a7e7e 100644
--- a/src/register/ledger-core/gncEntryLedger.c
+++ b/gnucash/register/ledger-core/gncEntryLedger.c
@@ -37,7 +37,7 @@
 
 #include "gnc-component-manager.h"
 #include "gnc-ui.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 
 #include "gncEntry.h"
 #include "gncEntryLedger.h"
diff --git a/src/register/ledger-core/gncEntryLedger.h b/gnucash/register/ledger-core/gncEntryLedger.h
similarity index 100%
rename from src/register/ledger-core/gncEntryLedger.h
rename to gnucash/register/ledger-core/gncEntryLedger.h
diff --git a/src/register/ledger-core/gncEntryLedgerControl.c b/gnucash/register/ledger-core/gncEntryLedgerControl.c
similarity index 99%
rename from src/register/ledger-core/gncEntryLedgerControl.c
rename to gnucash/register/ledger-core/gncEntryLedgerControl.c
index ec0e84c610..fa23b998f8 100644
--- a/src/register/ledger-core/gncEntryLedgerControl.c
+++ b/gnucash/register/ledger-core/gncEntryLedgerControl.c
@@ -37,11 +37,11 @@
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
 #include "gnc-gui-query.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "table-allgui.h"
 #include "pricecell.h"
 #include "dialog-tax-table.h"
-#include "register/register-core/checkboxcell.h"
+#include "checkboxcell.h"
 
 #include "gncEntryLedgerP.h"
 #include "gncEntryLedgerControl.h"
diff --git a/src/register/ledger-core/gncEntryLedgerControl.h b/gnucash/register/ledger-core/gncEntryLedgerControl.h
similarity index 100%
rename from src/register/ledger-core/gncEntryLedgerControl.h
rename to gnucash/register/ledger-core/gncEntryLedgerControl.h
diff --git a/src/register/ledger-core/gncEntryLedgerDisplay.c b/gnucash/register/ledger-core/gncEntryLedgerDisplay.c
similarity index 100%
rename from src/register/ledger-core/gncEntryLedgerDisplay.c
rename to gnucash/register/ledger-core/gncEntryLedgerDisplay.c
diff --git a/src/register/ledger-core/gncEntryLedgerLayout.c b/gnucash/register/ledger-core/gncEntryLedgerLayout.c
similarity index 100%
rename from src/register/ledger-core/gncEntryLedgerLayout.c
rename to gnucash/register/ledger-core/gncEntryLedgerLayout.c
diff --git a/src/register/ledger-core/gncEntryLedgerLayout.h b/gnucash/register/ledger-core/gncEntryLedgerLayout.h
similarity index 100%
rename from src/register/ledger-core/gncEntryLedgerLayout.h
rename to gnucash/register/ledger-core/gncEntryLedgerLayout.h
diff --git a/src/register/ledger-core/gncEntryLedgerLoad.c b/gnucash/register/ledger-core/gncEntryLedgerLoad.c
similarity index 99%
rename from src/register/ledger-core/gncEntryLedgerLoad.c
rename to gnucash/register/ledger-core/gncEntryLedgerLoad.c
index c277836b85..9da269fe14 100644
--- a/src/register/ledger-core/gncEntryLedgerLoad.c
+++ b/gnucash/register/ledger-core/gncEntryLedgerLoad.c
@@ -40,7 +40,7 @@
 #include "gncEntryLedger.h"
 #include "gncEntryLedgerP.h"
 #include "quickfillcell.h"
-#include "app-utils/gnc-entry-quickfill.h"
+#include "gnc-entry-quickfill.h"
 
 #define GNC_PREF_TAX_INCL "tax-included"
 
diff --git a/src/register/ledger-core/gncEntryLedgerModel.c b/gnucash/register/ledger-core/gncEntryLedgerModel.c
similarity index 100%
rename from src/register/ledger-core/gncEntryLedgerModel.c
rename to gnucash/register/ledger-core/gncEntryLedgerModel.c
diff --git a/src/register/ledger-core/gncEntryLedgerModel.h b/gnucash/register/ledger-core/gncEntryLedgerModel.h
similarity index 100%
rename from src/register/ledger-core/gncEntryLedgerModel.h
rename to gnucash/register/ledger-core/gncEntryLedgerModel.h
diff --git a/src/register/ledger-core/gncEntryLedgerP.h b/gnucash/register/ledger-core/gncEntryLedgerP.h
similarity index 100%
rename from src/register/ledger-core/gncEntryLedgerP.h
rename to gnucash/register/ledger-core/gncEntryLedgerP.h
diff --git a/src/register/ledger-core/gncmod-ledger-core.c b/gnucash/register/ledger-core/gncmod-ledger-core.c
similarity index 100%
rename from src/register/ledger-core/gncmod-ledger-core.c
rename to gnucash/register/ledger-core/gncmod-ledger-core.c
diff --git a/src/register/ledger-core/split-register-control.c b/gnucash/register/ledger-core/split-register-control.c
similarity index 99%
rename from src/register/ledger-core/split-register-control.c
rename to gnucash/register/ledger-core/split-register-control.c
index 3117dac2df..6f3b611ffd 100644
--- a/src/register/ledger-core/split-register-control.c
+++ b/gnucash/register/ledger-core/split-register-control.c
@@ -30,7 +30,7 @@
 #include "gnc-component-manager.h"
 #include "gnc-prefs.h"
 #include "gnc-ui.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "pricecell.h"
 #include "datecell.h"
 #include "dialog-transfer.h"
diff --git a/src/register/ledger-core/split-register-control.h b/gnucash/register/ledger-core/split-register-control.h
similarity index 100%
rename from src/register/ledger-core/split-register-control.h
rename to gnucash/register/ledger-core/split-register-control.h
diff --git a/src/register/ledger-core/split-register-layout.c b/gnucash/register/ledger-core/split-register-layout.c
similarity index 100%
rename from src/register/ledger-core/split-register-layout.c
rename to gnucash/register/ledger-core/split-register-layout.c
diff --git a/src/register/ledger-core/split-register-layout.h b/gnucash/register/ledger-core/split-register-layout.h
similarity index 100%
rename from src/register/ledger-core/split-register-layout.h
rename to gnucash/register/ledger-core/split-register-layout.h
diff --git a/src/register/ledger-core/split-register-load.c b/gnucash/register/ledger-core/split-register-load.c
similarity index 100%
rename from src/register/ledger-core/split-register-load.c
rename to gnucash/register/ledger-core/split-register-load.c
diff --git a/src/register/ledger-core/split-register-model-save.c b/gnucash/register/ledger-core/split-register-model-save.c
similarity index 99%
rename from src/register/ledger-core/split-register-model-save.c
rename to gnucash/register/ledger-core/split-register-model-save.c
index 723ce2e6a5..34bbdbdc90 100644
--- a/src/register/ledger-core/split-register-model-save.c
+++ b/gnucash/register/ledger-core/split-register-model-save.c
@@ -34,7 +34,7 @@
 #include "recncell.h"
 #include "split-register-model-save.h"
 #include "split-register-p.h"
-#include "app-utils/gnc-exp-parser.h"
+#include "gnc-exp-parser.h"
 
 
 struct sr_save_data
diff --git a/src/register/ledger-core/split-register-model-save.h b/gnucash/register/ledger-core/split-register-model-save.h
similarity index 100%
rename from src/register/ledger-core/split-register-model-save.h
rename to gnucash/register/ledger-core/split-register-model-save.h
diff --git a/src/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c
similarity index 99%
rename from src/register/ledger-core/split-register-model.c
rename to gnucash/register/ledger-core/split-register-model.c
index e299fcaaf7..86e406da24 100644
--- a/src/register/ledger-core/split-register-model.c
+++ b/gnucash/register/ledger-core/split-register-model.c
@@ -30,7 +30,7 @@
 #include "gnc-engine.h"
 #include "gnc-prefs.h"
 #include "gnc-ui.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "pricecell.h"
 #include "recncell.h"
 #include "split-register.h"
diff --git a/src/register/ledger-core/split-register-model.h b/gnucash/register/ledger-core/split-register-model.h
similarity index 100%
rename from src/register/ledger-core/split-register-model.h
rename to gnucash/register/ledger-core/split-register-model.h
diff --git a/src/register/ledger-core/split-register-p.h b/gnucash/register/ledger-core/split-register-p.h
similarity index 100%
rename from src/register/ledger-core/split-register-p.h
rename to gnucash/register/ledger-core/split-register-p.h
diff --git a/src/register/ledger-core/split-register-util.c b/gnucash/register/ledger-core/split-register-util.c
similarity index 100%
rename from src/register/ledger-core/split-register-util.c
rename to gnucash/register/ledger-core/split-register-util.c
diff --git a/src/register/ledger-core/split-register.c b/gnucash/register/ledger-core/split-register.c
similarity index 99%
rename from src/register/ledger-core/split-register.c
rename to gnucash/register/ledger-core/split-register.c
index 99972d5af5..ca5c9777fc 100644
--- a/src/register/ledger-core/split-register.c
+++ b/gnucash/register/ledger-core/split-register.c
@@ -37,7 +37,7 @@
 #include "gnc-ledger-display.h"
 #include "gnc-prefs.h"
 #include "gnc-ui.h"
-#include "gnome-utils/gnc-warnings.h"
+#include "gnc-warnings.h"
 #include "guile-util.h"
 #include "numcell.h"
 #include "pricecell.h"
diff --git a/src/register/ledger-core/split-register.h b/gnucash/register/ledger-core/split-register.h
similarity index 100%
rename from src/register/ledger-core/split-register.h
rename to gnucash/register/ledger-core/split-register.h
diff --git a/src/register/ledger-core/test/CMakeLists.txt b/gnucash/register/ledger-core/test/CMakeLists.txt
similarity index 100%
rename from src/register/ledger-core/test/CMakeLists.txt
rename to gnucash/register/ledger-core/test/CMakeLists.txt
diff --git a/gnucash/register/ledger-core/test/Makefile.am b/gnucash/register/ledger-core/test/Makefile.am
new file mode 100644
index 0000000000..34fe1b9f22
--- /dev/null
+++ b/gnucash/register/ledger-core/test/Makefile.am
@@ -0,0 +1,15 @@
+TESTS =  test-link-module
+
+check_PROGRAMS = test-link-module
+
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD=\
+	$(top_builddir)/libgnucash/engine/libgncmod-engine.la \
+        $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \
+	${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+	${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+    ../libgncmod-ledger-core.la
+
+AM_CPPFLAGS = -I${top_srcdir}/common/test-core -I.. ${GLIB_CFLAGS}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/ledger-core/test/test-link-module.c b/gnucash/register/ledger-core/test/test-link-module.c
similarity index 100%
rename from src/register/ledger-core/test/test-link-module.c
rename to gnucash/register/ledger-core/test/test-link-module.c
diff --git a/src/register/register-core/CMakeLists.txt b/gnucash/register/register-core/CMakeLists.txt
similarity index 100%
rename from src/register/register-core/CMakeLists.txt
rename to gnucash/register/register-core/CMakeLists.txt
diff --git a/src/register/register-core/Makefile.am b/gnucash/register/register-core/Makefile.am
similarity index 66%
rename from src/register/register-core/Makefile.am
rename to gnucash/register/register-core/Makefile.am
index dca543d24a..83324a6db1 100644
--- a/src/register/register-core/Makefile.am
+++ b/gnucash/register/register-core/Makefile.am
@@ -5,11 +5,11 @@ pkglib_LTLIBRARIES = libgncmod-register-core.la
 libgncmod_register_core_la_LDFLAGS = -avoid-version
 
 libgncmod_register_core_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
@@ -53,12 +53,12 @@ gncinclude_HEADERS = \
   table-model.h
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/gnome-utils \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/gnucash/gnome-utils \
   ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
diff --git a/src/register/register-core/README b/gnucash/register/register-core/README
similarity index 100%
rename from src/register/register-core/README
rename to gnucash/register/register-core/README
diff --git a/src/register/register-core/basiccell.c b/gnucash/register/register-core/basiccell.c
similarity index 100%
rename from src/register/register-core/basiccell.c
rename to gnucash/register/register-core/basiccell.c
diff --git a/src/register/register-core/basiccell.h b/gnucash/register/register-core/basiccell.h
similarity index 100%
rename from src/register/register-core/basiccell.h
rename to gnucash/register/register-core/basiccell.h
diff --git a/src/register/register-core/cell-factory.c b/gnucash/register/register-core/cell-factory.c
similarity index 100%
rename from src/register/register-core/cell-factory.c
rename to gnucash/register/register-core/cell-factory.c
diff --git a/src/register/register-core/cell-factory.h b/gnucash/register/register-core/cell-factory.h
similarity index 100%
rename from src/register/register-core/cell-factory.h
rename to gnucash/register/register-core/cell-factory.h
diff --git a/src/register/register-core/cellblock.c b/gnucash/register/register-core/cellblock.c
similarity index 100%
rename from src/register/register-core/cellblock.c
rename to gnucash/register/register-core/cellblock.c
diff --git a/src/register/register-core/cellblock.h b/gnucash/register/register-core/cellblock.h
similarity index 100%
rename from src/register/register-core/cellblock.h
rename to gnucash/register/register-core/cellblock.h
diff --git a/src/register/register-core/checkboxcell.c b/gnucash/register/register-core/checkboxcell.c
similarity index 100%
rename from src/register/register-core/checkboxcell.c
rename to gnucash/register/register-core/checkboxcell.c
diff --git a/src/register/register-core/checkboxcell.h b/gnucash/register/register-core/checkboxcell.h
similarity index 100%
rename from src/register/register-core/checkboxcell.h
rename to gnucash/register/register-core/checkboxcell.h
diff --git a/src/register/register-core/combocell.h b/gnucash/register/register-core/combocell.h
similarity index 100%
rename from src/register/register-core/combocell.h
rename to gnucash/register/register-core/combocell.h
diff --git a/src/register/register-core/datecell.h b/gnucash/register/register-core/datecell.h
similarity index 100%
rename from src/register/register-core/datecell.h
rename to gnucash/register/register-core/datecell.h
diff --git a/src/register/register-core/formulacell.c b/gnucash/register/register-core/formulacell.c
similarity index 100%
rename from src/register/register-core/formulacell.c
rename to gnucash/register/register-core/formulacell.c
diff --git a/src/register/register-core/formulacell.h b/gnucash/register/register-core/formulacell.h
similarity index 100%
rename from src/register/register-core/formulacell.h
rename to gnucash/register/register-core/formulacell.h
diff --git a/src/register/register-core/gncmod-register-core.c b/gnucash/register/register-core/gncmod-register-core.c
similarity index 100%
rename from src/register/register-core/gncmod-register-core.c
rename to gnucash/register/register-core/gncmod-register-core.c
diff --git a/src/register/register-core/gtable.c b/gnucash/register/register-core/gtable.c
similarity index 100%
rename from src/register/register-core/gtable.c
rename to gnucash/register/register-core/gtable.c
diff --git a/src/register/register-core/gtable.h b/gnucash/register/register-core/gtable.h
similarity index 100%
rename from src/register/register-core/gtable.h
rename to gnucash/register/register-core/gtable.h
diff --git a/src/register/register-core/numcell.c b/gnucash/register/register-core/numcell.c
similarity index 100%
rename from src/register/register-core/numcell.c
rename to gnucash/register/register-core/numcell.c
diff --git a/src/register/register-core/numcell.h b/gnucash/register/register-core/numcell.h
similarity index 100%
rename from src/register/register-core/numcell.h
rename to gnucash/register/register-core/numcell.h
diff --git a/src/register/register-core/pricecell.c b/gnucash/register/register-core/pricecell.c
similarity index 100%
rename from src/register/register-core/pricecell.c
rename to gnucash/register/register-core/pricecell.c
diff --git a/src/register/register-core/pricecell.h b/gnucash/register/register-core/pricecell.h
similarity index 100%
rename from src/register/register-core/pricecell.h
rename to gnucash/register/register-core/pricecell.h
diff --git a/src/register/register-core/quickfillcell.c b/gnucash/register/register-core/quickfillcell.c
similarity index 100%
rename from src/register/register-core/quickfillcell.c
rename to gnucash/register/register-core/quickfillcell.c
diff --git a/src/register/register-core/quickfillcell.h b/gnucash/register/register-core/quickfillcell.h
similarity index 100%
rename from src/register/register-core/quickfillcell.h
rename to gnucash/register/register-core/quickfillcell.h
diff --git a/src/register/register-core/recncell.c b/gnucash/register/register-core/recncell.c
similarity index 100%
rename from src/register/register-core/recncell.c
rename to gnucash/register/register-core/recncell.c
diff --git a/src/register/register-core/recncell.h b/gnucash/register/register-core/recncell.h
similarity index 100%
rename from src/register/register-core/recncell.h
rename to gnucash/register/register-core/recncell.h
diff --git a/src/register/register-core/register-common.c b/gnucash/register/register-core/register-common.c
similarity index 100%
rename from src/register/register-core/register-common.c
rename to gnucash/register/register-core/register-common.c
diff --git a/src/register/register-core/register-common.h b/gnucash/register/register-core/register-common.h
similarity index 100%
rename from src/register/register-core/register-common.h
rename to gnucash/register/register-core/register-common.h
diff --git a/src/register/register-core/table-allgui.c b/gnucash/register/register-core/table-allgui.c
similarity index 100%
rename from src/register/register-core/table-allgui.c
rename to gnucash/register/register-core/table-allgui.c
diff --git a/src/register/register-core/table-allgui.h b/gnucash/register/register-core/table-allgui.h
similarity index 100%
rename from src/register/register-core/table-allgui.h
rename to gnucash/register/register-core/table-allgui.h
diff --git a/src/register/register-core/table-control.c b/gnucash/register/register-core/table-control.c
similarity index 100%
rename from src/register/register-core/table-control.c
rename to gnucash/register/register-core/table-control.c
diff --git a/src/register/register-core/table-control.h b/gnucash/register/register-core/table-control.h
similarity index 100%
rename from src/register/register-core/table-control.h
rename to gnucash/register/register-core/table-control.h
diff --git a/src/register/register-core/table-layout.c b/gnucash/register/register-core/table-layout.c
similarity index 100%
rename from src/register/register-core/table-layout.c
rename to gnucash/register/register-core/table-layout.c
diff --git a/src/register/register-core/table-layout.h b/gnucash/register/register-core/table-layout.h
similarity index 100%
rename from src/register/register-core/table-layout.h
rename to gnucash/register/register-core/table-layout.h
diff --git a/src/register/register-core/table-model.c b/gnucash/register/register-core/table-model.c
similarity index 100%
rename from src/register/register-core/table-model.c
rename to gnucash/register/register-core/table-model.c
diff --git a/src/register/register-core/table-model.h b/gnucash/register/register-core/table-model.h
similarity index 100%
rename from src/register/register-core/table-model.h
rename to gnucash/register/register-core/table-model.h
diff --git a/src/register/register-core/test/CMakeLists.txt b/gnucash/register/register-core/test/CMakeLists.txt
similarity index 100%
rename from src/register/register-core/test/CMakeLists.txt
rename to gnucash/register/register-core/test/CMakeLists.txt
diff --git a/gnucash/register/register-core/test/Makefile.am b/gnucash/register/register-core/test/Makefile.am
new file mode 100644
index 0000000000..84387df0af
--- /dev/null
+++ b/gnucash/register/register-core/test/Makefile.am
@@ -0,0 +1,24 @@
+TESTS =  \
+  test-link-module
+#  test-load-module
+
+#GNC_TEST_DEPS := \
+#
+
+#TESTS_ENVIRONMENT := \
+#  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
+  test-link-module
+
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD=\
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ../libgncmod-register-core.la
+
+EXTRA_DIST = CMakeLists.txt
+#            test-load-module
+
+AM_CPPFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/common/test-core -I..
diff --git a/src/register/register-core/test/test-link-module.c b/gnucash/register/register-core/test/test-link-module.c
similarity index 100%
rename from src/register/register-core/test/test-link-module.c
rename to gnucash/register/register-core/test/test-link-module.c
diff --git a/src/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt
similarity index 95%
rename from src/register/register-gnome/CMakeLists.txt
rename to gnucash/register/register-gnome/CMakeLists.txt
index 2e9b2e7b35..a3c17bb755 100644
--- a/src/register/register-gnome/CMakeLists.txt
+++ b/gnucash/register/register-gnome/CMakeLists.txt
@@ -50,7 +50,7 @@ TARGET_COMPILE_DEFINITIONS(gncmod-register-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.re
 
 TARGET_INCLUDE_DIRECTORIES(gncmod-register-gnome
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-    PRIVATE ${CMAKE_SOURCE_DIR}/src/register/ledger-core ${GTK3_INCLUDE_DIRS}
+    PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/register/ledger-core ${GTK3_INCLUDE_DIRS}
 )
 
 INSTALL(TARGETS gncmod-register-gnome
diff --git a/src/register/register-gnome/Makefile.am b/gnucash/register/register-gnome/Makefile.am
similarity index 61%
rename from src/register/register-gnome/Makefile.am
rename to gnucash/register/register-gnome/Makefile.am
index 0da1eb2c12..87c45fc211 100644
--- a/src/register/register-gnome/Makefile.am
+++ b/gnucash/register/register-gnome/Makefile.am
@@ -5,12 +5,12 @@ pkglib_LTLIBRARIES = libgncmod-register-gnome.la
 libgncmod_register_gnome_la_LDFLAGS = -avoid-version
 
 libgncmod_register_gnome_la_LIBADD = \
-  ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/gnucash/register/register-core/libgncmod-register-core.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
   ${GLIB_LIBS} \
   ${GTK_LIBS}
 
@@ -52,14 +52,14 @@ noinst_HEADERS = \
   table-gnome.h
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-core \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/register/ledger-core \
+  -I${top_srcdir}/gnucash/register/register-core \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GTK_XIM_FLAGS}
diff --git a/src/register/register-gnome/combocell-gnome.c b/gnucash/register/register-gnome/combocell-gnome.c
similarity index 100%
rename from src/register/register-gnome/combocell-gnome.c
rename to gnucash/register/register-gnome/combocell-gnome.c
diff --git a/src/register/register-gnome/datecell-gnome.c b/gnucash/register/register-gnome/datecell-gnome.c
similarity index 100%
rename from src/register/register-gnome/datecell-gnome.c
rename to gnucash/register/register-gnome/datecell-gnome.c
diff --git a/src/register/register-gnome/formulacell-gnome.c b/gnucash/register/register-gnome/formulacell-gnome.c
similarity index 100%
rename from src/register/register-gnome/formulacell-gnome.c
rename to gnucash/register/register-gnome/formulacell-gnome.c
diff --git a/src/register/register-gnome/formulacell-gnome.h b/gnucash/register/register-gnome/formulacell-gnome.h
similarity index 100%
rename from src/register/register-gnome/formulacell-gnome.h
rename to gnucash/register/register-gnome/formulacell-gnome.h
diff --git a/src/register/register-gnome/gncmod-register-gnome.c b/gnucash/register/register-gnome/gncmod-register-gnome.c
similarity index 100%
rename from src/register/register-gnome/gncmod-register-gnome.c
rename to gnucash/register/register-gnome/gncmod-register-gnome.c
diff --git a/src/register/register-gnome/gnucash-color.c b/gnucash/register/register-gnome/gnucash-color.c
similarity index 100%
rename from src/register/register-gnome/gnucash-color.c
rename to gnucash/register/register-gnome/gnucash-color.c
diff --git a/src/register/register-gnome/gnucash-color.h b/gnucash/register/register-gnome/gnucash-color.h
similarity index 100%
rename from src/register/register-gnome/gnucash-color.h
rename to gnucash/register/register-gnome/gnucash-color.h
diff --git a/src/register/register-gnome/gnucash-cursor.c b/gnucash/register/register-gnome/gnucash-cursor.c
similarity index 100%
rename from src/register/register-gnome/gnucash-cursor.c
rename to gnucash/register/register-gnome/gnucash-cursor.c
diff --git a/src/register/register-gnome/gnucash-cursor.h b/gnucash/register/register-gnome/gnucash-cursor.h
similarity index 100%
rename from src/register/register-gnome/gnucash-cursor.h
rename to gnucash/register/register-gnome/gnucash-cursor.h
diff --git a/src/register/register-gnome/gnucash-date-picker.c b/gnucash/register/register-gnome/gnucash-date-picker.c
similarity index 100%
rename from src/register/register-gnome/gnucash-date-picker.c
rename to gnucash/register/register-gnome/gnucash-date-picker.c
diff --git a/src/register/register-gnome/gnucash-date-picker.h b/gnucash/register/register-gnome/gnucash-date-picker.h
similarity index 100%
rename from src/register/register-gnome/gnucash-date-picker.h
rename to gnucash/register/register-gnome/gnucash-date-picker.h
diff --git a/src/register/register-gnome/gnucash-header.c b/gnucash/register/register-gnome/gnucash-header.c
similarity index 100%
rename from src/register/register-gnome/gnucash-header.c
rename to gnucash/register/register-gnome/gnucash-header.c
diff --git a/src/register/register-gnome/gnucash-header.h b/gnucash/register/register-gnome/gnucash-header.h
similarity index 100%
rename from src/register/register-gnome/gnucash-header.h
rename to gnucash/register/register-gnome/gnucash-header.h
diff --git a/src/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
similarity index 100%
rename from src/register/register-gnome/gnucash-item-edit.c
rename to gnucash/register/register-gnome/gnucash-item-edit.c
diff --git a/src/register/register-gnome/gnucash-item-edit.h b/gnucash/register/register-gnome/gnucash-item-edit.h
similarity index 100%
rename from src/register/register-gnome/gnucash-item-edit.h
rename to gnucash/register/register-gnome/gnucash-item-edit.h
diff --git a/src/register/register-gnome/gnucash-item-list.c b/gnucash/register/register-gnome/gnucash-item-list.c
similarity index 100%
rename from src/register/register-gnome/gnucash-item-list.c
rename to gnucash/register/register-gnome/gnucash-item-list.c
diff --git a/src/register/register-gnome/gnucash-item-list.h b/gnucash/register/register-gnome/gnucash-item-list.h
similarity index 100%
rename from src/register/register-gnome/gnucash-item-list.h
rename to gnucash/register/register-gnome/gnucash-item-list.h
diff --git a/src/register/register-gnome/gnucash-register.c b/gnucash/register/register-gnome/gnucash-register.c
similarity index 100%
rename from src/register/register-gnome/gnucash-register.c
rename to gnucash/register/register-gnome/gnucash-register.c
diff --git a/src/register/register-gnome/gnucash-register.h b/gnucash/register/register-gnome/gnucash-register.h
similarity index 100%
rename from src/register/register-gnome/gnucash-register.h
rename to gnucash/register/register-gnome/gnucash-register.h
diff --git a/src/register/register-gnome/gnucash-scrolled-window.c b/gnucash/register/register-gnome/gnucash-scrolled-window.c
similarity index 100%
rename from src/register/register-gnome/gnucash-scrolled-window.c
rename to gnucash/register/register-gnome/gnucash-scrolled-window.c
diff --git a/src/register/register-gnome/gnucash-scrolled-window.h b/gnucash/register/register-gnome/gnucash-scrolled-window.h
similarity index 100%
rename from src/register/register-gnome/gnucash-scrolled-window.h
rename to gnucash/register/register-gnome/gnucash-scrolled-window.h
diff --git a/src/register/register-gnome/gnucash-sheet-private.c b/gnucash/register/register-gnome/gnucash-sheet-private.c
similarity index 100%
rename from src/register/register-gnome/gnucash-sheet-private.c
rename to gnucash/register/register-gnome/gnucash-sheet-private.c
diff --git a/src/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c
similarity index 100%
rename from src/register/register-gnome/gnucash-sheet.c
rename to gnucash/register/register-gnome/gnucash-sheet.c
diff --git a/src/register/register-gnome/gnucash-sheet.h b/gnucash/register/register-gnome/gnucash-sheet.h
similarity index 100%
rename from src/register/register-gnome/gnucash-sheet.h
rename to gnucash/register/register-gnome/gnucash-sheet.h
diff --git a/src/register/register-gnome/gnucash-sheetP.h b/gnucash/register/register-gnome/gnucash-sheetP.h
similarity index 100%
rename from src/register/register-gnome/gnucash-sheetP.h
rename to gnucash/register/register-gnome/gnucash-sheetP.h
diff --git a/src/register/register-gnome/gnucash-style.c b/gnucash/register/register-gnome/gnucash-style.c
similarity index 100%
rename from src/register/register-gnome/gnucash-style.c
rename to gnucash/register/register-gnome/gnucash-style.c
diff --git a/src/register/register-gnome/gnucash-style.h b/gnucash/register/register-gnome/gnucash-style.h
similarity index 100%
rename from src/register/register-gnome/gnucash-style.h
rename to gnucash/register/register-gnome/gnucash-style.h
diff --git a/src/register/register-gnome/pricecell-gnome.c b/gnucash/register/register-gnome/pricecell-gnome.c
similarity index 100%
rename from src/register/register-gnome/pricecell-gnome.c
rename to gnucash/register/register-gnome/pricecell-gnome.c
diff --git a/src/register/register-gnome/pricecell-gnome.h b/gnucash/register/register-gnome/pricecell-gnome.h
similarity index 100%
rename from src/register/register-gnome/pricecell-gnome.h
rename to gnucash/register/register-gnome/pricecell-gnome.h
diff --git a/src/register/register-gnome/quickfillcell-gnome.c b/gnucash/register/register-gnome/quickfillcell-gnome.c
similarity index 100%
rename from src/register/register-gnome/quickfillcell-gnome.c
rename to gnucash/register/register-gnome/quickfillcell-gnome.c
diff --git a/src/register/register-gnome/quickfillcell-gnome.h b/gnucash/register/register-gnome/quickfillcell-gnome.h
similarity index 100%
rename from src/register/register-gnome/quickfillcell-gnome.h
rename to gnucash/register/register-gnome/quickfillcell-gnome.h
diff --git a/src/register/register-gnome/table-gnome.c b/gnucash/register/register-gnome/table-gnome.c
similarity index 100%
rename from src/register/register-gnome/table-gnome.c
rename to gnucash/register/register-gnome/table-gnome.c
diff --git a/src/register/register-gnome/table-gnome.h b/gnucash/register/register-gnome/table-gnome.h
similarity index 100%
rename from src/register/register-gnome/table-gnome.h
rename to gnucash/register/register-gnome/table-gnome.h
diff --git a/src/register/register-gnome/test/CMakeLists.txt b/gnucash/register/register-gnome/test/CMakeLists.txt
similarity index 100%
rename from src/register/register-gnome/test/CMakeLists.txt
rename to gnucash/register/register-gnome/test/CMakeLists.txt
diff --git a/gnucash/register/register-gnome/test/Makefile.am b/gnucash/register/register-gnome/test/Makefile.am
new file mode 100644
index 0000000000..2a7a65f89c
--- /dev/null
+++ b/gnucash/register/register-gnome/test/Makefile.am
@@ -0,0 +1,24 @@
+TESTS =  \
+  test-link-module
+#  test-load-module
+
+#GNC_TEST_DEPS := \
+#
+
+#TESTS_ENVIRONMENT := \
+#  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
+  test-link-module
+
+test_link_module_SOURCES = test-link-module.c
+test_link_module_LDADD = \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ../libgncmod-register-gnome.la
+
+EXTRA_DIST = CMakeLists.txt
+#            test-load-module
+
+AM_CPPFLAGS = -I${top_srcdir}/common/test-core -I.. ${GLIB_CFLAGS}
diff --git a/src/register/register-gnome/test/test-link-module.c b/gnucash/register/register-gnome/test/test-link-module.c
similarity index 100%
rename from src/register/register-gnome/test/test-link-module.c
rename to gnucash/register/register-gnome/test/test-link-module.c
diff --git a/src/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
similarity index 100%
rename from src/report/CMakeLists.txt
rename to gnucash/report/CMakeLists.txt
diff --git a/src/report/Makefile.am b/gnucash/report/Makefile.am
similarity index 100%
rename from src/report/Makefile.am
rename to gnucash/report/Makefile.am
diff --git a/src/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
similarity index 59%
rename from src/report/business-reports/CMakeLists.txt
rename to gnucash/report/business-reports/CMakeLists.txt
index 9e67d08016..224ba51db8 100644
--- a/src/report/business-reports/CMakeLists.txt
+++ b/gnucash/report/business-reports/CMakeLists.txt
@@ -25,12 +25,12 @@ SET(business_reports_DATA
 )
 
 SET(GUILE_OUTPUT_DIR   gnucash/report)
-SET(GUILE_MODULES      src/app-utils src/engine src/html src/gnome-utils
-                         src/report/report-system src/report/standard-reports)
-SET(GUILE_LOAD_DIRS    src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils src/scm
-                         src/report/business_reports src/report/report-system src/report/standard-reports)
-SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils src/report/report-system
-                         src/report/standard-reports)
+SET(GUILE_MODULES      libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils
+                       gnucash/report/report-system gnucash/report/standard-reports)
+SET(GUILE_LOAD_DIRS    libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils
+                       libgnucash/scm gnucash/report/business_reports gnucash/report/report-system gnucash/report/standard-reports)
+SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils
+                       gnucash/report/report-system gnucash/report/standard-reports)
 SET(GUILE_DEPENDS      scm-business-reports-links scm-standard-reports)
 
 GNC_ADD_SCHEME_TARGETS(scm-business-reports
diff --git a/src/report/business-reports/Makefile.am b/gnucash/report/business-reports/Makefile.am
similarity index 55%
rename from src/report/business-reports/Makefile.am
rename to gnucash/report/business-reports/Makefile.am
index 96f979049e..3c08cf2cb6 100644
--- a/src/report/business-reports/Makefile.am
+++ b/gnucash/report/business-reports/Makefile.am
@@ -48,35 +48,35 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/standard-reports \
-  --guile-load-dir ${top_builddir}/src/report/business-reports \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/report/report-system
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/business-reports \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/report/report-system
 
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
diff --git a/src/report/business-reports/aging.scm b/gnucash/report/business-reports/aging.scm
similarity index 100%
rename from src/report/business-reports/aging.scm
rename to gnucash/report/business-reports/aging.scm
diff --git a/src/report/business-reports/balsheet-eg.css b/gnucash/report/business-reports/balsheet-eg.css
similarity index 100%
rename from src/report/business-reports/balsheet-eg.css
rename to gnucash/report/business-reports/balsheet-eg.css
diff --git a/src/report/business-reports/balsheet-eg.eguile.scm b/gnucash/report/business-reports/balsheet-eg.eguile.scm
similarity index 100%
rename from src/report/business-reports/balsheet-eg.eguile.scm
rename to gnucash/report/business-reports/balsheet-eg.eguile.scm
diff --git a/src/report/business-reports/balsheet-eg.scm b/gnucash/report/business-reports/balsheet-eg.scm
similarity index 100%
rename from src/report/business-reports/balsheet-eg.scm
rename to gnucash/report/business-reports/balsheet-eg.scm
diff --git a/src/report/business-reports/business-reports.scm b/gnucash/report/business-reports/business-reports.scm
similarity index 100%
rename from src/report/business-reports/business-reports.scm
rename to gnucash/report/business-reports/business-reports.scm
diff --git a/src/report/business-reports/customer-summary.scm b/gnucash/report/business-reports/customer-summary.scm
similarity index 100%
rename from src/report/business-reports/customer-summary.scm
rename to gnucash/report/business-reports/customer-summary.scm
diff --git a/src/report/business-reports/easy-invoice.scm b/gnucash/report/business-reports/easy-invoice.scm
similarity index 100%
rename from src/report/business-reports/easy-invoice.scm
rename to gnucash/report/business-reports/easy-invoice.scm
diff --git a/src/report/business-reports/fancy-invoice.scm b/gnucash/report/business-reports/fancy-invoice.scm
similarity index 100%
rename from src/report/business-reports/fancy-invoice.scm
rename to gnucash/report/business-reports/fancy-invoice.scm
diff --git a/src/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
similarity index 100%
rename from src/report/business-reports/invoice.scm
rename to gnucash/report/business-reports/invoice.scm
diff --git a/src/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm
similarity index 100%
rename from src/report/business-reports/job-report.scm
rename to gnucash/report/business-reports/job-report.scm
diff --git a/src/report/business-reports/owner-report.scm b/gnucash/report/business-reports/owner-report.scm
similarity index 100%
rename from src/report/business-reports/owner-report.scm
rename to gnucash/report/business-reports/owner-report.scm
diff --git a/src/report/business-reports/payables.scm b/gnucash/report/business-reports/payables.scm
similarity index 100%
rename from src/report/business-reports/payables.scm
rename to gnucash/report/business-reports/payables.scm
diff --git a/src/report/business-reports/receipt.css b/gnucash/report/business-reports/receipt.css
similarity index 100%
rename from src/report/business-reports/receipt.css
rename to gnucash/report/business-reports/receipt.css
diff --git a/src/report/business-reports/receipt.eguile.scm b/gnucash/report/business-reports/receipt.eguile.scm
similarity index 100%
rename from src/report/business-reports/receipt.eguile.scm
rename to gnucash/report/business-reports/receipt.eguile.scm
diff --git a/src/report/business-reports/receipt.scm b/gnucash/report/business-reports/receipt.scm
similarity index 100%
rename from src/report/business-reports/receipt.scm
rename to gnucash/report/business-reports/receipt.scm
diff --git a/src/report/business-reports/receivables.scm b/gnucash/report/business-reports/receivables.scm
similarity index 100%
rename from src/report/business-reports/receivables.scm
rename to gnucash/report/business-reports/receivables.scm
diff --git a/src/report/business-reports/taxinvoice.css b/gnucash/report/business-reports/taxinvoice.css
similarity index 100%
rename from src/report/business-reports/taxinvoice.css
rename to gnucash/report/business-reports/taxinvoice.css
diff --git a/src/report/business-reports/taxinvoice.eguile.scm b/gnucash/report/business-reports/taxinvoice.eguile.scm
similarity index 100%
rename from src/report/business-reports/taxinvoice.eguile.scm
rename to gnucash/report/business-reports/taxinvoice.eguile.scm
diff --git a/src/report/business-reports/taxinvoice.scm b/gnucash/report/business-reports/taxinvoice.scm
similarity index 100%
rename from src/report/business-reports/taxinvoice.scm
rename to gnucash/report/business-reports/taxinvoice.scm
diff --git a/src/report/jqplot/CMakeLists.txt b/gnucash/report/jqplot/CMakeLists.txt
similarity index 100%
rename from src/report/jqplot/CMakeLists.txt
rename to gnucash/report/jqplot/CMakeLists.txt
diff --git a/src/report/jqplot/MIT-LICENSE.txt b/gnucash/report/jqplot/MIT-LICENSE.txt
similarity index 100%
rename from src/report/jqplot/MIT-LICENSE.txt
rename to gnucash/report/jqplot/MIT-LICENSE.txt
diff --git a/src/report/jqplot/Makefile.am b/gnucash/report/jqplot/Makefile.am
similarity index 100%
rename from src/report/jqplot/Makefile.am
rename to gnucash/report/jqplot/Makefile.am
diff --git a/src/report/jqplot/README.txt b/gnucash/report/jqplot/README.txt
similarity index 100%
rename from src/report/jqplot/README.txt
rename to gnucash/report/jqplot/README.txt
diff --git a/src/report/jqplot/changes.txt b/gnucash/report/jqplot/changes.txt
similarity index 100%
rename from src/report/jqplot/changes.txt
rename to gnucash/report/jqplot/changes.txt
diff --git a/src/report/jqplot/copyright.txt b/gnucash/report/jqplot/copyright.txt
similarity index 100%
rename from src/report/jqplot/copyright.txt
rename to gnucash/report/jqplot/copyright.txt
diff --git a/src/report/jqplot/excanvas.js b/gnucash/report/jqplot/excanvas.js
similarity index 100%
rename from src/report/jqplot/excanvas.js
rename to gnucash/report/jqplot/excanvas.js
diff --git a/src/report/jqplot/excanvas.min.js b/gnucash/report/jqplot/excanvas.min.js
similarity index 100%
rename from src/report/jqplot/excanvas.min.js
rename to gnucash/report/jqplot/excanvas.min.js
diff --git a/src/report/jqplot/gpl-2.0.txt b/gnucash/report/jqplot/gpl-2.0.txt
similarity index 100%
rename from src/report/jqplot/gpl-2.0.txt
rename to gnucash/report/jqplot/gpl-2.0.txt
diff --git a/src/report/jqplot/jqPlotCssStyling.txt b/gnucash/report/jqplot/jqPlotCssStyling.txt
similarity index 100%
rename from src/report/jqplot/jqPlotCssStyling.txt
rename to gnucash/report/jqplot/jqPlotCssStyling.txt
diff --git a/src/report/jqplot/jqPlotOptions.txt b/gnucash/report/jqplot/jqPlotOptions.txt
similarity index 100%
rename from src/report/jqplot/jqPlotOptions.txt
rename to gnucash/report/jqplot/jqPlotOptions.txt
diff --git a/src/report/jqplot/jquery-1.4.2.min.js b/gnucash/report/jqplot/jquery-1.4.2.min.js
similarity index 100%
rename from src/report/jqplot/jquery-1.4.2.min.js
rename to gnucash/report/jqplot/jquery-1.4.2.min.js
diff --git a/src/report/jqplot/jquery.jqplot.css b/gnucash/report/jqplot/jquery.jqplot.css
similarity index 100%
rename from src/report/jqplot/jquery.jqplot.css
rename to gnucash/report/jqplot/jquery.jqplot.css
diff --git a/src/report/jqplot/jquery.jqplot.js b/gnucash/report/jqplot/jquery.jqplot.js
similarity index 100%
rename from src/report/jqplot/jquery.jqplot.js
rename to gnucash/report/jqplot/jquery.jqplot.js
diff --git a/src/report/jqplot/jquery.jqplot.min.css b/gnucash/report/jqplot/jquery.jqplot.min.css
similarity index 100%
rename from src/report/jqplot/jquery.jqplot.min.css
rename to gnucash/report/jqplot/jquery.jqplot.min.css
diff --git a/src/report/jqplot/jquery.jqplot.min.js b/gnucash/report/jqplot/jquery.jqplot.min.js
similarity index 100%
rename from src/report/jqplot/jquery.jqplot.min.js
rename to gnucash/report/jqplot/jquery.jqplot.min.js
diff --git a/src/report/jqplot/jquery.js b/gnucash/report/jqplot/jquery.js
similarity index 100%
rename from src/report/jqplot/jquery.js
rename to gnucash/report/jqplot/jquery.js
diff --git a/src/report/jqplot/jquery.min.js b/gnucash/report/jqplot/jquery.min.js
similarity index 100%
rename from src/report/jqplot/jquery.min.js
rename to gnucash/report/jqplot/jquery.min.js
diff --git a/src/report/jqplot/optionsTutorial.txt b/gnucash/report/jqplot/optionsTutorial.txt
similarity index 100%
rename from src/report/jqplot/optionsTutorial.txt
rename to gnucash/report/jqplot/optionsTutorial.txt
diff --git a/src/report/jqplot/plugins/jqplot.BezierCurveRenderer.js b/gnucash/report/jqplot/plugins/jqplot.BezierCurveRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.BezierCurveRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.BezierCurveRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.BezierCurveRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.BezierCurveRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.BezierCurveRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.BezierCurveRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.barRenderer.js b/gnucash/report/jqplot/plugins/jqplot.barRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.barRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.barRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.barRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.barRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.barRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.barRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.blockRenderer.js b/gnucash/report/jqplot/plugins/jqplot.blockRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.blockRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.blockRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.blockRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.blockRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.blockRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.blockRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.bubbleRenderer.js b/gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.bubbleRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.bubbleRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.bubbleRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.bubbleRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js b/gnucash/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.js b/gnucash/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasOverlay.js b/gnucash/report/jqplot/plugins/jqplot.canvasOverlay.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasOverlay.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasOverlay.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasOverlay.min.js b/gnucash/report/jqplot/plugins/jqplot.canvasOverlay.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasOverlay.min.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasOverlay.min.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasTextRenderer.js b/gnucash/report/jqplot/plugins/jqplot.canvasTextRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasTextRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasTextRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.canvasTextRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.canvasTextRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.canvasTextRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.canvasTextRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.categoryAxisRenderer.js b/gnucash/report/jqplot/plugins/jqplot.categoryAxisRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.categoryAxisRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.categoryAxisRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.categoryAxisRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.categoryAxisRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.categoryAxisRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.categoryAxisRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.ciParser.js b/gnucash/report/jqplot/plugins/jqplot.ciParser.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.ciParser.js
rename to gnucash/report/jqplot/plugins/jqplot.ciParser.js
diff --git a/src/report/jqplot/plugins/jqplot.ciParser.min.js b/gnucash/report/jqplot/plugins/jqplot.ciParser.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.ciParser.min.js
rename to gnucash/report/jqplot/plugins/jqplot.ciParser.min.js
diff --git a/src/report/jqplot/plugins/jqplot.cursor.js b/gnucash/report/jqplot/plugins/jqplot.cursor.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.cursor.js
rename to gnucash/report/jqplot/plugins/jqplot.cursor.js
diff --git a/src/report/jqplot/plugins/jqplot.cursor.min.js b/gnucash/report/jqplot/plugins/jqplot.cursor.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.cursor.min.js
rename to gnucash/report/jqplot/plugins/jqplot.cursor.min.js
diff --git a/src/report/jqplot/plugins/jqplot.dateAxisRenderer.js b/gnucash/report/jqplot/plugins/jqplot.dateAxisRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.dateAxisRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.dateAxisRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.dateAxisRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.dateAxisRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.dateAxisRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.dateAxisRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.donutRenderer.js b/gnucash/report/jqplot/plugins/jqplot.donutRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.donutRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.donutRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.donutRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.donutRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.donutRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.donutRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.dragable.js b/gnucash/report/jqplot/plugins/jqplot.dragable.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.dragable.js
rename to gnucash/report/jqplot/plugins/jqplot.dragable.js
diff --git a/src/report/jqplot/plugins/jqplot.dragable.min.js b/gnucash/report/jqplot/plugins/jqplot.dragable.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.dragable.min.js
rename to gnucash/report/jqplot/plugins/jqplot.dragable.min.js
diff --git a/src/report/jqplot/plugins/jqplot.enhancedLegendRenderer.js b/gnucash/report/jqplot/plugins/jqplot.enhancedLegendRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.enhancedLegendRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.enhancedLegendRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.funnelRenderer.js b/gnucash/report/jqplot/plugins/jqplot.funnelRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.funnelRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.funnelRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.funnelRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.funnelRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.funnelRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.funnelRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.highlighter.js b/gnucash/report/jqplot/plugins/jqplot.highlighter.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.highlighter.js
rename to gnucash/report/jqplot/plugins/jqplot.highlighter.js
diff --git a/src/report/jqplot/plugins/jqplot.highlighter.min.js b/gnucash/report/jqplot/plugins/jqplot.highlighter.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.highlighter.min.js
rename to gnucash/report/jqplot/plugins/jqplot.highlighter.min.js
diff --git a/src/report/jqplot/plugins/jqplot.json2.js b/gnucash/report/jqplot/plugins/jqplot.json2.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.json2.js
rename to gnucash/report/jqplot/plugins/jqplot.json2.js
diff --git a/src/report/jqplot/plugins/jqplot.json2.min.js b/gnucash/report/jqplot/plugins/jqplot.json2.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.json2.min.js
rename to gnucash/report/jqplot/plugins/jqplot.json2.min.js
diff --git a/src/report/jqplot/plugins/jqplot.logAxisRenderer.js b/gnucash/report/jqplot/plugins/jqplot.logAxisRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.logAxisRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.logAxisRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.logAxisRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.logAxisRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.logAxisRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.logAxisRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.mekkoAxisRenderer.js b/gnucash/report/jqplot/plugins/jqplot.mekkoAxisRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.mekkoAxisRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.mekkoAxisRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.mekkoRenderer.js b/gnucash/report/jqplot/plugins/jqplot.mekkoRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.mekkoRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.mekkoRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.mekkoRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.mekkoRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.mekkoRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.mekkoRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.meterGaugeRenderer.js b/gnucash/report/jqplot/plugins/jqplot.meterGaugeRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.meterGaugeRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.meterGaugeRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.meterGaugeRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.meterGaugeRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.meterGaugeRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.meterGaugeRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.mobile.js b/gnucash/report/jqplot/plugins/jqplot.mobile.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.mobile.js
rename to gnucash/report/jqplot/plugins/jqplot.mobile.js
diff --git a/src/report/jqplot/plugins/jqplot.mobile.min.js b/gnucash/report/jqplot/plugins/jqplot.mobile.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.mobile.min.js
rename to gnucash/report/jqplot/plugins/jqplot.mobile.min.js
diff --git a/src/report/jqplot/plugins/jqplot.ohlcRenderer.js b/gnucash/report/jqplot/plugins/jqplot.ohlcRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.ohlcRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.ohlcRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.ohlcRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.ohlcRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.ohlcRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.ohlcRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.pieRenderer.js b/gnucash/report/jqplot/plugins/jqplot.pieRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pieRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.pieRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.pieRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.pieRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pieRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.pieRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.pointLabels.js b/gnucash/report/jqplot/plugins/jqplot.pointLabels.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pointLabels.js
rename to gnucash/report/jqplot/plugins/jqplot.pointLabels.js
diff --git a/src/report/jqplot/plugins/jqplot.pointLabels.min.js b/gnucash/report/jqplot/plugins/jqplot.pointLabels.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pointLabels.min.js
rename to gnucash/report/jqplot/plugins/jqplot.pointLabels.min.js
diff --git a/src/report/jqplot/plugins/jqplot.pyramidAxisRenderer.js b/gnucash/report/jqplot/plugins/jqplot.pyramidAxisRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pyramidAxisRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.pyramidAxisRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.pyramidGridRenderer.js b/gnucash/report/jqplot/plugins/jqplot.pyramidGridRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pyramidGridRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.pyramidGridRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.pyramidGridRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.pyramidGridRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pyramidGridRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.pyramidGridRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.pyramidRenderer.js b/gnucash/report/jqplot/plugins/jqplot.pyramidRenderer.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pyramidRenderer.js
rename to gnucash/report/jqplot/plugins/jqplot.pyramidRenderer.js
diff --git a/src/report/jqplot/plugins/jqplot.pyramidRenderer.min.js b/gnucash/report/jqplot/plugins/jqplot.pyramidRenderer.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.pyramidRenderer.min.js
rename to gnucash/report/jqplot/plugins/jqplot.pyramidRenderer.min.js
diff --git a/src/report/jqplot/plugins/jqplot.trendline.js b/gnucash/report/jqplot/plugins/jqplot.trendline.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.trendline.js
rename to gnucash/report/jqplot/plugins/jqplot.trendline.js
diff --git a/src/report/jqplot/plugins/jqplot.trendline.min.js b/gnucash/report/jqplot/plugins/jqplot.trendline.min.js
similarity index 100%
rename from src/report/jqplot/plugins/jqplot.trendline.min.js
rename to gnucash/report/jqplot/plugins/jqplot.trendline.min.js
diff --git a/src/report/jqplot/usage.txt b/gnucash/report/jqplot/usage.txt
similarity index 100%
rename from src/report/jqplot/usage.txt
rename to gnucash/report/jqplot/usage.txt
diff --git a/src/report/locale-specific/CMakeLists.txt b/gnucash/report/locale-specific/CMakeLists.txt
similarity index 100%
rename from src/report/locale-specific/CMakeLists.txt
rename to gnucash/report/locale-specific/CMakeLists.txt
diff --git a/src/report/locale-specific/Makefile.am b/gnucash/report/locale-specific/Makefile.am
similarity index 100%
rename from src/report/locale-specific/Makefile.am
rename to gnucash/report/locale-specific/Makefile.am
diff --git a/src/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt
similarity index 74%
rename from src/report/locale-specific/us/CMakeLists.txt
rename to gnucash/report/locale-specific/us/CMakeLists.txt
index 47556cdc58..41da7bdb89 100644
--- a/src/report/locale-specific/us/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/CMakeLists.txt
@@ -26,11 +26,11 @@ SET(gncmod_local_reports_us_SCHEME_1 taxtxf.scm taxtxf-de_DE.scm)
 SET(gncmod_local_reports_us_SCHEME_2 us.scm de_DE.scm)
 
 
-SET(GUILE_MODULES src/app-utils src/engine src/gnome-utils src/html src/report/report-system src/tax/us)
-SET(GUILE_LOAD_DIRS  src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils src/report/report-system
-                     src/scm src/tax/us)
-SET(GUILE_LIBRARY_DIRS src/engine src/app-utils src/core-utils src/gnc-module src/gnome-utils
-                       src/html src/report/report-system)
+SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system gnucash/tax/us)
+SET(GUILE_LOAD_DIRS  libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system
+                     libgnucash/scm libgnucash/tax/us)
+SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils
+                       gnucash/html gnucash/report/report-system)
 SET(GUILE_DEPENDS   gncmod-html scm-tax-us-1 scm-tax-us-2 scm-report-system-3)
 
 GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1
diff --git a/src/report/locale-specific/us/Makefile.am b/gnucash/report/locale-specific/us/Makefile.am
similarity index 51%
rename from src/report/locale-specific/us/Makefile.am
rename to gnucash/report/locale-specific/us/Makefile.am
index 826f2a9e89..474e6625fc 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/gnucash/report/locale-specific/us/Makefile.am
@@ -8,16 +8,16 @@ libgncmod_locale_reports_us_la_SOURCES = \
 libgncmod_locale_reports_us_la_LDFLAGS = -avoid-version
 
 libgncmod_locale_reports_us_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  $(top_builddir)/src/app-utils/libgncmod-app-utils.la \
-  $(top_builddir)/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \
+  $(top_builddir)/gnucash/gnome-utils/libgncmod-gnome-utils.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} 
 
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GUILE_CFLAGS} ${GLIB_CFLAGS}
 
 ## This is unused and therefore no longer installed and/or loaded
@@ -53,37 +53,37 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
-  --gnc-module-dir ${top_builddir}/src/tax/us \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/locale-specific/us \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/tax/us \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/report/locale-specific/us
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --gnc-module-dir ${top_builddir}/gnucash/report/locale-specific/us \
+  --gnc-module-dir ${top_builddir}/libgnucash/tax/us \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/locale-specific/us \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/tax/us \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/gnucash/report/locale-specific/us
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
diff --git a/src/report/locale-specific/us/de_DE.scm b/gnucash/report/locale-specific/us/de_DE.scm
similarity index 100%
rename from src/report/locale-specific/us/de_DE.scm
rename to gnucash/report/locale-specific/us/de_DE.scm
diff --git a/src/report/locale-specific/us/gncmod-locale-reports-us.c b/gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
similarity index 100%
rename from src/report/locale-specific/us/gncmod-locale-reports-us.c
rename to gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
diff --git a/src/report/locale-specific/us/taxtxf-de_DE.scm b/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
similarity index 100%
rename from src/report/locale-specific/us/taxtxf-de_DE.scm
rename to gnucash/report/locale-specific/us/taxtxf-de_DE.scm
diff --git a/src/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm
similarity index 100%
rename from src/report/locale-specific/us/taxtxf.scm
rename to gnucash/report/locale-specific/us/taxtxf.scm
diff --git a/src/report/locale-specific/us/test/CMakeLists.txt b/gnucash/report/locale-specific/us/test/CMakeLists.txt
similarity index 100%
rename from src/report/locale-specific/us/test/CMakeLists.txt
rename to gnucash/report/locale-specific/us/test/CMakeLists.txt
diff --git a/gnucash/report/locale-specific/us/test/Makefile.am b/gnucash/report/locale-specific/us/test/Makefile.am
new file mode 100644
index 0000000000..18c7ff97c8
--- /dev/null
+++ b/gnucash/report/locale-specific/us/test/Makefile.am
@@ -0,0 +1,29 @@
+TESTS = test-link-module
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/tax/us \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --gnc-module-dir ${top_builddir}/gnucash/report/locale-specific/us \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/tax/us \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = test-link-module
+
+testit:
+	${TESTS_ENVIRONMENT} gdb guile
+
+test_link_module_SOURCES = test-link-module.c
+test_link_module_LDADD= \
+  ${top_builddir}/gnucash/report/locale-specific/us/libgncmod-locale-reports-us.la
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/report/locale-specific/us/test/test-link-module.c b/gnucash/report/locale-specific/us/test/test-link-module.c
similarity index 100%
rename from src/report/locale-specific/us/test/test-link-module.c
rename to gnucash/report/locale-specific/us/test/test-link-module.c
diff --git a/src/report/locale-specific/us/test/test-load-module.in b/gnucash/report/locale-specific/us/test/test-load-module.in
similarity index 100%
rename from src/report/locale-specific/us/test/test-load-module.in
rename to gnucash/report/locale-specific/us/test/test-load-module.in
diff --git a/src/report/locale-specific/us/us.scm b/gnucash/report/locale-specific/us/us.scm
similarity index 100%
rename from src/report/locale-specific/us/us.scm
rename to gnucash/report/locale-specific/us/us.scm
diff --git a/src/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
similarity index 84%
rename from src/report/report-gnome/CMakeLists.txt
rename to gnucash/report/report-gnome/CMakeLists.txt
index 4230898fb9..3df3aa9b4a 100644
--- a/src/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -50,9 +50,9 @@ SET(report_gnome_SCHEME
 )
 
 SET(GUILE_OUTPUT_DIR   gnucash/report)
-SET(GUILE_MODULES      src/app-utils src/scm src/engine src/gnc-module src/gnome-utils src/reports/report-system src/report/utility-reports)
-SET(GUILE_LOAD_DIRS    src/app-utils src/gnc-module src/engine src/scm src/core-utils src/gnome-utils)
-SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils src/report-gnome)
+SET(GUILE_MODULES      libgnucash/app-utils libgnucash/scm libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/reports/report-system gnucash/report/utility-reports)
+SET(GUILE_LOAD_DIRS    libgnucash/app-utils libgnucash/gnc-module libgnucash/engine libgnucash/scm libgnucash/core-utils gnucash/gnome-utils)
+SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report-gnome)
 SET(GUILE_DEPENDS      gncmod-report-gnome gncmod-engine scm-app-utils scm-gnome-utils scm-core-utils scm-gnc-module scm-scm scm-standard-reports scm-business-reports scm-utility-reports)
 
 GNC_ADD_SCHEME_TARGETS(scm-report-gnome
diff --git a/gnucash/report/report-gnome/Makefile.am b/gnucash/report/report-gnome/Makefile.am
new file mode 100644
index 0000000000..c52927d89a
--- /dev/null
+++ b/gnucash/report/report-gnome/Makefile.am
@@ -0,0 +1,147 @@
+SUBDIRS = . test
+
+pkglib_LTLIBRARIES = libgncmod-report-gnome.la
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/html \
+  -I${top_srcdir}/gnucash/report/report-system \
+  ${GUILE_CFLAGS} \
+  ${GTK_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+libgncmod_report_gnome_la_SOURCES = \
+  swig-report-gnome.c \
+  dialog-report-column-view.c \
+  dialog-custom-report.c \
+  dialog-report-style-sheet.c \
+  gnc-plugin-page-report.c \
+  gncmod-report-gnome.c \
+  window-report.c
+
+gncincludedir = ${GNC_INCLUDE_DIR}
+gncinclude_HEADERS = \
+  dialog-report-column-view.h \
+  dialog-custom-report.h \
+  dialog-report-style-sheet.h \
+  gnc-plugin-page-report.h \
+  window-report.h
+
+libgncmod_report_gnome_la_LDFLAGS = -avoid-version
+
+libgncmod_report_gnome_la_LIBADD = \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/gnucash/html/libgncmod-html.la \
+  ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \
+  ${GUILE_LIBS} \
+  ${GLIB_LIBS}
+
+if BUILDING_FROM_VCS
+swig-report-gnome.c: report-gnome.i ${top_srcdir}/common/base-typemaps.i
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+	-I${top_srcdir}/common -o $@ $<
+if ! OS_WIN32
+if ! SWIG_DIST_FAIL
+	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
+	fi
+endif
+endif
+endif
+
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
+gncscmmod_DATA = report-gnome.scm
+
+noinst_DATA = .scm-links
+
+gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
+gtkbuilder_DATA = \
+  dialog-report.glade \
+  dialog-custom-report.glade
+
+uidir = $(GNC_UI_DIR)
+
+ui_DATA = \
+	gnc-plugin-page-report-ui.xml
+
+EXTRA_DIST = \
+  report-gnome.i \
+  ${gtkbuilder_DATA} \
+  ${gncscmmod_DATA} \
+  ${ui_DATA} \
+  CMakeLists.txt
+
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+# for running
+SCM_FILE_LINKS = ${gncscmmod_DATA}
+endif
+
+.scm-links: 
+	$(RM) -rf gnucash
+	mkdir -p  gnucash
+	mkdir -p  gnucash/report
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  $(LN_S) -f ${srcdir}/$$X . ; \
+	done
+endif
+	( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
+if ! OS_WIN32
+# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
+	touch .scm-links
+endif
+
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/gnucash/report/report-gnome
+
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
+clean-local:
+	rm -rf gnucash
+
+CLEANFILES = report .scm-links ${SCM_FILE_LINKS} ${gncscmmodcache_DATA}
+MAINTAINERCLEANFILES = swig-report-gnome.c
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.gui\"
diff --git a/src/report/report-gnome/dialog-custom-report.c b/gnucash/report/report-gnome/dialog-custom-report.c
similarity index 100%
rename from src/report/report-gnome/dialog-custom-report.c
rename to gnucash/report/report-gnome/dialog-custom-report.c
diff --git a/src/report/report-gnome/dialog-custom-report.glade b/gnucash/report/report-gnome/dialog-custom-report.glade
similarity index 100%
rename from src/report/report-gnome/dialog-custom-report.glade
rename to gnucash/report/report-gnome/dialog-custom-report.glade
diff --git a/src/report/report-gnome/dialog-custom-report.h b/gnucash/report/report-gnome/dialog-custom-report.h
similarity index 100%
rename from src/report/report-gnome/dialog-custom-report.h
rename to gnucash/report/report-gnome/dialog-custom-report.h
diff --git a/src/report/report-gnome/dialog-report-column-view.c b/gnucash/report/report-gnome/dialog-report-column-view.c
similarity index 100%
rename from src/report/report-gnome/dialog-report-column-view.c
rename to gnucash/report/report-gnome/dialog-report-column-view.c
diff --git a/src/report/report-gnome/dialog-report-column-view.h b/gnucash/report/report-gnome/dialog-report-column-view.h
similarity index 100%
rename from src/report/report-gnome/dialog-report-column-view.h
rename to gnucash/report/report-gnome/dialog-report-column-view.h
diff --git a/src/report/report-gnome/dialog-report-style-sheet.c b/gnucash/report/report-gnome/dialog-report-style-sheet.c
similarity index 100%
rename from src/report/report-gnome/dialog-report-style-sheet.c
rename to gnucash/report/report-gnome/dialog-report-style-sheet.c
diff --git a/src/report/report-gnome/dialog-report-style-sheet.h b/gnucash/report/report-gnome/dialog-report-style-sheet.h
similarity index 100%
rename from src/report/report-gnome/dialog-report-style-sheet.h
rename to gnucash/report/report-gnome/dialog-report-style-sheet.h
diff --git a/src/report/report-gnome/dialog-report.glade b/gnucash/report/report-gnome/dialog-report.glade
similarity index 100%
rename from src/report/report-gnome/dialog-report.glade
rename to gnucash/report/report-gnome/dialog-report.glade
diff --git a/src/report/report-gnome/gnc-plugin-page-report-ui.xml b/gnucash/report/report-gnome/gnc-plugin-page-report-ui.xml
similarity index 100%
rename from src/report/report-gnome/gnc-plugin-page-report-ui.xml
rename to gnucash/report/report-gnome/gnc-plugin-page-report-ui.xml
diff --git a/src/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
similarity index 99%
rename from src/report/report-gnome/gnc-plugin-page-report.c
rename to gnucash/report/report-gnome/gnc-plugin-page-report.c
index 42ca6fbb6d..97121935ef 100644
--- a/src/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -71,9 +71,9 @@
 #include "option-util.h"
 #include "window-report.h"
 #include "swig-runtime.h"
-#include "app-utils/business-options.h"
-#include "gnome-utils/gnc-icons.h"
-#include "gnome-utils/print-session.h"
+#include "business-options.h"
+#include "gnc-icons.h"
+#include "print-session.h"
 
 #define WINDOW_REPORT_CM_CLASS "window-report"
 
diff --git a/src/report/report-gnome/gnc-plugin-page-report.h b/gnucash/report/report-gnome/gnc-plugin-page-report.h
similarity index 100%
rename from src/report/report-gnome/gnc-plugin-page-report.h
rename to gnucash/report/report-gnome/gnc-plugin-page-report.h
diff --git a/src/report/report-gnome/gncmod-report-gnome.c b/gnucash/report/report-gnome/gncmod-report-gnome.c
similarity index 100%
rename from src/report/report-gnome/gncmod-report-gnome.c
rename to gnucash/report/report-gnome/gncmod-report-gnome.c
diff --git a/src/report/report-gnome/report-gnome.i b/gnucash/report/report-gnome/report-gnome.i
similarity index 100%
rename from src/report/report-gnome/report-gnome.i
rename to gnucash/report/report-gnome/report-gnome.i
diff --git a/src/report/report-gnome/report-gnome.scm b/gnucash/report/report-gnome/report-gnome.scm
similarity index 100%
rename from src/report/report-gnome/report-gnome.scm
rename to gnucash/report/report-gnome/report-gnome.scm
diff --git a/src/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
similarity index 91%
rename from src/report/report-gnome/test/CMakeLists.txt
rename to gnucash/report/report-gnome/test/CMakeLists.txt
index fbed244263..a20af2fdcc 100644
--- a/src/report/report-gnome/test/CMakeLists.txt
+++ b/gnucash/report/report-gnome/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 SET(REPORT_GNOME_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GUILE_INCLUDE_DIRS}
 
 )
diff --git a/gnucash/report/report-gnome/test/Makefile.am b/gnucash/report/report-gnome/test/Makefile.am
new file mode 100644
index 0000000000..648f412ea1
--- /dev/null
+++ b/gnucash/report/report-gnome/test/Makefile.am
@@ -0,0 +1,65 @@
+AM_CPPFLAGS = \
+  -I${top_srcdir} \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  ${GUILE_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+LDADD = \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \
+  $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${GLIB_LIBS} \
+  ${GUILE_LIBS}
+
+TESTS = \
+  test-link-module \
+  test-load-module
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-gnome \
+\
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/business-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-gnome \
+\
+  --library-dir    ${top_builddir}/gnucash/report/report-gnome \
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/gnucash/report/report-gnome
+
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+
+check_PROGRAMS = test-link-module
+
+EXTRA_DIST = test-load-module CMakeLists.txt
diff --git a/src/report/report-gnome/test/test-link-module.c b/gnucash/report/report-gnome/test/test-link-module.c
similarity index 100%
rename from src/report/report-gnome/test/test-link-module.c
rename to gnucash/report/report-gnome/test/test-link-module.c
diff --git a/src/report/report-gnome/test/test-load-module.in b/gnucash/report/report-gnome/test/test-load-module.in
similarity index 100%
rename from src/report/report-gnome/test/test-load-module.in
rename to gnucash/report/report-gnome/test/test-load-module.in
diff --git a/src/report/report-gnome/window-report.c b/gnucash/report/report-gnome/window-report.c
similarity index 100%
rename from src/report/report-gnome/window-report.c
rename to gnucash/report/report-gnome/window-report.c
diff --git a/src/report/report-gnome/window-report.h b/gnucash/report/report-gnome/window-report.h
similarity index 100%
rename from src/report/report-gnome/window-report.h
rename to gnucash/report/report-gnome/window-report.h
diff --git a/src/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
similarity index 87%
rename from src/report/report-system/CMakeLists.txt
rename to gnucash/report/report-system/CMakeLists.txt
index 5ca9c9271d..c6eec39b66 100644
--- a/src/report/report-system/CMakeLists.txt
+++ b/gnucash/report/report-system/CMakeLists.txt
@@ -75,9 +75,9 @@ SET (report_system_SCHEME_3
 )
 
 
-SET(GUILE_MODULES      src/app-utils src/engine src/html src/gnome-utils)
-SET(GUILE_LOAD_DIRS    src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils src/report/report-system src/scm)
-SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils)
+SET(GUILE_MODULES      libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils)
+SET(GUILE_LOAD_DIRS    libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils)
 SET(GUILE_DEPENDS      gncmod-html gncmod-gnome-utils gncmod-report-system scm-app-utils scm-gnome-utils)
 
 
diff --git a/src/report/report-system/Makefile.am b/gnucash/report/report-system/Makefile.am
similarity index 61%
rename from src/report/report-system/Makefile.am
rename to gnucash/report/report-system/Makefile.am
index c0352f500c..6673447f82 100644
--- a/src/report/report-system/Makefile.am
+++ b/gnucash/report/report-system/Makefile.am
@@ -14,34 +14,34 @@ gncinclude_HEADERS = \
 libgncmod_report_system_la_LDFLAGS = -avoid-version
 
 libgncmod_report_system_la_LIBADD = \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${GTK_LIBS}
 
 if BUILDING_FROM_VCS
-swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
+swig-report-system.c: report-system.i ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
 endif
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/engine \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/engine \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GUILE_CFLAGS}
@@ -107,32 +107,32 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
diff --git a/src/report/report-system/collectors.scm b/gnucash/report/report-system/collectors.scm
similarity index 100%
rename from src/report/report-system/collectors.scm
rename to gnucash/report/report-system/collectors.scm
diff --git a/src/report/report-system/commodity-utilities.scm b/gnucash/report/report-system/commodity-utilities.scm
similarity index 100%
rename from src/report/report-system/commodity-utilities.scm
rename to gnucash/report/report-system/commodity-utilities.scm
diff --git a/src/report/report-system/doc/report-html.txt b/gnucash/report/report-system/doc/report-html.txt
similarity index 100%
rename from src/report/report-system/doc/report-html.txt
rename to gnucash/report/report-system/doc/report-html.txt
diff --git a/src/report/report-system/eguile-gnc.scm b/gnucash/report/report-system/eguile-gnc.scm
similarity index 100%
rename from src/report/report-system/eguile-gnc.scm
rename to gnucash/report/report-system/eguile-gnc.scm
diff --git a/src/report/report-system/eguile-html-utilities.scm b/gnucash/report/report-system/eguile-html-utilities.scm
similarity index 100%
rename from src/report/report-system/eguile-html-utilities.scm
rename to gnucash/report/report-system/eguile-html-utilities.scm
diff --git a/src/report/report-system/eguile-utilities.scm b/gnucash/report/report-system/eguile-utilities.scm
similarity index 100%
rename from src/report/report-system/eguile-utilities.scm
rename to gnucash/report/report-system/eguile-utilities.scm
diff --git a/src/report/report-system/gnc-report.c b/gnucash/report/report-system/gnc-report.c
similarity index 100%
rename from src/report/report-system/gnc-report.c
rename to gnucash/report/report-system/gnc-report.c
diff --git a/src/report/report-system/gnc-report.h b/gnucash/report/report-system/gnc-report.h
similarity index 100%
rename from src/report/report-system/gnc-report.h
rename to gnucash/report/report-system/gnc-report.h
diff --git a/src/report/report-system/gncmod-report-system.c b/gnucash/report/report-system/gncmod-report-system.c
similarity index 100%
rename from src/report/report-system/gncmod-report-system.c
rename to gnucash/report/report-system/gncmod-report-system.c
diff --git a/src/report/report-system/html-acct-table.scm b/gnucash/report/report-system/html-acct-table.scm
similarity index 100%
rename from src/report/report-system/html-acct-table.scm
rename to gnucash/report/report-system/html-acct-table.scm
diff --git a/src/report/report-system/html-barchart.scm b/gnucash/report/report-system/html-barchart.scm
similarity index 100%
rename from src/report/report-system/html-barchart.scm
rename to gnucash/report/report-system/html-barchart.scm
diff --git a/src/report/report-system/html-document.scm b/gnucash/report/report-system/html-document.scm
similarity index 100%
rename from src/report/report-system/html-document.scm
rename to gnucash/report/report-system/html-document.scm
diff --git a/src/report/report-system/html-fonts.scm b/gnucash/report/report-system/html-fonts.scm
similarity index 100%
rename from src/report/report-system/html-fonts.scm
rename to gnucash/report/report-system/html-fonts.scm
diff --git a/src/report/report-system/html-jqplot.scm b/gnucash/report/report-system/html-jqplot.scm
similarity index 100%
rename from src/report/report-system/html-jqplot.scm
rename to gnucash/report/report-system/html-jqplot.scm
diff --git a/src/report/report-system/html-linechart.scm b/gnucash/report/report-system/html-linechart.scm
similarity index 100%
rename from src/report/report-system/html-linechart.scm
rename to gnucash/report/report-system/html-linechart.scm
diff --git a/src/report/report-system/html-piechart.scm b/gnucash/report/report-system/html-piechart.scm
similarity index 100%
rename from src/report/report-system/html-piechart.scm
rename to gnucash/report/report-system/html-piechart.scm
diff --git a/src/report/report-system/html-scatter.scm b/gnucash/report/report-system/html-scatter.scm
similarity index 100%
rename from src/report/report-system/html-scatter.scm
rename to gnucash/report/report-system/html-scatter.scm
diff --git a/src/report/report-system/html-style-info.scm b/gnucash/report/report-system/html-style-info.scm
similarity index 100%
rename from src/report/report-system/html-style-info.scm
rename to gnucash/report/report-system/html-style-info.scm
diff --git a/src/report/report-system/html-style-sheet.scm b/gnucash/report/report-system/html-style-sheet.scm
similarity index 100%
rename from src/report/report-system/html-style-sheet.scm
rename to gnucash/report/report-system/html-style-sheet.scm
diff --git a/src/report/report-system/html-table.scm b/gnucash/report/report-system/html-table.scm
similarity index 100%
rename from src/report/report-system/html-table.scm
rename to gnucash/report/report-system/html-table.scm
diff --git a/src/report/report-system/html-text.scm b/gnucash/report/report-system/html-text.scm
similarity index 100%
rename from src/report/report-system/html-text.scm
rename to gnucash/report/report-system/html-text.scm
diff --git a/src/report/report-system/html-utilities.scm b/gnucash/report/report-system/html-utilities.scm
similarity index 100%
rename from src/report/report-system/html-utilities.scm
rename to gnucash/report/report-system/html-utilities.scm
diff --git a/src/report/report-system/list-extras.scm b/gnucash/report/report-system/list-extras.scm
similarity index 100%
rename from src/report/report-system/list-extras.scm
rename to gnucash/report/report-system/list-extras.scm
diff --git a/src/report/report-system/options-utilities.scm b/gnucash/report/report-system/options-utilities.scm
similarity index 100%
rename from src/report/report-system/options-utilities.scm
rename to gnucash/report/report-system/options-utilities.scm
diff --git a/src/report/report-system/report-collectors.scm b/gnucash/report/report-system/report-collectors.scm
similarity index 100%
rename from src/report/report-system/report-collectors.scm
rename to gnucash/report/report-system/report-collectors.scm
diff --git a/src/report/report-system/report-system.i b/gnucash/report/report-system/report-system.i
similarity index 100%
rename from src/report/report-system/report-system.i
rename to gnucash/report/report-system/report-system.i
diff --git a/src/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
similarity index 100%
rename from src/report/report-system/report-system.scm
rename to gnucash/report/report-system/report-system.scm
diff --git a/src/report/report-system/report-utilities.scm b/gnucash/report/report-system/report-utilities.scm
similarity index 100%
rename from src/report/report-system/report-utilities.scm
rename to gnucash/report/report-system/report-utilities.scm
diff --git a/src/report/report-system/report.scm b/gnucash/report/report-system/report.scm
similarity index 100%
rename from src/report/report-system/report.scm
rename to gnucash/report/report-system/report.scm
diff --git a/src/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
similarity index 95%
rename from src/report/report-system/test/CMakeLists.txt
rename to gnucash/report/report-system/test/CMakeLists.txt
index 42bea2a355..0b0a05a578 100644
--- a/src/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 SET(REPORT_SYSTEM_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GUILE_INCLUDE_DIRS}
 )
 SET(REPORT_SYSTEM_TEST_LIBS gnc-module)
diff --git a/gnucash/report/report-system/test/Makefile.am b/gnucash/report/report-system/test/Makefile.am
new file mode 100644
index 0000000000..fcdd1fe5b8
--- /dev/null
+++ b/gnucash/report/report-system/test/Makefile.am
@@ -0,0 +1,101 @@
+AM_CPPFLAGS = \
+  -I${top_srcdir} \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  ${GUILE_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+LDADD = \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${GLIB_LIBS} \
+  ${GUILE_LIBS}
+
+TESTS = \
+  test-link-module \
+  test-load-module \
+  $(SCM_TESTS)
+
+SCM_TESTS = \
+	test-collectors \
+	test-list-extras \
+	test-report-utilities
+
+SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system/test \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine/test \
+  --gnc-module-dir ${top_builddir}/libgnucash/backend/xml \
+  --gnc-module-dir ${top_builddir}/libgnucash/backend/sql \
+  --gnc-module-dir ${top_builddir}/libgnucash/backend/dbi \
+ \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/engine/test \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system/test \
+\
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql  \
+  --library-dir    ${top_builddir}/libgnucash/backend/dbi  \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module
+
+$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
+	echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
+	echo 'export GNC_UNINSTALLED=yes;' >> $@
+	echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
+	chmod a+x $@
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+
+check_PROGRAMS = test-link-module
+
+SCM_TEST_HELPERS = test-extras.scm
+
+EXTRA_DIST = \
+	test-load-module \
+	$(SCM_TEST_HELPERS) \
+	$(SCM_TEST_SRCS) \
+	CMakeLists.txt
+
+testit:
+	$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
+
+
+.scm-links:
+	$(RM) -rf gnucash
+	mkdir -p  gnucash/report/report-system/test
+	( cd gnucash/report/report-system/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done )
+if ! OS_WIN32
+# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
+	touch .scm-links
+endif
+
+clean-local:
+	$(RM) -rf gnucash
+	$(RM) *.log
+
+noinst_DATA = .scm-links
+CLEANFILES = .scm-links
+DISTCLEANFILES = $(SCM_TESTS)
diff --git a/src/report/report-system/test/test-collectors.scm b/gnucash/report/report-system/test/test-collectors.scm
similarity index 100%
rename from src/report/report-system/test/test-collectors.scm
rename to gnucash/report/report-system/test/test-collectors.scm
diff --git a/src/report/report-system/test/test-extras.scm b/gnucash/report/report-system/test/test-extras.scm
similarity index 100%
rename from src/report/report-system/test/test-extras.scm
rename to gnucash/report/report-system/test/test-extras.scm
diff --git a/src/report/report-system/test/test-link-module.c b/gnucash/report/report-system/test/test-link-module.c
similarity index 100%
rename from src/report/report-system/test/test-link-module.c
rename to gnucash/report/report-system/test/test-link-module.c
diff --git a/src/report/report-system/test/test-list-extras.scm b/gnucash/report/report-system/test/test-list-extras.scm
similarity index 100%
rename from src/report/report-system/test/test-list-extras.scm
rename to gnucash/report/report-system/test/test-list-extras.scm
diff --git a/src/report/report-system/test/test-load-module.in b/gnucash/report/report-system/test/test-load-module.in
similarity index 100%
rename from src/report/report-system/test/test-load-module.in
rename to gnucash/report/report-system/test/test-load-module.in
diff --git a/src/report/report-system/test/test-report-utilities.scm b/gnucash/report/report-system/test/test-report-utilities.scm
similarity index 100%
rename from src/report/report-system/test/test-report-utilities.scm
rename to gnucash/report/report-system/test/test-report-utilities.scm
diff --git a/src/report/report-system/test/test-test-extras.scm b/gnucash/report/report-system/test/test-test-extras.scm
similarity index 100%
rename from src/report/report-system/test/test-test-extras.scm
rename to gnucash/report/report-system/test/test-test-extras.scm
diff --git a/src/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt
similarity index 81%
rename from src/report/standard-reports/CMakeLists.txt
rename to gnucash/report/standard-reports/CMakeLists.txt
index 159e67c553..c8d46e4f7e 100644
--- a/src/report/standard-reports/CMakeLists.txt
+++ b/gnucash/report/standard-reports/CMakeLists.txt
@@ -31,9 +31,9 @@ SET (standard_reports_SCHEME_2
     trial-balance.scm
     )
 
-SET(GUILE_MODULES      src/app-utils src/engine src/gnome-utils src/html src/report/report-system)
-SET(GUILE_LOAD_DIRS    src/app-utils src/engine src/core-utils src/gnc-module src/gnome-utils src/report/report-system src/scm)
-SET(GUILE_LIBRARY_DIRS src/app-utils src/engine src/core-utils src/gnc-module src/gnome-utils src/report/report-system)
+SET(GUILE_MODULES      libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system)
+SET(GUILE_LOAD_DIRS    libgnucash/app-utils libgnucash/engine libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/engine libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system)
 SET(GUILE_DEPENDS      gncmod-html scm-app-utils scm-gnome-utils scm-report-system scm-report-system-3)
 
 GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1
diff --git a/src/report/standard-reports/Makefile.am b/gnucash/report/standard-reports/Makefile.am
similarity index 61%
rename from src/report/standard-reports/Makefile.am
rename to gnucash/report/standard-reports/Makefile.am
index 7e7356abea..5d0bf60c52 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/gnucash/report/standard-reports/Makefile.am
@@ -58,33 +58,33 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/standard-reports \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
diff --git a/src/report/standard-reports/account-piecharts.scm b/gnucash/report/standard-reports/account-piecharts.scm
similarity index 100%
rename from src/report/standard-reports/account-piecharts.scm
rename to gnucash/report/standard-reports/account-piecharts.scm
diff --git a/src/report/standard-reports/account-summary.scm b/gnucash/report/standard-reports/account-summary.scm
similarity index 100%
rename from src/report/standard-reports/account-summary.scm
rename to gnucash/report/standard-reports/account-summary.scm
diff --git a/src/report/standard-reports/advanced-portfolio.scm b/gnucash/report/standard-reports/advanced-portfolio.scm
similarity index 99%
rename from src/report/standard-reports/advanced-portfolio.scm
rename to gnucash/report/standard-reports/advanced-portfolio.scm
index b39f122963..6a05845eb3 100644
--- a/src/report/standard-reports/advanced-portfolio.scm
+++ b/gnucash/report/standard-reports/advanced-portfolio.scm
@@ -56,7 +56,7 @@
 (define (options-generator)
   (let* ((options (gnc:new-options))
          ;; This is just a helper function for making options.
-         ;; See gnucash/src/scm/options.scm for details.
+         ;; See libgnucash/scm/options.scm for details.
          (add-option
           (lambda (new-option)
             (gnc:register-option options new-option))))
diff --git a/src/report/standard-reports/average-balance.scm b/gnucash/report/standard-reports/average-balance.scm
similarity index 100%
rename from src/report/standard-reports/average-balance.scm
rename to gnucash/report/standard-reports/average-balance.scm
diff --git a/src/report/standard-reports/balance-sheet.scm b/gnucash/report/standard-reports/balance-sheet.scm
similarity index 100%
rename from src/report/standard-reports/balance-sheet.scm
rename to gnucash/report/standard-reports/balance-sheet.scm
diff --git a/src/report/standard-reports/budget-balance-sheet.scm b/gnucash/report/standard-reports/budget-balance-sheet.scm
similarity index 100%
rename from src/report/standard-reports/budget-balance-sheet.scm
rename to gnucash/report/standard-reports/budget-balance-sheet.scm
diff --git a/src/report/standard-reports/budget-barchart.scm b/gnucash/report/standard-reports/budget-barchart.scm
similarity index 99%
rename from src/report/standard-reports/budget-barchart.scm
rename to gnucash/report/standard-reports/budget-barchart.scm
index 5e4973dcef..33cadc97d7 100644
--- a/src/report/standard-reports/budget-barchart.scm
+++ b/gnucash/report/standard-reports/budget-barchart.scm
@@ -60,7 +60,7 @@
   (let* (
       (options (gnc:new-options)) 
       ;; This is just a helper function for making options.
-      ;; See gnucash/src/scm/options.scm for details.
+      ;; See libgnucash/scm/options.scm for details.
       (add-option 
         (lambda (new-option)
           (gnc:register-option options new-option)))
diff --git a/src/report/standard-reports/budget-flow.scm b/gnucash/report/standard-reports/budget-flow.scm
similarity index 100%
rename from src/report/standard-reports/budget-flow.scm
rename to gnucash/report/standard-reports/budget-flow.scm
diff --git a/src/report/standard-reports/budget-income-statement.scm b/gnucash/report/standard-reports/budget-income-statement.scm
similarity index 100%
rename from src/report/standard-reports/budget-income-statement.scm
rename to gnucash/report/standard-reports/budget-income-statement.scm
diff --git a/src/report/standard-reports/budget.scm b/gnucash/report/standard-reports/budget.scm
similarity index 100%
rename from src/report/standard-reports/budget.scm
rename to gnucash/report/standard-reports/budget.scm
diff --git a/src/report/standard-reports/cash-flow.scm b/gnucash/report/standard-reports/cash-flow.scm
similarity index 100%
rename from src/report/standard-reports/cash-flow.scm
rename to gnucash/report/standard-reports/cash-flow.scm
diff --git a/src/report/standard-reports/category-barchart.scm b/gnucash/report/standard-reports/category-barchart.scm
similarity index 100%
rename from src/report/standard-reports/category-barchart.scm
rename to gnucash/report/standard-reports/category-barchart.scm
diff --git a/src/report/standard-reports/daily-reports.scm b/gnucash/report/standard-reports/daily-reports.scm
similarity index 100%
rename from src/report/standard-reports/daily-reports.scm
rename to gnucash/report/standard-reports/daily-reports.scm
diff --git a/src/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm
similarity index 100%
rename from src/report/standard-reports/equity-statement.scm
rename to gnucash/report/standard-reports/equity-statement.scm
diff --git a/src/report/standard-reports/general-journal.scm b/gnucash/report/standard-reports/general-journal.scm
similarity index 100%
rename from src/report/standard-reports/general-journal.scm
rename to gnucash/report/standard-reports/general-journal.scm
diff --git a/src/report/standard-reports/general-ledger.scm b/gnucash/report/standard-reports/general-ledger.scm
similarity index 100%
rename from src/report/standard-reports/general-ledger.scm
rename to gnucash/report/standard-reports/general-ledger.scm
diff --git a/src/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm
similarity index 100%
rename from src/report/standard-reports/income-statement.scm
rename to gnucash/report/standard-reports/income-statement.scm
diff --git a/src/report/standard-reports/net-barchart.scm b/gnucash/report/standard-reports/net-barchart.scm
similarity index 99%
rename from src/report/standard-reports/net-barchart.scm
rename to gnucash/report/standard-reports/net-barchart.scm
index 5ccd2859f2..a180983470 100644
--- a/src/report/standard-reports/net-barchart.scm
+++ b/gnucash/report/standard-reports/net-barchart.scm
@@ -64,7 +64,7 @@
 (define (options-generator inc-exp?)
   (let* ((options (gnc:new-options))
          ;; This is just a helper function for making options.
-         ;; See gnucash/src/scm/options.scm for details.
+         ;; See libgnucash/scm/options.scm for details.
          (add-option
           (lambda (new-option)
             (gnc:register-option options new-option))))
diff --git a/src/report/standard-reports/net-linechart.scm b/gnucash/report/standard-reports/net-linechart.scm
similarity index 99%
rename from src/report/standard-reports/net-linechart.scm
rename to gnucash/report/standard-reports/net-linechart.scm
index 299bd077b7..273818733d 100644
--- a/src/report/standard-reports/net-linechart.scm
+++ b/gnucash/report/standard-reports/net-linechart.scm
@@ -70,7 +70,7 @@
 (define (options-generator inc-exp?)
   (let* ((options (gnc:new-options))
          ;; This is just a helper function for making options.
-         ;; See gnucash/src/scm/options.scm for details.
+         ;; See libgnucash/scm/options.scm for details.
          (add-option
           (lambda (new-option)
             (gnc:register-option options new-option))))
diff --git a/src/report/standard-reports/portfolio.scm b/gnucash/report/standard-reports/portfolio.scm
similarity index 99%
rename from src/report/standard-reports/portfolio.scm
rename to gnucash/report/standard-reports/portfolio.scm
index afbf24be71..548077b8b6 100644
--- a/src/report/standard-reports/portfolio.scm
+++ b/gnucash/report/standard-reports/portfolio.scm
@@ -41,7 +41,7 @@
 (define (options-generator)
   (let* ((options (gnc:new-options))
          ;; This is just a helper function for making options.
-         ;; See gnucash/src/scm/options.scm for details.
+         ;; See libgnucash/scm/options.scm for details.
          (add-option
           (lambda (new-option)
             (gnc:register-option options new-option))))
diff --git a/src/report/standard-reports/price-scatter.scm b/gnucash/report/standard-reports/price-scatter.scm
similarity index 100%
rename from src/report/standard-reports/price-scatter.scm
rename to gnucash/report/standard-reports/price-scatter.scm
diff --git a/src/report/standard-reports/register.scm b/gnucash/report/standard-reports/register.scm
similarity index 100%
rename from src/report/standard-reports/register.scm
rename to gnucash/report/standard-reports/register.scm
diff --git a/src/report/standard-reports/standard-reports.scm b/gnucash/report/standard-reports/standard-reports.scm
similarity index 100%
rename from src/report/standard-reports/standard-reports.scm
rename to gnucash/report/standard-reports/standard-reports.scm
diff --git a/src/report/standard-reports/sx-summary.scm b/gnucash/report/standard-reports/sx-summary.scm
similarity index 100%
rename from src/report/standard-reports/sx-summary.scm
rename to gnucash/report/standard-reports/sx-summary.scm
diff --git a/src/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
similarity index 100%
rename from src/report/standard-reports/test/CMakeLists.txt
rename to gnucash/report/standard-reports/test/CMakeLists.txt
diff --git a/gnucash/report/standard-reports/test/Makefile.am b/gnucash/report/standard-reports/test/Makefile.am
new file mode 100644
index 0000000000..d6d5153af0
--- /dev/null
+++ b/gnucash/report/standard-reports/test/Makefile.am
@@ -0,0 +1,86 @@
+TESTS = $(SCM_TESTS)
+
+SCM_TESTS = \
+	test-cash-flow \
+	test-standard-category-report \
+	test-standard-net-barchart \
+	test-standard-net-linechart
+
+SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
+
+GNC_TEST_DEPS = \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine/test \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system/test \
+\
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/engine/test \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system/test \
+  --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \
+  --guile-load-dir ${top_builddir}/gnucash/report/standard-reports/test \
+\
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module
+
+$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
+	echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
+	echo 'export GNC_UNINSTALLED=yes;' >> $@
+	echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
+	chmod a+x $@
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+
+SCM_TEST_HELPERS = \
+	test-generic-category-report.scm \
+	test-generic-net-barchart.scm \
+	test-generic-net-linechart.scm
+
+EXTRA_DIST = \
+	$(SCM_TEST_HELPERS) \
+	$(SCM_TEST_SRCS) \
+	CMakeLists.txt
+
+.scm-links:
+	$(RM) -rf gnucash
+	mkdir -p  gnucash/report/standard-reports/test
+	( cd gnucash/report/standard-reports/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done )
+if ! OS_WIN32
+# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
+	touch .scm-links
+endif
+
+interp:
+	$(TESTS_ENVIRONMENT) ${GUILE} --debug
+
+debug:
+	$(TESTS_ENVIRONMENT) gdb --args $(shell cat $(TEST))
+
+clean-local:
+	$(RM) -rf gnucash
+
+noinst_DATA = .scm-links
+CLEANFILES = .scm-links *.log
+DISTCLEANFILES = $(SCM_TESTS)
+
diff --git a/src/report/standard-reports/test/test-cash-flow.scm b/gnucash/report/standard-reports/test/test-cash-flow.scm
similarity index 100%
rename from src/report/standard-reports/test/test-cash-flow.scm
rename to gnucash/report/standard-reports/test/test-cash-flow.scm
diff --git a/src/report/standard-reports/test/test-generic-category-report.scm b/gnucash/report/standard-reports/test/test-generic-category-report.scm
similarity index 100%
rename from src/report/standard-reports/test/test-generic-category-report.scm
rename to gnucash/report/standard-reports/test/test-generic-category-report.scm
diff --git a/src/report/standard-reports/test/test-generic-net-barchart.scm b/gnucash/report/standard-reports/test/test-generic-net-barchart.scm
similarity index 100%
rename from src/report/standard-reports/test/test-generic-net-barchart.scm
rename to gnucash/report/standard-reports/test/test-generic-net-barchart.scm
diff --git a/src/report/standard-reports/test/test-generic-net-linechart.scm b/gnucash/report/standard-reports/test/test-generic-net-linechart.scm
similarity index 100%
rename from src/report/standard-reports/test/test-generic-net-linechart.scm
rename to gnucash/report/standard-reports/test/test-generic-net-linechart.scm
diff --git a/src/report/standard-reports/test/test-standard-category-report.scm b/gnucash/report/standard-reports/test/test-standard-category-report.scm
similarity index 100%
rename from src/report/standard-reports/test/test-standard-category-report.scm
rename to gnucash/report/standard-reports/test/test-standard-category-report.scm
diff --git a/src/report/standard-reports/test/test-standard-net-barchart.scm b/gnucash/report/standard-reports/test/test-standard-net-barchart.scm
similarity index 100%
rename from src/report/standard-reports/test/test-standard-net-barchart.scm
rename to gnucash/report/standard-reports/test/test-standard-net-barchart.scm
diff --git a/src/report/standard-reports/test/test-standard-net-linechart.scm b/gnucash/report/standard-reports/test/test-standard-net-linechart.scm
similarity index 100%
rename from src/report/standard-reports/test/test-standard-net-linechart.scm
rename to gnucash/report/standard-reports/test/test-standard-net-linechart.scm
diff --git a/src/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
similarity index 100%
rename from src/report/standard-reports/transaction.scm
rename to gnucash/report/standard-reports/transaction.scm
diff --git a/src/report/standard-reports/trial-balance.scm b/gnucash/report/standard-reports/trial-balance.scm
similarity index 100%
rename from src/report/standard-reports/trial-balance.scm
rename to gnucash/report/standard-reports/trial-balance.scm
diff --git a/src/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
similarity index 81%
rename from src/report/stylesheets/CMakeLists.txt
rename to gnucash/report/stylesheets/CMakeLists.txt
index f2480f504b..bd0e89bbe3 100644
--- a/src/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -44,9 +44,9 @@ SET(stylesheets_SCHEME_2
 )
 
 SET(GUILE_OUTPUT_DIR gnucash/report)
-SET(GUILE_MODULES src/app-utils src/engine src/html src/gnome-utils src/report/report-system)
-SET(GUILE_LOAD_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils src/report/report-system src/scm)
-SET(GUILE_LIBRARY_DIRS src/engine src/app-utils src/core-utils src/gnc-module src/gnome-utils src/html src/report/report-system)
+SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils gnucash/report/report-system)
+SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/html gnucash/report/report-system)
 SET(GUILE_DEPENDS gncmod-html scm-app-utils scm-report-system-3)
 
 GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1
diff --git a/gnucash/report/stylesheets/Makefile.am b/gnucash/report/stylesheets/Makefile.am
new file mode 100644
index 0000000000..1de87a7c3d
--- /dev/null
+++ b/gnucash/report/stylesheets/Makefile.am
@@ -0,0 +1,116 @@
+SUBDIRS = . test
+
+pkglib_LTLIBRARIES = libgncmod-stylesheets.la
+
+libgncmod_stylesheets_la_SOURCES = \
+  gnc-plugin-stylesheets.c \
+  gncmod-stylesheets.c 
+
+noinst_HEADERS = \
+  gnc-plugin-stylesheets.h
+
+libgncmod_stylesheets_la_LDFLAGS = -module -avoid-version
+
+libgncmod_stylesheets_la_LIBADD = \
+  ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \
+  ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${GUILE_LIBS} \
+  ${GTK_LIBS} \
+  ${GLIB_LIBS}
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/gnucash/report/report-gnome \
+  ${GUILE_CFLAGS} \
+  ${GLIB_CFLAGS} \
+  ${GTK_CFLAGS}
+
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
+gncscmmod_DATA = \
+  stylesheets.scm \
+  stylesheet-plain.scm \
+  stylesheet-fancy.scm \
+  stylesheet-footer.scm \
+  stylesheet-easy.scm \
+  stylesheet-head-or-tail.scm
+
+if GNUCASH_SEPARATE_BUILDDIR
+#For executing test cases
+SCM_FILE_LINKS = ${gncscmmod_DATA}
+endif
+
+.scm-links:
+	$(RM) -rf gnucash
+	mkdir -p  gnucash
+	mkdir -p  gnucash/report
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  $(LN_S) -f ${srcdir}/$$X . ; \
+	done
+endif
+	( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
+if ! OS_WIN32
+# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
+	touch .scm-links
+endif
+
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --gnc-module-dir ${top_builddir}/gnucash/report/stylesheets \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/stylesheets \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/gnucash/report/stylesheets
+
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
+clean-local:
+	$(RM) -rf gnucash
+
+noinst_DATA = .scm-links
+
+uidir = $(GNC_UI_DIR)
+dist_ui_DATA = \
+	gnc-plugin-stylesheets-ui.xml
+
+EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt
+
+CLEANFILES = .scm-links ${gncscmmodcache_DATA}
+DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\"
diff --git a/src/report/stylesheets/gnc-plugin-stylesheets-ui.xml b/gnucash/report/stylesheets/gnc-plugin-stylesheets-ui.xml
similarity index 100%
rename from src/report/stylesheets/gnc-plugin-stylesheets-ui.xml
rename to gnucash/report/stylesheets/gnc-plugin-stylesheets-ui.xml
diff --git a/src/report/stylesheets/gnc-plugin-stylesheets.c b/gnucash/report/stylesheets/gnc-plugin-stylesheets.c
similarity index 100%
rename from src/report/stylesheets/gnc-plugin-stylesheets.c
rename to gnucash/report/stylesheets/gnc-plugin-stylesheets.c
diff --git a/src/report/stylesheets/gnc-plugin-stylesheets.h b/gnucash/report/stylesheets/gnc-plugin-stylesheets.h
similarity index 100%
rename from src/report/stylesheets/gnc-plugin-stylesheets.h
rename to gnucash/report/stylesheets/gnc-plugin-stylesheets.h
diff --git a/src/report/stylesheets/gncmod-stylesheets.c b/gnucash/report/stylesheets/gncmod-stylesheets.c
similarity index 100%
rename from src/report/stylesheets/gncmod-stylesheets.c
rename to gnucash/report/stylesheets/gncmod-stylesheets.c
diff --git a/src/report/stylesheets/stylesheet-easy.scm b/gnucash/report/stylesheets/stylesheet-easy.scm
similarity index 100%
rename from src/report/stylesheets/stylesheet-easy.scm
rename to gnucash/report/stylesheets/stylesheet-easy.scm
diff --git a/src/report/stylesheets/stylesheet-fancy.scm b/gnucash/report/stylesheets/stylesheet-fancy.scm
similarity index 100%
rename from src/report/stylesheets/stylesheet-fancy.scm
rename to gnucash/report/stylesheets/stylesheet-fancy.scm
diff --git a/src/report/stylesheets/stylesheet-footer.scm b/gnucash/report/stylesheets/stylesheet-footer.scm
similarity index 100%
rename from src/report/stylesheets/stylesheet-footer.scm
rename to gnucash/report/stylesheets/stylesheet-footer.scm
diff --git a/src/report/stylesheets/stylesheet-head-or-tail.scm b/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
similarity index 100%
rename from src/report/stylesheets/stylesheet-head-or-tail.scm
rename to gnucash/report/stylesheets/stylesheet-head-or-tail.scm
diff --git a/src/report/stylesheets/stylesheet-plain.scm b/gnucash/report/stylesheets/stylesheet-plain.scm
similarity index 100%
rename from src/report/stylesheets/stylesheet-plain.scm
rename to gnucash/report/stylesheets/stylesheet-plain.scm
diff --git a/src/report/stylesheets/stylesheets.scm b/gnucash/report/stylesheets/stylesheets.scm
similarity index 100%
rename from src/report/stylesheets/stylesheets.scm
rename to gnucash/report/stylesheets/stylesheets.scm
diff --git a/src/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
similarity index 100%
rename from src/report/stylesheets/test/CMakeLists.txt
rename to gnucash/report/stylesheets/test/CMakeLists.txt
diff --git a/gnucash/report/stylesheets/test/Makefile.am b/gnucash/report/stylesheets/test/Makefile.am
new file mode 100644
index 0000000000..f3f5c0292f
--- /dev/null
+++ b/gnucash/report/stylesheets/test/Makefile.am
@@ -0,0 +1,38 @@
+TESTS=test-load-module
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --gnc-module-dir ${top_builddir}/gnucash/report/stylesheets \
+\
+  --guile-load-dir ${top_builddir}/common/test-core \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/stylesheets \
+\
+  --library-dir    ${top_builddir}/common/test-core \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system \
+  --library-dir    ${top_builddir}/gnucash/report/report-gnome
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+EXTRA_DIST = test-load-module CMakeLists.txt
diff --git a/src/report/stylesheets/test/test-load-module.in b/gnucash/report/stylesheets/test/test-load-module.in
similarity index 100%
rename from src/report/stylesheets/test/test-load-module.in
rename to gnucash/report/stylesheets/test/test-load-module.in
diff --git a/src/report/utility-reports/CMakeLists.txt b/gnucash/report/utility-reports/CMakeLists.txt
similarity index 55%
rename from src/report/utility-reports/CMakeLists.txt
rename to gnucash/report/utility-reports/CMakeLists.txt
index 2c0a4aa2aa..c3221a7c34 100644
--- a/src/report/utility-reports/CMakeLists.txt
+++ b/gnucash/report/utility-reports/CMakeLists.txt
@@ -8,11 +8,11 @@ SET(utility_reports_SCHEME
 )
 
 SET(GUILE_OUTPUT_DIR     gnucash/report)
-SET(GUILE_MODULES        src/app-utils src/engine src/gnome-utils src/html src/report/report-system)
-SET(GUILE_LOAD_DIRS      src/app-utils src/core-utils src/engine src/gnc-module
-                            src/gnome-utils src/report/report-system src/scm)
-SET(GUILE_LIBRARY_DIRS   src/engine src/app-utils src/core-utils src/gnc-module src/gnome-utils src/html
-                              src/report/report-system)
+SET(GUILE_MODULES        libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system)
+SET(GUILE_LOAD_DIRS      libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module
+                            gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS   libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/html
+                              gnucash/report/report-system)
 SET(GUILE_DEPENDS        scm-utility-reports-links scm-app-utils scm-report-system-3)
 
 GNC_ADD_SCHEME_TARGETS(scm-utility-reports
diff --git a/gnucash/report/utility-reports/Makefile.am b/gnucash/report/utility-reports/Makefile.am
new file mode 100644
index 0000000000..289ef72aff
--- /dev/null
+++ b/gnucash/report/utility-reports/Makefile.am
@@ -0,0 +1,76 @@
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
+gncscmmod_DATA = \
+  hello-world.scm \
+  utility-reports.scm \
+  view-column.scm \
+  welcome-to-gnucash.scm
+
+#  test-graphing.scm -- not intended for general public?!? Surely not translated at all.
+
+if GNUCASH_SEPARATE_BUILDDIR
+#For separate build directory
+SCM_FILE_LINKS = \
+  ${gncscmmod_DATA}
+endif
+
+.scm-links:
+	$(RM) -rf gnucash
+	mkdir -p  gnucash
+	mkdir -p  gnucash/report
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  $(LN_S) -f ${srcdir}/$$X . ; \
+	done
+endif
+	( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
+if ! OS_WIN32
+# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
+	touch .scm-links
+endif
+
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
+  --gnc-module-dir ${top_builddir}/gnucash/html \
+  --gnc-module-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
+  --guile-load-dir ${top_builddir}/gnucash/report/report-system \
+  --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/gnucash/gnome-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/gnucash/html \
+  --library-dir    ${top_builddir}/gnucash/report/report-system
+
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
+clean-local:
+	$(RM) -rf gnucash
+
+noinst_DATA = .scm-links
+
+EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt
+
+CLEANFILES = .scm-links ${gncscmmodcache_DATA}
+DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.report.util\"
diff --git a/src/report/utility-reports/hello-world.scm b/gnucash/report/utility-reports/hello-world.scm
similarity index 99%
rename from src/report/utility-reports/hello-world.scm
rename to gnucash/report/utility-reports/hello-world.scm
index 6cf610976d..ad8c5a1867 100644
--- a/src/report/utility-reports/hello-world.scm
+++ b/gnucash/report/utility-reports/hello-world.scm
@@ -44,7 +44,7 @@
 (define (options-generator)    
   (let* ((options (gnc:new-options)) 
          ;; This is just a helper function for making options.
-         ;; See gnucash/src/app-utils/options.scm for details.
+         ;; See libgnucash/app-utils/options.scm for details.
          (add-option 
           (lambda (new-option)
             (gnc:register-option options new-option))))
diff --git a/src/report/utility-reports/test-graphing.scm b/gnucash/report/utility-reports/test-graphing.scm
similarity index 100%
rename from src/report/utility-reports/test-graphing.scm
rename to gnucash/report/utility-reports/test-graphing.scm
diff --git a/src/report/utility-reports/utility-reports.scm b/gnucash/report/utility-reports/utility-reports.scm
similarity index 100%
rename from src/report/utility-reports/utility-reports.scm
rename to gnucash/report/utility-reports/utility-reports.scm
diff --git a/src/report/utility-reports/view-column.scm b/gnucash/report/utility-reports/view-column.scm
similarity index 100%
rename from src/report/utility-reports/view-column.scm
rename to gnucash/report/utility-reports/view-column.scm
diff --git a/src/report/utility-reports/welcome-to-gnucash.scm b/gnucash/report/utility-reports/welcome-to-gnucash.scm
similarity index 100%
rename from src/report/utility-reports/welcome-to-gnucash.scm
rename to gnucash/report/utility-reports/welcome-to-gnucash.scm
diff --git a/libgnucash/CMakeLists.txt b/libgnucash/CMakeLists.txt
new file mode 100644
index 0000000000..cd3206e746
--- /dev/null
+++ b/libgnucash/CMakeLists.txt
@@ -0,0 +1,21 @@
+# CMakeLists.txt for libgnucash/
+
+# The subdirectories
+ADD_SUBDIRECTORY (app-utils)
+ADD_SUBDIRECTORY (backend)
+ADD_SUBDIRECTORY (core-utils)
+ADD_SUBDIRECTORY (doc)
+ADD_SUBDIRECTORY (engine)
+ADD_SUBDIRECTORY (gnc-module)
+ADD_SUBDIRECTORY (pixmaps)
+ADD_SUBDIRECTORY (quotes)
+ADD_SUBDIRECTORY (scm)
+ADD_SUBDIRECTORY (tax)
+
+ADD_DEFINITIONS (-DHAVE_CONFIG_H)
+
+SET_LOCAL_DIST(libgnucash_DIST_local CMakeLists.txt Makefile.am ${libgnucash_EXTRA_DIST})
+
+SET(libgnucash_DIST ${libgnucash_DIST_local} ${app_utils_DIST} ${backend_DIST}
+             ${core_utils_DIST} ${doc_DIST} ${engine_DIST} ${gnc_module_DIST}
+             ${pixmaps_DIST} ${quotes_DIST} ${scm_DIST} ${tax_DIST} PARENT_SCOPE)
diff --git a/libgnucash/Makefile.am b/libgnucash/Makefile.am
new file mode 100644
index 0000000000..dc9681c8c0
--- /dev/null
+++ b/libgnucash/Makefile.am
@@ -0,0 +1,21 @@
+# These directories do not contain any gtk dependencies
+# Note the unusual ordering of some test directories. This is
+# because test-core depends on engine and the test directories
+# in turn depend on test-core. This would not have been necessary
+# if we had only one big Makefile instead of a recursive build.
+# As we intend to move to cmake it's not worth fixing this any more.
+SUBDIRS = \
+  doc \
+  pixmaps \
+  core-utils \
+  gnc-module \
+  engine \
+  ../common/test-core \
+  core-utils/test \
+  gnc-module/test \
+  engine/test \
+  backend \
+  scm \
+  quotes \
+  app-utils \
+  tax
diff --git a/src/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
similarity index 90%
rename from src/app-utils/CMakeLists.txt
rename to libgnucash/app-utils/CMakeLists.txt
index ebd2ad9332..3ceaf39816 100644
--- a/src/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -83,7 +83,7 @@ SET_SOURCE_FILES_PROPERTIES (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CO
 SET(app_utils_ALL_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS})
 SET(app_utils_ALL_LIBRARIES gncmod-engine gnc-module ${GIO_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS})
 SET(app_utils_ALL_INCLUDES  ${CMAKE_CURRENT_SOURCE_DIR}/calculation ${GIO_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS}
-                            ${LIBXSLT_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/engine)
+    ${LIBXSLT_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/libgnucash/backend ${CMAKE_SOURCE_DIR}/libgnucash/engine)
 
 IF (WIN32)
   LIST(APPEND app_utils_ALL_SOURCES gnc-help-utils.c)
@@ -130,11 +130,11 @@ ENDIF()
 INSTALL(FILES ${app_utils_HEADERS} DESTINATION include/gnucash)
 
 IF (WITH_OFX)
-  FILE(READ ${CMAKE_SOURCE_DIR}/src/import-export/ofx/migratable-prefs-ofx.xml MIGRATABLE_PREFS_OFX)
+  FILE(READ ${CMAKE_SOURCE_DIR}/gnucash/import-export/ofx/migratable-prefs-ofx.xml MIGRATABLE_PREFS_OFX)
 ENDIF()
 
 IF (WITH_AQBANKING)
-  FILE(READ ${CMAKE_SOURCE_DIR}/src/import-export/aqb/migratable-prefs-aqbanking.xml MIGRATABLE_PREFS_AQBANKING)
+  FILE(READ ${CMAKE_SOURCE_DIR}/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml MIGRATABLE_PREFS_AQBANKING)
 ENDIF()
 
 SET(MIGRATABLE_PREFS_XML ${DATADIR_BUILD}/gnucash/migratable-prefs.xml)
@@ -169,15 +169,15 @@ SET(app_utils_SCHEME_3
     business-prefs.scm
 )
 
-SET(GUILE_MODULES      src/engine)
-SET(GUILE_LOAD_DIRS    src/app-utils src/core-utils src/engine src/gnc-module src/scm)
-SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module)
+SET(GUILE_MODULES      libgnucash/engine)
+SET(GUILE_LOAD_DIRS    libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module)
 SET(GUILE_DEPENDS      gncmod-app-utils scm-core-utils scm-engine scm-scm)
 
 GNC_ADD_SCHEME_TARGETS(scm-gettext
   gettext.scm
   gnucash
-  src/app-utils
+  libgnucash/app-utils
   ""
   ""
   gncmod-app-utils
diff --git a/src/app-utils/Makefile.am b/libgnucash/app-utils/Makefile.am
similarity index 79%
rename from src/app-utils/Makefile.am
rename to libgnucash/app-utils/Makefile.am
index 7f55114072..7b3f5df609 100644
--- a/src/app-utils/Makefile.am
+++ b/libgnucash/app-utils/Makefile.am
@@ -22,13 +22,13 @@ pkglib_LTLIBRARIES = libgncmod-app-utils.la
 AM_CPPFLAGS = \
   -Wno-error=deprecated-declarations \
   -I$(top_srcdir)/lib/libc \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils/calculation \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/backend/xml \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/app-utils/calculation \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/backend \
   ${GUILE_CFLAGS} \
   ${PYTHON_CPPFLAGS} \
   ${GLIB_CFLAGS} \
@@ -95,28 +95,28 @@ gncinclude_HEADERS = \
 libgncmod_app_utils_la_LDFLAGS = -avoid-version
 
 libgncmod_app_utils_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${LIBXML2_LIBS} \
   ${LIBXSLT_LIBS}
 
 if BUILDING_FROM_VCS
-swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
+swig-app-utils-guile.c: app-utils.i ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
-swig-app-utils-python.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
+swig-app-utils-python.c: app-utils.i ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 endif
 
 if WITH_PYTHON
@@ -203,21 +203,21 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
diff --git a/src/app-utils/QuickFill.c b/libgnucash/app-utils/QuickFill.c
similarity index 100%
rename from src/app-utils/QuickFill.c
rename to libgnucash/app-utils/QuickFill.c
diff --git a/src/app-utils/QuickFill.h b/libgnucash/app-utils/QuickFill.h
similarity index 100%
rename from src/app-utils/QuickFill.h
rename to libgnucash/app-utils/QuickFill.h
diff --git a/src/app-utils/README b/libgnucash/app-utils/README
similarity index 100%
rename from src/app-utils/README
rename to libgnucash/app-utils/README
diff --git a/src/app-utils/app-utils.i b/libgnucash/app-utils/app-utils.i
similarity index 99%
rename from src/app-utils/app-utils.i
rename to libgnucash/app-utils/app-utils.i
index 4226900730..7ded4efa82 100644
--- a/src/app-utils/app-utils.i
+++ b/libgnucash/app-utils/app-utils.i
@@ -33,7 +33,7 @@
 #include <gnc-session.h>
 #include <gnc-component-manager.h>
 #include <guile-util.h>
-#include <app-utils/gnc-sx-instance-model.h>
+#include <gnc-sx-instance-model.h>
 
 #include "engine-helpers-guile.h"
 %}
diff --git a/src/app-utils/app-utils.scm b/libgnucash/app-utils/app-utils.scm
similarity index 100%
rename from src/app-utils/app-utils.scm
rename to libgnucash/app-utils/app-utils.scm
diff --git a/src/app-utils/business-helpers.c b/libgnucash/app-utils/business-helpers.c
similarity index 100%
rename from src/app-utils/business-helpers.c
rename to libgnucash/app-utils/business-helpers.c
diff --git a/src/app-utils/business-helpers.h b/libgnucash/app-utils/business-helpers.h
similarity index 100%
rename from src/app-utils/business-helpers.h
rename to libgnucash/app-utils/business-helpers.h
diff --git a/src/app-utils/business-options.c b/libgnucash/app-utils/business-options.c
similarity index 100%
rename from src/app-utils/business-options.c
rename to libgnucash/app-utils/business-options.c
diff --git a/src/app-utils/business-options.h b/libgnucash/app-utils/business-options.h
similarity index 100%
rename from src/app-utils/business-options.h
rename to libgnucash/app-utils/business-options.h
diff --git a/src/app-utils/business-options.scm b/libgnucash/app-utils/business-options.scm
similarity index 100%
rename from src/app-utils/business-options.scm
rename to libgnucash/app-utils/business-options.scm
diff --git a/src/app-utils/business-prefs.scm b/libgnucash/app-utils/business-prefs.scm
similarity index 100%
rename from src/app-utils/business-prefs.scm
rename to libgnucash/app-utils/business-prefs.scm
diff --git a/src/app-utils/c-interface.scm b/libgnucash/app-utils/c-interface.scm
similarity index 100%
rename from src/app-utils/c-interface.scm
rename to libgnucash/app-utils/c-interface.scm
diff --git a/src/app-utils/calculation/expression_parser.c b/libgnucash/app-utils/calculation/expression_parser.c
similarity index 100%
rename from src/app-utils/calculation/expression_parser.c
rename to libgnucash/app-utils/calculation/expression_parser.c
diff --git a/src/app-utils/calculation/fin.c b/libgnucash/app-utils/calculation/fin.c
similarity index 100%
rename from src/app-utils/calculation/fin.c
rename to libgnucash/app-utils/calculation/fin.c
diff --git a/src/app-utils/calculation/fin_spl_protos.h b/libgnucash/app-utils/calculation/fin_spl_protos.h
similarity index 100%
rename from src/app-utils/calculation/fin_spl_protos.h
rename to libgnucash/app-utils/calculation/fin_spl_protos.h
diff --git a/src/app-utils/calculation/fin_static_proto.h b/libgnucash/app-utils/calculation/fin_static_proto.h
similarity index 100%
rename from src/app-utils/calculation/fin_static_proto.h
rename to libgnucash/app-utils/calculation/fin_static_proto.h
diff --git a/src/app-utils/calculation/finproto.h b/libgnucash/app-utils/calculation/finproto.h
similarity index 100%
rename from src/app-utils/calculation/finproto.h
rename to libgnucash/app-utils/calculation/finproto.h
diff --git a/src/app-utils/calculation/finvar.h b/libgnucash/app-utils/calculation/finvar.h
similarity index 100%
rename from src/app-utils/calculation/finvar.h
rename to libgnucash/app-utils/calculation/finvar.h
diff --git a/src/app-utils/config-var.scm b/libgnucash/app-utils/config-var.scm
similarity index 100%
rename from src/app-utils/config-var.scm
rename to libgnucash/app-utils/config-var.scm
diff --git a/src/app-utils/date-utilities.scm b/libgnucash/app-utils/date-utilities.scm
similarity index 100%
rename from src/app-utils/date-utilities.scm
rename to libgnucash/app-utils/date-utilities.scm
diff --git a/src/app-utils/file-utils.c b/libgnucash/app-utils/file-utils.c
similarity index 100%
rename from src/app-utils/file-utils.c
rename to libgnucash/app-utils/file-utils.c
diff --git a/src/app-utils/file-utils.h b/libgnucash/app-utils/file-utils.h
similarity index 100%
rename from src/app-utils/file-utils.h
rename to libgnucash/app-utils/file-utils.h
diff --git a/src/app-utils/gettext.scm b/libgnucash/app-utils/gettext.scm
similarity index 100%
rename from src/app-utils/gettext.scm
rename to libgnucash/app-utils/gettext.scm
diff --git a/src/app-utils/gfec.c b/libgnucash/app-utils/gfec.c
similarity index 100%
rename from src/app-utils/gfec.c
rename to libgnucash/app-utils/gfec.c
diff --git a/src/app-utils/gfec.h b/libgnucash/app-utils/gfec.h
similarity index 100%
rename from src/app-utils/gfec.h
rename to libgnucash/app-utils/gfec.h
diff --git a/src/app-utils/gnc-account-merge.c b/libgnucash/app-utils/gnc-account-merge.c
similarity index 100%
rename from src/app-utils/gnc-account-merge.c
rename to libgnucash/app-utils/gnc-account-merge.c
diff --git a/src/app-utils/gnc-account-merge.h b/libgnucash/app-utils/gnc-account-merge.h
similarity index 100%
rename from src/app-utils/gnc-account-merge.h
rename to libgnucash/app-utils/gnc-account-merge.h
diff --git a/src/app-utils/gnc-accounting-period.c b/libgnucash/app-utils/gnc-accounting-period.c
similarity index 100%
rename from src/app-utils/gnc-accounting-period.c
rename to libgnucash/app-utils/gnc-accounting-period.c
diff --git a/src/app-utils/gnc-accounting-period.h b/libgnucash/app-utils/gnc-accounting-period.h
similarity index 100%
rename from src/app-utils/gnc-accounting-period.h
rename to libgnucash/app-utils/gnc-accounting-period.h
diff --git a/src/app-utils/gnc-addr-quickfill.c b/libgnucash/app-utils/gnc-addr-quickfill.c
similarity index 98%
rename from src/app-utils/gnc-addr-quickfill.c
rename to libgnucash/app-utils/gnc-addr-quickfill.c
index b0a07450c1..3e5c9e926e 100644
--- a/src/app-utils/gnc-addr-quickfill.c
+++ b/libgnucash/app-utils/gnc-addr-quickfill.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 #include "gnc-addr-quickfill.h"
-#include "engine/gnc-event.h"
-#include "engine/gnc-engine.h"
-#include "engine/gncAddress.h"
+#include "gnc-event.h"
+#include "gnc-engine.h"
+#include "gncAddress.h"
 
 /* This static indicates the debugging module that this .o belongs to. */
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_REGISTER;
diff --git a/src/app-utils/gnc-addr-quickfill.h b/libgnucash/app-utils/gnc-addr-quickfill.h
similarity index 99%
rename from src/app-utils/gnc-addr-quickfill.h
rename to libgnucash/app-utils/gnc-addr-quickfill.h
index df738b8112..28d12155c2 100644
--- a/src/app-utils/gnc-addr-quickfill.h
+++ b/libgnucash/app-utils/gnc-addr-quickfill.h
@@ -31,7 +31,7 @@
 #define GNC_ADDR_QUICKFILL_H
 
 #include "qof.h"
-#include "app-utils/QuickFill.h"
+#include "QuickFill.h"
 
 /** Create/fetch a quickfill GncAddress description strings on the Addr2 part.
  *
diff --git a/src/app-utils/gnc-basic-gobject.h b/libgnucash/app-utils/gnc-basic-gobject.h
similarity index 100%
rename from src/app-utils/gnc-basic-gobject.h
rename to libgnucash/app-utils/gnc-basic-gobject.h
diff --git a/src/app-utils/gnc-component-manager.c b/libgnucash/app-utils/gnc-component-manager.c
similarity index 100%
rename from src/app-utils/gnc-component-manager.c
rename to libgnucash/app-utils/gnc-component-manager.c
diff --git a/src/app-utils/gnc-component-manager.h b/libgnucash/app-utils/gnc-component-manager.h
similarity index 100%
rename from src/app-utils/gnc-component-manager.h
rename to libgnucash/app-utils/gnc-component-manager.h
diff --git a/src/app-utils/gnc-entry-quickfill.c b/libgnucash/app-utils/gnc-entry-quickfill.c
similarity index 98%
rename from src/app-utils/gnc-entry-quickfill.c
rename to libgnucash/app-utils/gnc-entry-quickfill.c
index c7d775daf7..e847e65399 100644
--- a/src/app-utils/gnc-entry-quickfill.c
+++ b/libgnucash/app-utils/gnc-entry-quickfill.c
@@ -23,8 +23,8 @@
 
 #include "config.h"
 #include "gnc-entry-quickfill.h"
-#include "engine/gnc-event.h"
-#include "engine/gncEntry.h"
+#include "gnc-event.h"
+#include "gncEntry.h"
 
 /* This static indicates the debugging module that this .o belongs to. */
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_REGISTER;
diff --git a/src/app-utils/gnc-entry-quickfill.h b/libgnucash/app-utils/gnc-entry-quickfill.h
similarity index 98%
rename from src/app-utils/gnc-entry-quickfill.h
rename to libgnucash/app-utils/gnc-entry-quickfill.h
index 5fb455295f..b6993d7bb4 100644
--- a/src/app-utils/gnc-entry-quickfill.h
+++ b/libgnucash/app-utils/gnc-entry-quickfill.h
@@ -31,7 +31,7 @@
 #define GNC_ENTRY_QUICKFILL_H
 
 #include "qof.h"
-#include "app-utils/QuickFill.h"
+#include "QuickFill.h"
 
 /** Create/fetch a quickfill GncEntry description strings.
  *
diff --git a/src/app-utils/gnc-euro.c b/libgnucash/app-utils/gnc-euro.c
similarity index 99%
rename from src/app-utils/gnc-euro.c
rename to libgnucash/app-utils/gnc-euro.c
index 4771efdb8d..518e2550ef 100644
--- a/src/app-utils/gnc-euro.c
+++ b/libgnucash/app-utils/gnc-euro.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "app-utils/gnc-ui-util.h"
+#include "gnc-ui-util.h"
 
 /* local structs */
 typedef struct
diff --git a/src/app-utils/gnc-euro.h b/libgnucash/app-utils/gnc-euro.h
similarity index 100%
rename from src/app-utils/gnc-euro.h
rename to libgnucash/app-utils/gnc-euro.h
diff --git a/src/app-utils/gnc-exp-parser.c b/libgnucash/app-utils/gnc-exp-parser.c
similarity index 100%
rename from src/app-utils/gnc-exp-parser.c
rename to libgnucash/app-utils/gnc-exp-parser.c
diff --git a/src/app-utils/gnc-exp-parser.h b/libgnucash/app-utils/gnc-exp-parser.h
similarity index 100%
rename from src/app-utils/gnc-exp-parser.h
rename to libgnucash/app-utils/gnc-exp-parser.h
diff --git a/src/app-utils/gnc-gdate-utils.c b/libgnucash/app-utils/gnc-gdate-utils.c
similarity index 100%
rename from src/app-utils/gnc-gdate-utils.c
rename to libgnucash/app-utils/gnc-gdate-utils.c
diff --git a/src/app-utils/gnc-gdate-utils.h b/libgnucash/app-utils/gnc-gdate-utils.h
similarity index 100%
rename from src/app-utils/gnc-gdate-utils.h
rename to libgnucash/app-utils/gnc-gdate-utils.h
diff --git a/src/app-utils/gnc-gettext-util.c b/libgnucash/app-utils/gnc-gettext-util.c
similarity index 100%
rename from src/app-utils/gnc-gettext-util.c
rename to libgnucash/app-utils/gnc-gettext-util.c
diff --git a/src/app-utils/gnc-gettext-util.h b/libgnucash/app-utils/gnc-gettext-util.h
similarity index 100%
rename from src/app-utils/gnc-gettext-util.h
rename to libgnucash/app-utils/gnc-gettext-util.h
diff --git a/src/app-utils/gnc-gsettings.c b/libgnucash/app-utils/gnc-gsettings.c
similarity index 100%
rename from src/app-utils/gnc-gsettings.c
rename to libgnucash/app-utils/gnc-gsettings.c
diff --git a/src/app-utils/gnc-gsettings.h b/libgnucash/app-utils/gnc-gsettings.h
similarity index 100%
rename from src/app-utils/gnc-gsettings.h
rename to libgnucash/app-utils/gnc-gsettings.h
diff --git a/src/app-utils/gnc-help-utils.c b/libgnucash/app-utils/gnc-help-utils.c
similarity index 100%
rename from src/app-utils/gnc-help-utils.c
rename to libgnucash/app-utils/gnc-help-utils.c
diff --git a/src/app-utils/gnc-help-utils.h b/libgnucash/app-utils/gnc-help-utils.h
similarity index 100%
rename from src/app-utils/gnc-help-utils.h
rename to libgnucash/app-utils/gnc-help-utils.h
diff --git a/src/app-utils/gnc-helpers.c b/libgnucash/app-utils/gnc-helpers.c
similarity index 100%
rename from src/app-utils/gnc-helpers.c
rename to libgnucash/app-utils/gnc-helpers.c
diff --git a/src/app-utils/gnc-helpers.h b/libgnucash/app-utils/gnc-helpers.h
similarity index 100%
rename from src/app-utils/gnc-helpers.h
rename to libgnucash/app-utils/gnc-helpers.h
diff --git a/src/app-utils/gnc-prefs-utils.c b/libgnucash/app-utils/gnc-prefs-utils.c
similarity index 99%
rename from src/app-utils/gnc-prefs-utils.c
rename to libgnucash/app-utils/gnc-prefs-utils.c
index 7d22f5a9d5..a633825268 100644
--- a/src/app-utils/gnc-prefs-utils.c
+++ b/libgnucash/app-utils/gnc-prefs-utils.c
@@ -26,7 +26,7 @@
 #include "gnc-gsettings.h"
 #include "gnc-prefs-utils.h"
 #include "gnc-prefs.h"
-#include "backend/xml/gnc-backend-xml.h"
+#include "xml/gnc-backend-xml.h"
 
 static QofLogModule log_module = G_LOG_DOMAIN;
 
diff --git a/src/app-utils/gnc-prefs-utils.h b/libgnucash/app-utils/gnc-prefs-utils.h
similarity index 100%
rename from src/app-utils/gnc-prefs-utils.h
rename to libgnucash/app-utils/gnc-prefs-utils.h
diff --git a/src/app-utils/gnc-state.c b/libgnucash/app-utils/gnc-state.c
similarity index 100%
rename from src/app-utils/gnc-state.c
rename to libgnucash/app-utils/gnc-state.c
diff --git a/src/app-utils/gnc-state.h b/libgnucash/app-utils/gnc-state.h
similarity index 100%
rename from src/app-utils/gnc-state.h
rename to libgnucash/app-utils/gnc-state.h
diff --git a/src/app-utils/gnc-sx-instance-model.c b/libgnucash/app-utils/gnc-sx-instance-model.c
similarity index 100%
rename from src/app-utils/gnc-sx-instance-model.c
rename to libgnucash/app-utils/gnc-sx-instance-model.c
diff --git a/src/app-utils/gnc-sx-instance-model.h b/libgnucash/app-utils/gnc-sx-instance-model.h
similarity index 100%
rename from src/app-utils/gnc-sx-instance-model.h
rename to libgnucash/app-utils/gnc-sx-instance-model.h
diff --git a/src/app-utils/gnc-ui-balances.c b/libgnucash/app-utils/gnc-ui-balances.c
similarity index 100%
rename from src/app-utils/gnc-ui-balances.c
rename to libgnucash/app-utils/gnc-ui-balances.c
diff --git a/src/app-utils/gnc-ui-balances.h b/libgnucash/app-utils/gnc-ui-balances.h
similarity index 100%
rename from src/app-utils/gnc-ui-balances.h
rename to libgnucash/app-utils/gnc-ui-balances.h
diff --git a/src/app-utils/gnc-ui-util.c b/libgnucash/app-utils/gnc-ui-util.c
similarity index 99%
rename from src/app-utils/gnc-ui-util.c
rename to libgnucash/app-utils/gnc-ui-util.c
index 42597fc088..739465d812 100644
--- a/src/app-utils/gnc-ui-util.c
+++ b/libgnucash/app-utils/gnc-ui-util.c
@@ -47,13 +47,13 @@
 #include "qof.h"
 #include "guile-mappings.h"
 #include "gnc-prefs.h"
-#include "gnc-module/gnc-module.h"
-#include "engine/Account.h"
-#include "engine/Transaction.h"
-#include "engine/gnc-engine.h"
-#include "app-utils/gnc-euro.h"
-#include "engine/gnc-hooks.h"
-#include "engine/gnc-session.h"
+#include "gnc-module.h"
+#include "Account.h"
+#include "Transaction.h"
+#include "gnc-engine.h"
+#include "gnc-euro.h"
+#include "gnc-hooks.h"
+#include "gnc-session.h"
 #include "engine-helpers.h"
 #include "gnc-locale-utils.h"
 #include "gnc-component-manager.h"
diff --git a/src/app-utils/gnc-ui-util.h b/libgnucash/app-utils/gnc-ui-util.h
similarity index 100%
rename from src/app-utils/gnc-ui-util.h
rename to libgnucash/app-utils/gnc-ui-util.h
diff --git a/src/app-utils/gncmod-app-utils.c b/libgnucash/app-utils/gncmod-app-utils.c
similarity index 100%
rename from src/app-utils/gncmod-app-utils.c
rename to libgnucash/app-utils/gncmod-app-utils.c
diff --git a/src/app-utils/guile-util.c b/libgnucash/app-utils/guile-util.c
similarity index 100%
rename from src/app-utils/guile-util.c
rename to libgnucash/app-utils/guile-util.c
diff --git a/src/app-utils/guile-util.h b/libgnucash/app-utils/guile-util.h
similarity index 100%
rename from src/app-utils/guile-util.h
rename to libgnucash/app-utils/guile-util.h
diff --git a/src/app-utils/hooks.scm b/libgnucash/app-utils/hooks.scm
similarity index 100%
rename from src/app-utils/hooks.scm
rename to libgnucash/app-utils/hooks.scm
diff --git a/src/app-utils/make-prefs-migration-script.xsl b/libgnucash/app-utils/make-prefs-migration-script.xsl
similarity index 100%
rename from src/app-utils/make-prefs-migration-script.xsl
rename to libgnucash/app-utils/make-prefs-migration-script.xsl
diff --git a/src/app-utils/migratable-prefs.xml.in b/libgnucash/app-utils/migratable-prefs.xml.in
similarity index 100%
rename from src/app-utils/migratable-prefs.xml.in
rename to libgnucash/app-utils/migratable-prefs.xml.in
diff --git a/src/app-utils/migrate-prefs.scm b/libgnucash/app-utils/migrate-prefs.scm
similarity index 100%
rename from src/app-utils/migrate-prefs.scm
rename to libgnucash/app-utils/migrate-prefs.scm
diff --git a/src/app-utils/option-util.c b/libgnucash/app-utils/option-util.c
similarity index 100%
rename from src/app-utils/option-util.c
rename to libgnucash/app-utils/option-util.c
diff --git a/src/app-utils/option-util.h b/libgnucash/app-utils/option-util.h
similarity index 100%
rename from src/app-utils/option-util.h
rename to libgnucash/app-utils/option-util.h
diff --git a/src/app-utils/options.scm b/libgnucash/app-utils/options.scm
similarity index 100%
rename from src/app-utils/options.scm
rename to libgnucash/app-utils/options.scm
diff --git a/src/app-utils/prefs.scm b/libgnucash/app-utils/prefs.scm
similarity index 100%
rename from src/app-utils/prefs.scm
rename to libgnucash/app-utils/prefs.scm
diff --git a/src/app-utils/simple-obj.scm b/libgnucash/app-utils/simple-obj.scm
similarity index 100%
rename from src/app-utils/simple-obj.scm
rename to libgnucash/app-utils/simple-obj.scm
diff --git a/src/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
similarity index 86%
rename from src/app-utils/test/CMakeLists.txt
rename to libgnucash/app-utils/test/CMakeLists.txt
index 43b4cbb2b2..1985d36d3e 100644
--- a/src/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -1,10 +1,10 @@
 
 SET(APP_UTILS_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/src/app-utils
-  ${CMAKE_SOURCE_DIR}/src/test-core
-  ${CMAKE_SOURCE_DIR}/src/engine # for qof.h
-  ${CMAKE_SOURCE_DIR}/src/engine/test-core
-  ${CMAKE_BINARY_DIR}/src # for config.h
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/common/test-core
+  ${CMAKE_SOURCE_DIR}/libgnucash/app-utils
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine # for qof.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/test-core
   ${GIO_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
diff --git a/libgnucash/app-utils/test/Makefile.am b/libgnucash/app-utils/test/Makefile.am
new file mode 100644
index 0000000000..a5aefc8df6
--- /dev/null
+++ b/libgnucash/app-utils/test/Makefile.am
@@ -0,0 +1,75 @@
+include $(top_srcdir)/test-templates/Makefile.decl
+
+check_PROGRAMS = \
+  test-link-module \
+  test-exp-parser \
+  test-scm-query-string \
+  test-print-parse-amount \
+  test-sx \
+  test-app-utils
+
+TESTS =  \
+  test-load-module \
+  ${check_PROGRAMS}
+
+test_scm_query_string_SOURCES = test-scm-query-string.cpp
+test_sx_SOURCES = test-sx.cpp
+test_print_parse_amount_SOURCES = test-print-parse-amount.cpp
+
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/libgnucash/app-utils
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  SRCDIR=${srcdir} \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+LDADD = \
+   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+   ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+   ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+   ${top_builddir}/common/test-core/libtest-core.la \
+   ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \
+   ${GUILE_LIBS}
+
+EXTRA_DIST += \
+  test-load-module \
+  test-print-queries.cpp \
+  CMakeLists.txt
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/engine/test-core \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/core-utils \
+  ${GUILE_CFLAGS} \
+  ${GLIB_CFLAGS} \
+  ${BOOST_CPPFLAGS}
+
+test_app_utils_SOURCES = \
+	test-app-utils.c \
+	test-option-util.cpp \
+	test-gnc-ui-util.c
+
+test_app_utils_CXXFLAGS = \
+	${DEFAULT_INCLUDES} \
+	-I${top_srcdir}/${MODULEPATH}/ \
+	-DTESTPROG=test_app_utils \
+	${GLIB_CFLAGS}
diff --git a/src/app-utils/test/test-app-utils.c b/libgnucash/app-utils/test/test-app-utils.c
similarity index 100%
rename from src/app-utils/test/test-app-utils.c
rename to libgnucash/app-utils/test/test-app-utils.c
diff --git a/src/app-utils/test/test-exp-parser.c b/libgnucash/app-utils/test/test-exp-parser.c
similarity index 100%
rename from src/app-utils/test/test-exp-parser.c
rename to libgnucash/app-utils/test/test-exp-parser.c
diff --git a/src/app-utils/test/test-gnc-ui-util.c b/libgnucash/app-utils/test/test-gnc-ui-util.c
similarity index 100%
rename from src/app-utils/test/test-gnc-ui-util.c
rename to libgnucash/app-utils/test/test-gnc-ui-util.c
diff --git a/src/app-utils/test/test-link-module.c b/libgnucash/app-utils/test/test-link-module.c
similarity index 100%
rename from src/app-utils/test/test-link-module.c
rename to libgnucash/app-utils/test/test-link-module.c
diff --git a/src/app-utils/test/test-load-module.in b/libgnucash/app-utils/test/test-load-module.in
similarity index 100%
rename from src/app-utils/test/test-load-module.in
rename to libgnucash/app-utils/test/test-load-module.in
diff --git a/src/app-utils/test/test-option-util.cpp b/libgnucash/app-utils/test/test-option-util.cpp
similarity index 100%
rename from src/app-utils/test/test-option-util.cpp
rename to libgnucash/app-utils/test/test-option-util.cpp
diff --git a/src/app-utils/test/test-print-parse-amount.cpp b/libgnucash/app-utils/test/test-print-parse-amount.cpp
similarity index 100%
rename from src/app-utils/test/test-print-parse-amount.cpp
rename to libgnucash/app-utils/test/test-print-parse-amount.cpp
diff --git a/src/app-utils/test/test-print-queries.cpp b/libgnucash/app-utils/test/test-print-queries.cpp
similarity index 100%
rename from src/app-utils/test/test-print-queries.cpp
rename to libgnucash/app-utils/test/test-print-queries.cpp
diff --git a/src/app-utils/test/test-scm-query-string.cpp b/libgnucash/app-utils/test/test-scm-query-string.cpp
similarity index 100%
rename from src/app-utils/test/test-scm-query-string.cpp
rename to libgnucash/app-utils/test/test-scm-query-string.cpp
diff --git a/src/app-utils/test/test-sx.cpp b/libgnucash/app-utils/test/test-sx.cpp
similarity index 100%
rename from src/app-utils/test/test-sx.cpp
rename to libgnucash/app-utils/test/test-sx.cpp
diff --git a/src/backend/CMakeLists.txt b/libgnucash/backend/CMakeLists.txt
similarity index 100%
rename from src/backend/CMakeLists.txt
rename to libgnucash/backend/CMakeLists.txt
diff --git a/src/backend/Makefile.am b/libgnucash/backend/Makefile.am
similarity index 100%
rename from src/backend/Makefile.am
rename to libgnucash/backend/Makefile.am
diff --git a/src/backend/dbi/.splintrc b/libgnucash/backend/dbi/.splintrc
similarity index 100%
rename from src/backend/dbi/.splintrc
rename to libgnucash/backend/dbi/.splintrc
diff --git a/src/backend/dbi/CMakeLists.txt b/libgnucash/backend/dbi/CMakeLists.txt
similarity index 96%
rename from src/backend/dbi/CMakeLists.txt
rename to libgnucash/backend/dbi/CMakeLists.txt
index f8028bd81a..bedd23fa9a 100644
--- a/src/backend/dbi/CMakeLists.txt
+++ b/libgnucash/backend/dbi/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/backend/dbi
+# CMakeLists.txt for libgnucash/backend/dbi
 
 ADD_SUBDIRECTORY(test)
 
diff --git a/src/backend/dbi/Makefile.am b/libgnucash/backend/dbi/Makefile.am
similarity index 62%
rename from src/backend/dbi/Makefile.am
rename to libgnucash/backend/dbi/Makefile.am
index 86ecc90751..f6b6497ba2 100644
--- a/src/backend/dbi/Makefile.am
+++ b/libgnucash/backend/dbi/Makefile.am
@@ -4,17 +4,17 @@ SUBDIRS = . test
 pkglib_LTLIBRARIES = libgncmod-backend-dbi.la
 
 
-# "${top_srcdir}/src/debug" below is for the splint header
+# "${top_srcdir}/common/debug" below is for the splint header
 AM_CPPFLAGS = \
   -I.. -I../.. \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
-  -I${top_srcdir}/src/backend \
-  -I${top_srcdir}/src/backend/sql \
-  -I${top_srcdir}/src/debug \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
+  -I${top_srcdir}/libgnucash/backend \
+  -I${top_srcdir}/libgnucash/backend/sql \
+  -I${top_srcdir}/common/debug \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/src \
+  -I${top_srcdir}/common \
   ${GLIB_CFLAGS} \
   ${BOOST_CPPFLAGS} \
   ${WARN_CFLAGS}
@@ -35,9 +35,9 @@ noinst_HEADERS = \
 libgncmod_backend_dbi_la_LDFLAGS = -shared -avoid-version
 libgncmod_backend_dbi_la_LIBADD = \
    ${GLIB_LIBS} \
-   ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+   ${top_builddir}/libgnucash/backend/sql/libgnc-backend-sql.la \
+   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
    ${BOOST_LDFLAGS} -lboost_regex \
    ${LIBDBI_LIBS}
 
diff --git a/src/backend/dbi/gnc-backend-dbi.cpp b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
similarity index 100%
rename from src/backend/dbi/gnc-backend-dbi.cpp
rename to libgnucash/backend/dbi/gnc-backend-dbi.cpp
diff --git a/src/backend/dbi/gnc-backend-dbi.h b/libgnucash/backend/dbi/gnc-backend-dbi.h
similarity index 100%
rename from src/backend/dbi/gnc-backend-dbi.h
rename to libgnucash/backend/dbi/gnc-backend-dbi.h
diff --git a/src/backend/dbi/gnc-backend-dbi.hpp b/libgnucash/backend/dbi/gnc-backend-dbi.hpp
similarity index 100%
rename from src/backend/dbi/gnc-backend-dbi.hpp
rename to libgnucash/backend/dbi/gnc-backend-dbi.hpp
diff --git a/src/backend/dbi/gnc-dbiprovider.hpp b/libgnucash/backend/dbi/gnc-dbiprovider.hpp
similarity index 100%
rename from src/backend/dbi/gnc-dbiprovider.hpp
rename to libgnucash/backend/dbi/gnc-dbiprovider.hpp
diff --git a/src/backend/dbi/gnc-dbiproviderimpl.hpp b/libgnucash/backend/dbi/gnc-dbiproviderimpl.hpp
similarity index 100%
rename from src/backend/dbi/gnc-dbiproviderimpl.hpp
rename to libgnucash/backend/dbi/gnc-dbiproviderimpl.hpp
diff --git a/src/backend/dbi/gnc-dbisqlconnection.cpp b/libgnucash/backend/dbi/gnc-dbisqlconnection.cpp
similarity index 100%
rename from src/backend/dbi/gnc-dbisqlconnection.cpp
rename to libgnucash/backend/dbi/gnc-dbisqlconnection.cpp
diff --git a/src/backend/dbi/gnc-dbisqlconnection.hpp b/libgnucash/backend/dbi/gnc-dbisqlconnection.hpp
similarity index 100%
rename from src/backend/dbi/gnc-dbisqlconnection.hpp
rename to libgnucash/backend/dbi/gnc-dbisqlconnection.hpp
diff --git a/src/backend/dbi/gnc-dbisqlresult.cpp b/libgnucash/backend/dbi/gnc-dbisqlresult.cpp
similarity index 100%
rename from src/backend/dbi/gnc-dbisqlresult.cpp
rename to libgnucash/backend/dbi/gnc-dbisqlresult.cpp
diff --git a/src/backend/dbi/gnc-dbisqlresult.hpp b/libgnucash/backend/dbi/gnc-dbisqlresult.hpp
similarity index 100%
rename from src/backend/dbi/gnc-dbisqlresult.hpp
rename to libgnucash/backend/dbi/gnc-dbisqlresult.hpp
diff --git a/src/backend/dbi/gncmod-backend-dbi.c b/libgnucash/backend/dbi/gncmod-backend-dbi.c
similarity index 100%
rename from src/backend/dbi/gncmod-backend-dbi.c
rename to libgnucash/backend/dbi/gncmod-backend-dbi.c
diff --git a/src/backend/dbi/test/CMakeLists.txt b/libgnucash/backend/dbi/test/CMakeLists.txt
similarity index 76%
rename from src/backend/dbi/test/CMakeLists.txt
rename to libgnucash/backend/dbi/test/CMakeLists.txt
index 637519b75b..70a9d93303 100644
--- a/src/backend/dbi/test/CMakeLists.txt
+++ b/libgnucash/backend/dbi/test/CMakeLists.txt
@@ -1,12 +1,12 @@
 
 SET(BACKEND_DBI_TEST_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src/core-utils
-  ${CMAKE_SOURCE_DIR}/src/backend/dbi/test
-  ${CMAKE_SOURCE_DIR}/src/backend/sql
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/engine/test-core
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/dbi/test
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/sql
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/test-core
+  ${CMAKE_SOURCE_DIR}/common/test-core
   ${LIBDBI_INCLUDE_PATH}
   ${GLIB2_INCLUDE_DIRS}
 )
diff --git a/src/backend/dbi/test/Makefile.am b/libgnucash/backend/dbi/test/Makefile.am
similarity index 55%
rename from src/backend/dbi/test/Makefile.am
rename to libgnucash/backend/dbi/test/Makefile.am
index 13e52cb8fd..0cc447c082 100644
--- a/src/backend/dbi/test/Makefile.am
+++ b/libgnucash/backend/dbi/test/Makefile.am
@@ -4,42 +4,42 @@ include $(top_srcdir)/test-templates/Makefile.decl
 
 AM_CPPFLAGS = \
   -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/engine/test-core \
-  -I${top_srcdir}/src/backend/sql \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/engine/test-core \
+  -I${top_srcdir}/libgnucash/backend/sql \
   -DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \
   -DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \
   ${BOOST_CPPFLAGS}
 
-LDADD = ${top_builddir}/src/test-core/libtest-core.la \
-        ${top_builddir}/src/gnc-module/libgnc-module.la \
-        ${top_builddir}/src/engine/libgncmod-engine.la \
-        ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-        ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-        ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
-        ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \
+LDADD = ${top_builddir}/common/test-core/libtest-core.la \
+        ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+        ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+        ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \
+        ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+        ${top_builddir}/libgnucash/backend/sql/libgnc-backend-sql.la \
+        ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \
         ${top_builddir}/lib/libc/libc-missing.la
 
 GNC_TEST_DEPS = \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml
 
 TESTS_ENVIRONMENT = \
   GNC_BUILDDIR=${abs_top_builddir} \
   GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
   SRCDIR=${srcdir} \
   ${gnc_dbd_dir_override} \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
 
 EXTRA_DIST += \
     test-dbi-stuff.h \
diff --git a/src/backend/dbi/test/test-backend-dbi-basic.cpp b/libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
similarity index 100%
rename from src/backend/dbi/test/test-backend-dbi-basic.cpp
rename to libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
diff --git a/src/backend/dbi/test/test-backend-dbi.cpp b/libgnucash/backend/dbi/test/test-backend-dbi.cpp
similarity index 100%
rename from src/backend/dbi/test/test-backend-dbi.cpp
rename to libgnucash/backend/dbi/test/test-backend-dbi.cpp
diff --git a/src/backend/dbi/test/test-dbi-business-stuff.cpp b/libgnucash/backend/dbi/test/test-dbi-business-stuff.cpp
similarity index 100%
rename from src/backend/dbi/test/test-dbi-business-stuff.cpp
rename to libgnucash/backend/dbi/test/test-dbi-business-stuff.cpp
diff --git a/src/backend/dbi/test/test-dbi-business-stuff.h b/libgnucash/backend/dbi/test/test-dbi-business-stuff.h
similarity index 100%
rename from src/backend/dbi/test/test-dbi-business-stuff.h
rename to libgnucash/backend/dbi/test/test-dbi-business-stuff.h
diff --git a/src/backend/dbi/test/test-dbi-stuff.cpp b/libgnucash/backend/dbi/test/test-dbi-stuff.cpp
similarity index 100%
rename from src/backend/dbi/test/test-dbi-stuff.cpp
rename to libgnucash/backend/dbi/test/test-dbi-stuff.cpp
diff --git a/src/backend/dbi/test/test-dbi-stuff.h b/libgnucash/backend/dbi/test/test-dbi-stuff.h
similarity index 100%
rename from src/backend/dbi/test/test-dbi-stuff.h
rename to libgnucash/backend/dbi/test/test-dbi-stuff.h
diff --git a/src/backend/dbi/test/test-dbi.xml b/libgnucash/backend/dbi/test/test-dbi.xml
similarity index 100%
rename from src/backend/dbi/test/test-dbi.xml
rename to libgnucash/backend/dbi/test/test-dbi.xml
diff --git a/src/backend/sql/.splintrc b/libgnucash/backend/sql/.splintrc
similarity index 100%
rename from src/backend/sql/.splintrc
rename to libgnucash/backend/sql/.splintrc
diff --git a/src/backend/sql/CMakeLists.txt b/libgnucash/backend/sql/CMakeLists.txt
similarity index 97%
rename from src/backend/sql/CMakeLists.txt
rename to libgnucash/backend/sql/CMakeLists.txt
index 89d06d9c8b..2bd6fa0ca6 100644
--- a/src/backend/sql/CMakeLists.txt
+++ b/libgnucash/backend/sql/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/backend/dbi
+# CMakeLists.txt for libgnucash/backend/dbi
 
 ADD_SUBDIRECTORY(test)
 
diff --git a/src/backend/sql/Makefile.am b/libgnucash/backend/sql/Makefile.am
similarity index 86%
rename from src/backend/sql/Makefile.am
rename to libgnucash/backend/sql/Makefile.am
index 07c26d8db8..db29b11ddd 100644
--- a/src/backend/sql/Makefile.am
+++ b/libgnucash/backend/sql/Makefile.am
@@ -5,14 +5,14 @@ TEST_SUBDIRS = test
 # Now a shared library AND a GModule
 lib_LTLIBRARIES = libgnc-backend-sql.la
 
-# "${top_srcdir}/src/debug" below is for the splint header
+# "${top_srcdir}/common/debug" below is for the splint header
 AM_CPPFLAGS = \
   -I.. -I../.. \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
-  -I${top_srcdir}/src/backend \
-  -I${top_srcdir}/src/debug \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils\
+  -I${top_srcdir}/libgnucash/backend \
+  -I${top_srcdir}/common/debug \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils\
   -I${top_srcdir}/lib/libc\
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \
@@ -77,7 +77,7 @@ noinst_HEADERS = \
 libgnc_backend_sql_la_LIBADD = \
    ${GLIB_LIBS} \
    ${GUILE_LIBS} \
-   ${top_builddir}/src/engine/libgncmod-engine.la
+   ${top_builddir}/libgnucash/engine/libgncmod-engine.la
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
 
diff --git a/src/backend/sql/escape.cpp b/libgnucash/backend/sql/escape.cpp
similarity index 100%
rename from src/backend/sql/escape.cpp
rename to libgnucash/backend/sql/escape.cpp
diff --git a/src/backend/sql/escape.h b/libgnucash/backend/sql/escape.h
similarity index 100%
rename from src/backend/sql/escape.h
rename to libgnucash/backend/sql/escape.h
diff --git a/src/backend/sql/gnc-account-sql.cpp b/libgnucash/backend/sql/gnc-account-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-account-sql.cpp
rename to libgnucash/backend/sql/gnc-account-sql.cpp
diff --git a/src/backend/sql/gnc-account-sql.h b/libgnucash/backend/sql/gnc-account-sql.h
similarity index 100%
rename from src/backend/sql/gnc-account-sql.h
rename to libgnucash/backend/sql/gnc-account-sql.h
diff --git a/src/backend/sql/gnc-address-sql.cpp b/libgnucash/backend/sql/gnc-address-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-address-sql.cpp
rename to libgnucash/backend/sql/gnc-address-sql.cpp
diff --git a/src/backend/sql/gnc-bill-term-sql.cpp b/libgnucash/backend/sql/gnc-bill-term-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-bill-term-sql.cpp
rename to libgnucash/backend/sql/gnc-bill-term-sql.cpp
diff --git a/src/backend/sql/gnc-bill-term-sql.h b/libgnucash/backend/sql/gnc-bill-term-sql.h
similarity index 100%
rename from src/backend/sql/gnc-bill-term-sql.h
rename to libgnucash/backend/sql/gnc-bill-term-sql.h
diff --git a/src/backend/sql/gnc-book-sql.cpp b/libgnucash/backend/sql/gnc-book-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-book-sql.cpp
rename to libgnucash/backend/sql/gnc-book-sql.cpp
diff --git a/src/backend/sql/gnc-book-sql.h b/libgnucash/backend/sql/gnc-book-sql.h
similarity index 100%
rename from src/backend/sql/gnc-book-sql.h
rename to libgnucash/backend/sql/gnc-book-sql.h
diff --git a/src/backend/sql/gnc-budget-sql.cpp b/libgnucash/backend/sql/gnc-budget-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-budget-sql.cpp
rename to libgnucash/backend/sql/gnc-budget-sql.cpp
diff --git a/src/backend/sql/gnc-budget-sql.h b/libgnucash/backend/sql/gnc-budget-sql.h
similarity index 100%
rename from src/backend/sql/gnc-budget-sql.h
rename to libgnucash/backend/sql/gnc-budget-sql.h
diff --git a/src/backend/sql/gnc-commodity-sql.cpp b/libgnucash/backend/sql/gnc-commodity-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-commodity-sql.cpp
rename to libgnucash/backend/sql/gnc-commodity-sql.cpp
diff --git a/src/backend/sql/gnc-commodity-sql.h b/libgnucash/backend/sql/gnc-commodity-sql.h
similarity index 100%
rename from src/backend/sql/gnc-commodity-sql.h
rename to libgnucash/backend/sql/gnc-commodity-sql.h
diff --git a/src/backend/sql/gnc-customer-sql.cpp b/libgnucash/backend/sql/gnc-customer-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-customer-sql.cpp
rename to libgnucash/backend/sql/gnc-customer-sql.cpp
diff --git a/src/backend/sql/gnc-customer-sql.h b/libgnucash/backend/sql/gnc-customer-sql.h
similarity index 100%
rename from src/backend/sql/gnc-customer-sql.h
rename to libgnucash/backend/sql/gnc-customer-sql.h
diff --git a/src/backend/sql/gnc-employee-sql.cpp b/libgnucash/backend/sql/gnc-employee-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-employee-sql.cpp
rename to libgnucash/backend/sql/gnc-employee-sql.cpp
diff --git a/src/backend/sql/gnc-employee-sql.h b/libgnucash/backend/sql/gnc-employee-sql.h
similarity index 100%
rename from src/backend/sql/gnc-employee-sql.h
rename to libgnucash/backend/sql/gnc-employee-sql.h
diff --git a/src/backend/sql/gnc-entry-sql.cpp b/libgnucash/backend/sql/gnc-entry-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-entry-sql.cpp
rename to libgnucash/backend/sql/gnc-entry-sql.cpp
diff --git a/src/backend/sql/gnc-entry-sql.h b/libgnucash/backend/sql/gnc-entry-sql.h
similarity index 100%
rename from src/backend/sql/gnc-entry-sql.h
rename to libgnucash/backend/sql/gnc-entry-sql.h
diff --git a/src/backend/sql/gnc-invoice-sql.cpp b/libgnucash/backend/sql/gnc-invoice-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-invoice-sql.cpp
rename to libgnucash/backend/sql/gnc-invoice-sql.cpp
diff --git a/src/backend/sql/gnc-invoice-sql.h b/libgnucash/backend/sql/gnc-invoice-sql.h
similarity index 100%
rename from src/backend/sql/gnc-invoice-sql.h
rename to libgnucash/backend/sql/gnc-invoice-sql.h
diff --git a/src/backend/sql/gnc-job-sql.cpp b/libgnucash/backend/sql/gnc-job-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-job-sql.cpp
rename to libgnucash/backend/sql/gnc-job-sql.cpp
diff --git a/src/backend/sql/gnc-job-sql.h b/libgnucash/backend/sql/gnc-job-sql.h
similarity index 100%
rename from src/backend/sql/gnc-job-sql.h
rename to libgnucash/backend/sql/gnc-job-sql.h
diff --git a/src/backend/sql/gnc-lots-sql.cpp b/libgnucash/backend/sql/gnc-lots-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-lots-sql.cpp
rename to libgnucash/backend/sql/gnc-lots-sql.cpp
diff --git a/src/backend/sql/gnc-lots-sql.h b/libgnucash/backend/sql/gnc-lots-sql.h
similarity index 100%
rename from src/backend/sql/gnc-lots-sql.h
rename to libgnucash/backend/sql/gnc-lots-sql.h
diff --git a/src/backend/sql/gnc-order-sql.cpp b/libgnucash/backend/sql/gnc-order-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-order-sql.cpp
rename to libgnucash/backend/sql/gnc-order-sql.cpp
diff --git a/src/backend/sql/gnc-order-sql.h b/libgnucash/backend/sql/gnc-order-sql.h
similarity index 100%
rename from src/backend/sql/gnc-order-sql.h
rename to libgnucash/backend/sql/gnc-order-sql.h
diff --git a/src/backend/sql/gnc-owner-sql.cpp b/libgnucash/backend/sql/gnc-owner-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-owner-sql.cpp
rename to libgnucash/backend/sql/gnc-owner-sql.cpp
diff --git a/src/backend/sql/gnc-price-sql.cpp b/libgnucash/backend/sql/gnc-price-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-price-sql.cpp
rename to libgnucash/backend/sql/gnc-price-sql.cpp
diff --git a/src/backend/sql/gnc-price-sql.h b/libgnucash/backend/sql/gnc-price-sql.h
similarity index 100%
rename from src/backend/sql/gnc-price-sql.h
rename to libgnucash/backend/sql/gnc-price-sql.h
diff --git a/src/backend/sql/gnc-recurrence-sql.cpp b/libgnucash/backend/sql/gnc-recurrence-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-recurrence-sql.cpp
rename to libgnucash/backend/sql/gnc-recurrence-sql.cpp
diff --git a/src/backend/sql/gnc-recurrence-sql.h b/libgnucash/backend/sql/gnc-recurrence-sql.h
similarity index 100%
rename from src/backend/sql/gnc-recurrence-sql.h
rename to libgnucash/backend/sql/gnc-recurrence-sql.h
diff --git a/src/backend/sql/gnc-schedxaction-sql.cpp b/libgnucash/backend/sql/gnc-schedxaction-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-schedxaction-sql.cpp
rename to libgnucash/backend/sql/gnc-schedxaction-sql.cpp
diff --git a/src/backend/sql/gnc-schedxaction-sql.h b/libgnucash/backend/sql/gnc-schedxaction-sql.h
similarity index 100%
rename from src/backend/sql/gnc-schedxaction-sql.h
rename to libgnucash/backend/sql/gnc-schedxaction-sql.h
diff --git a/src/backend/sql/gnc-slots-sql.cpp b/libgnucash/backend/sql/gnc-slots-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-slots-sql.cpp
rename to libgnucash/backend/sql/gnc-slots-sql.cpp
diff --git a/src/backend/sql/gnc-slots-sql.h b/libgnucash/backend/sql/gnc-slots-sql.h
similarity index 100%
rename from src/backend/sql/gnc-slots-sql.h
rename to libgnucash/backend/sql/gnc-slots-sql.h
diff --git a/src/backend/sql/gnc-sql-backend.cpp b/libgnucash/backend/sql/gnc-sql-backend.cpp
similarity index 100%
rename from src/backend/sql/gnc-sql-backend.cpp
rename to libgnucash/backend/sql/gnc-sql-backend.cpp
diff --git a/src/backend/sql/gnc-sql-backend.hpp b/libgnucash/backend/sql/gnc-sql-backend.hpp
similarity index 100%
rename from src/backend/sql/gnc-sql-backend.hpp
rename to libgnucash/backend/sql/gnc-sql-backend.hpp
diff --git a/src/backend/sql/gnc-sql-column-table-entry.cpp b/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp
similarity index 100%
rename from src/backend/sql/gnc-sql-column-table-entry.cpp
rename to libgnucash/backend/sql/gnc-sql-column-table-entry.cpp
diff --git a/src/backend/sql/gnc-sql-column-table-entry.hpp b/libgnucash/backend/sql/gnc-sql-column-table-entry.hpp
similarity index 100%
rename from src/backend/sql/gnc-sql-column-table-entry.hpp
rename to libgnucash/backend/sql/gnc-sql-column-table-entry.hpp
diff --git a/src/backend/sql/gnc-sql-connection.hpp b/libgnucash/backend/sql/gnc-sql-connection.hpp
similarity index 100%
rename from src/backend/sql/gnc-sql-connection.hpp
rename to libgnucash/backend/sql/gnc-sql-connection.hpp
diff --git a/src/backend/sql/gnc-sql-object-backend.cpp b/libgnucash/backend/sql/gnc-sql-object-backend.cpp
similarity index 100%
rename from src/backend/sql/gnc-sql-object-backend.cpp
rename to libgnucash/backend/sql/gnc-sql-object-backend.cpp
diff --git a/src/backend/sql/gnc-sql-object-backend.hpp b/libgnucash/backend/sql/gnc-sql-object-backend.hpp
similarity index 100%
rename from src/backend/sql/gnc-sql-object-backend.hpp
rename to libgnucash/backend/sql/gnc-sql-object-backend.hpp
diff --git a/src/backend/sql/gnc-sql-result.cpp b/libgnucash/backend/sql/gnc-sql-result.cpp
similarity index 100%
rename from src/backend/sql/gnc-sql-result.cpp
rename to libgnucash/backend/sql/gnc-sql-result.cpp
diff --git a/src/backend/sql/gnc-sql-result.hpp b/libgnucash/backend/sql/gnc-sql-result.hpp
similarity index 100%
rename from src/backend/sql/gnc-sql-result.hpp
rename to libgnucash/backend/sql/gnc-sql-result.hpp
diff --git a/src/backend/sql/gnc-tax-table-sql.cpp b/libgnucash/backend/sql/gnc-tax-table-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-tax-table-sql.cpp
rename to libgnucash/backend/sql/gnc-tax-table-sql.cpp
diff --git a/src/backend/sql/gnc-tax-table-sql.h b/libgnucash/backend/sql/gnc-tax-table-sql.h
similarity index 100%
rename from src/backend/sql/gnc-tax-table-sql.h
rename to libgnucash/backend/sql/gnc-tax-table-sql.h
diff --git a/src/backend/sql/gnc-transaction-sql.cpp b/libgnucash/backend/sql/gnc-transaction-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-transaction-sql.cpp
rename to libgnucash/backend/sql/gnc-transaction-sql.cpp
diff --git a/src/backend/sql/gnc-transaction-sql.h b/libgnucash/backend/sql/gnc-transaction-sql.h
similarity index 100%
rename from src/backend/sql/gnc-transaction-sql.h
rename to libgnucash/backend/sql/gnc-transaction-sql.h
diff --git a/src/backend/sql/gnc-vendor-sql.cpp b/libgnucash/backend/sql/gnc-vendor-sql.cpp
similarity index 100%
rename from src/backend/sql/gnc-vendor-sql.cpp
rename to libgnucash/backend/sql/gnc-vendor-sql.cpp
diff --git a/src/backend/sql/gnc-vendor-sql.h b/libgnucash/backend/sql/gnc-vendor-sql.h
similarity index 100%
rename from src/backend/sql/gnc-vendor-sql.h
rename to libgnucash/backend/sql/gnc-vendor-sql.h
diff --git a/src/backend/sql/test/CMakeLists.txt b/libgnucash/backend/sql/test/CMakeLists.txt
similarity index 79%
rename from src/backend/sql/test/CMakeLists.txt
rename to libgnucash/backend/sql/test/CMakeLists.txt
index 545487c87c..e97de3ae7d 100644
--- a/src/backend/sql/test/CMakeLists.txt
+++ b/libgnucash/backend/sql/test/CMakeLists.txt
@@ -1,9 +1,9 @@
 
 SET(BACKEND_SQL_TEST_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src/backend/sql
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/sql
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/common/test-core
   ${GLIB2_INCLUDE_DIRS}
 )
 
diff --git a/libgnucash/backend/sql/test/Makefile.am b/libgnucash/backend/sql/test/Makefile.am
new file mode 100644
index 0000000000..8eaa5ac07b
--- /dev/null
+++ b/libgnucash/backend/sql/test/Makefile.am
@@ -0,0 +1,72 @@
+SUBDIRS = .
+
+include $(top_srcdir)/test-templates/Makefile.decl
+MODULEPATH = libgnucash/backend/sql
+
+test_column_types_SOURCES = \
+  test-column-types.cpp
+
+check_PROGRAMS = \
+  test-column-types \
+  test-sqlbe
+
+TESTS = ${check_PROGRAMS}
+
+GNC_TEST_DEPS = \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql
+
+TESTS_ENVIRONMENT = \
+  GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
+  SRCDIR=${srcdir} \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+LDADD = ${top_builddir}/common/test-core/libtest-core.la \
+        ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+        ${top_builddir}/libgnucash/backend/sql/libgnc-backend-sql.la \
+        ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+        ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \
+        ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+        ${top_builddir}/lib/libc/libc-missing.la
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/engine/test-core \
+  -I${top_srcdir}/libgnucash/backend/sql \
+  ${GLIB_CFLAGS} \
+  ${GUILE_CFLAGS}
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
+
+#test_sqlbedir = ${top_srcdir}/${MODULEPATH}/test
+
+test_sqlbe_SOURCES = \
+	test-sqlbe.cpp \
+	utest-gnc-backend-sql.cpp
+
+test_sqlbe_LDADD = \
+	$(top_builddir)/$(MODULEPATH)/libgnc-backend-sql.la \
+	$(top_builddir)/libgnucash/engine/libgncmod-engine.la \
+	$(top_builddir)/common/test-core/libtest-core.la \
+	$(top_builddir)/libgnucash/core-utils/libgnc-core-utils.la \
+	$(GLIB_LIBS)
+
+test_sqlbe_CFLAGS = \
+	-DTESTPROG=test_sqlbe \
+	$(DEFAULT_INCLUDES) \
+	-I$(top_srcdir)/$(MODULEPATH)/ \
+	-I$(top_srcdir)/libgnucash/backend/dbi/ \
+	-I$(top_srcdir)/libgnucash/engine/ \
+	-I$(top_srcdir)/common/test-core/ \
+	$(GLIB_CFLAGS)
+
+EXTRA_DIST += CMakeLists.txt
diff --git a/src/backend/sql/test/test-column-types.cpp b/libgnucash/backend/sql/test/test-column-types.cpp
similarity index 100%
rename from src/backend/sql/test/test-column-types.cpp
rename to libgnucash/backend/sql/test/test-column-types.cpp
diff --git a/src/backend/sql/test/test-sqlbe.cpp b/libgnucash/backend/sql/test/test-sqlbe.cpp
similarity index 100%
rename from src/backend/sql/test/test-sqlbe.cpp
rename to libgnucash/backend/sql/test/test-sqlbe.cpp
diff --git a/src/backend/sql/test/utest-gnc-backend-sql.cpp b/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp
similarity index 100%
rename from src/backend/sql/test/utest-gnc-backend-sql.cpp
rename to libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp
diff --git a/src/backend/xml/CMakeLists.txt b/libgnucash/backend/xml/CMakeLists.txt
similarity index 98%
rename from src/backend/xml/CMakeLists.txt
rename to libgnucash/backend/xml/CMakeLists.txt
index fa10ebdd59..aafc4cda84 100644
--- a/src/backend/xml/CMakeLists.txt
+++ b/libgnucash/backend/xml/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/backend/xml
+# CMakeLists.txt for libgnucash/backend/xml
 
 ADD_SUBDIRECTORY(test)
 
diff --git a/src/backend/xml/Makefile.am b/libgnucash/backend/xml/Makefile.am
similarity index 83%
rename from src/backend/xml/Makefile.am
rename to libgnucash/backend/xml/Makefile.am
index eb58ca3c3f..e16f33e487 100644
--- a/src/backend/xml/Makefile.am
+++ b/libgnucash/backend/xml/Makefile.am
@@ -8,12 +8,12 @@ AM_CPPFLAGS = \
   -I.. -I../.. \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
   -DU_SHOW_CPLUSPLUS_API=0 \
-  -I${top_srcdir}/src/backend \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/libgnucash/backend \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
   -I${top_srcdir}/lib/libc\
-  -I$(top_srcdir)/src \
+  -I$(top_srcdir)/common \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${BOOST_CPPFLAGS}
@@ -90,16 +90,16 @@ libgnc_backend_xml_utils_la_LIBADD = \
    ${GLIB_LIBS} \
    ${LIBXML2_LIBS} \
    ${ZLIB_LIBS} \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/core-utils/libgnc-core-utils.la
+   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la
 
 libgncmod_backend_xml_la_LDFLAGS = -module -avoid-version
 libgncmod_backend_xml_la_LIBADD = \
    ${GLIB_LIBS} \
    ${LIBXML2_LIBS} \
    ${ZLIB_LIBS} \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
    libgnc-backend-xml-utils.la
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
diff --git a/src/backend/xml/gnc-account-xml-v2.cpp b/libgnucash/backend/xml/gnc-account-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-account-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-account-xml-v2.cpp
diff --git a/src/backend/xml/gnc-address-xml-v2.cpp b/libgnucash/backend/xml/gnc-address-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-address-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-address-xml-v2.cpp
diff --git a/src/backend/xml/gnc-address-xml-v2.h b/libgnucash/backend/xml/gnc-address-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-address-xml-v2.h
rename to libgnucash/backend/xml/gnc-address-xml-v2.h
diff --git a/src/backend/xml/gnc-backend-xml.cpp b/libgnucash/backend/xml/gnc-backend-xml.cpp
similarity index 100%
rename from src/backend/xml/gnc-backend-xml.cpp
rename to libgnucash/backend/xml/gnc-backend-xml.cpp
diff --git a/src/backend/xml/gnc-backend-xml.h b/libgnucash/backend/xml/gnc-backend-xml.h
similarity index 100%
rename from src/backend/xml/gnc-backend-xml.h
rename to libgnucash/backend/xml/gnc-backend-xml.h
diff --git a/src/backend/xml/gnc-bill-term-xml-v2.cpp b/libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-bill-term-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp
diff --git a/src/backend/xml/gnc-bill-term-xml-v2.h b/libgnucash/backend/xml/gnc-bill-term-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-bill-term-xml-v2.h
rename to libgnucash/backend/xml/gnc-bill-term-xml-v2.h
diff --git a/src/backend/xml/gnc-book-xml-v2.cpp b/libgnucash/backend/xml/gnc-book-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-book-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-book-xml-v2.cpp
diff --git a/src/backend/xml/gnc-budget-xml-v2.cpp b/libgnucash/backend/xml/gnc-budget-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-budget-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-budget-xml-v2.cpp
diff --git a/src/backend/xml/gnc-commodity-xml-v2.cpp b/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-commodity-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-commodity-xml-v2.cpp
diff --git a/src/backend/xml/gnc-customer-xml-v2.cpp b/libgnucash/backend/xml/gnc-customer-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-customer-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-customer-xml-v2.cpp
diff --git a/src/backend/xml/gnc-customer-xml-v2.h b/libgnucash/backend/xml/gnc-customer-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-customer-xml-v2.h
rename to libgnucash/backend/xml/gnc-customer-xml-v2.h
diff --git a/src/backend/xml/gnc-employee-xml-v2.cpp b/libgnucash/backend/xml/gnc-employee-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-employee-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-employee-xml-v2.cpp
diff --git a/src/backend/xml/gnc-employee-xml-v2.h b/libgnucash/backend/xml/gnc-employee-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-employee-xml-v2.h
rename to libgnucash/backend/xml/gnc-employee-xml-v2.h
diff --git a/src/backend/xml/gnc-entry-xml-v2.cpp b/libgnucash/backend/xml/gnc-entry-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-entry-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-entry-xml-v2.cpp
diff --git a/src/backend/xml/gnc-entry-xml-v2.h b/libgnucash/backend/xml/gnc-entry-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-entry-xml-v2.h
rename to libgnucash/backend/xml/gnc-entry-xml-v2.h
diff --git a/src/backend/xml/gnc-freqspec-xml-v2.cpp b/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-freqspec-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp
diff --git a/src/backend/xml/gnc-invoice-xml-v2.cpp b/libgnucash/backend/xml/gnc-invoice-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-invoice-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-invoice-xml-v2.cpp
diff --git a/src/backend/xml/gnc-invoice-xml-v2.h b/libgnucash/backend/xml/gnc-invoice-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-invoice-xml-v2.h
rename to libgnucash/backend/xml/gnc-invoice-xml-v2.h
diff --git a/src/backend/xml/gnc-job-xml-v2.cpp b/libgnucash/backend/xml/gnc-job-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-job-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-job-xml-v2.cpp
diff --git a/src/backend/xml/gnc-job-xml-v2.h b/libgnucash/backend/xml/gnc-job-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-job-xml-v2.h
rename to libgnucash/backend/xml/gnc-job-xml-v2.h
diff --git a/src/backend/xml/gnc-lot-xml-v2.cpp b/libgnucash/backend/xml/gnc-lot-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-lot-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-lot-xml-v2.cpp
diff --git a/src/backend/xml/gnc-order-xml-v2.cpp b/libgnucash/backend/xml/gnc-order-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-order-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-order-xml-v2.cpp
diff --git a/src/backend/xml/gnc-order-xml-v2.h b/libgnucash/backend/xml/gnc-order-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-order-xml-v2.h
rename to libgnucash/backend/xml/gnc-order-xml-v2.h
diff --git a/src/backend/xml/gnc-owner-xml-v2.cpp b/libgnucash/backend/xml/gnc-owner-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-owner-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-owner-xml-v2.cpp
diff --git a/src/backend/xml/gnc-owner-xml-v2.h b/libgnucash/backend/xml/gnc-owner-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-owner-xml-v2.h
rename to libgnucash/backend/xml/gnc-owner-xml-v2.h
diff --git a/src/backend/xml/gnc-pricedb-xml-v2.cpp b/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-pricedb-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp
diff --git a/src/backend/xml/gnc-recurrence-xml-v2.cpp b/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-recurrence-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp
diff --git a/src/backend/xml/gnc-schedxaction-xml-v2.cpp b/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-schedxaction-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp
diff --git a/src/backend/xml/gnc-tax-table-xml-v2.cpp b/libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-tax-table-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp
diff --git a/src/backend/xml/gnc-tax-table-xml-v2.h b/libgnucash/backend/xml/gnc-tax-table-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-tax-table-xml-v2.h
rename to libgnucash/backend/xml/gnc-tax-table-xml-v2.h
diff --git a/src/backend/xml/gnc-transaction-xml-v2.cpp b/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-transaction-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-transaction-xml-v2.cpp
diff --git a/src/backend/xml/gnc-vendor-xml-v2.cpp b/libgnucash/backend/xml/gnc-vendor-xml-v2.cpp
similarity index 100%
rename from src/backend/xml/gnc-vendor-xml-v2.cpp
rename to libgnucash/backend/xml/gnc-vendor-xml-v2.cpp
diff --git a/src/backend/xml/gnc-vendor-xml-v2.h b/libgnucash/backend/xml/gnc-vendor-xml-v2.h
similarity index 100%
rename from src/backend/xml/gnc-vendor-xml-v2.h
rename to libgnucash/backend/xml/gnc-vendor-xml-v2.h
diff --git a/src/backend/xml/gnc-xml-backend.cpp b/libgnucash/backend/xml/gnc-xml-backend.cpp
similarity index 100%
rename from src/backend/xml/gnc-xml-backend.cpp
rename to libgnucash/backend/xml/gnc-xml-backend.cpp
diff --git a/src/backend/xml/gnc-xml-backend.hpp b/libgnucash/backend/xml/gnc-xml-backend.hpp
similarity index 100%
rename from src/backend/xml/gnc-xml-backend.hpp
rename to libgnucash/backend/xml/gnc-xml-backend.hpp
diff --git a/src/backend/xml/gnc-xml-helper.cpp b/libgnucash/backend/xml/gnc-xml-helper.cpp
similarity index 100%
rename from src/backend/xml/gnc-xml-helper.cpp
rename to libgnucash/backend/xml/gnc-xml-helper.cpp
diff --git a/src/backend/xml/gnc-xml-helper.h b/libgnucash/backend/xml/gnc-xml-helper.h
similarity index 100%
rename from src/backend/xml/gnc-xml-helper.h
rename to libgnucash/backend/xml/gnc-xml-helper.h
diff --git a/src/backend/xml/gnc-xml.h b/libgnucash/backend/xml/gnc-xml.h
similarity index 100%
rename from src/backend/xml/gnc-xml.h
rename to libgnucash/backend/xml/gnc-xml.h
diff --git a/src/backend/xml/gncmod-backend-xml.cpp b/libgnucash/backend/xml/gncmod-backend-xml.cpp
similarity index 100%
rename from src/backend/xml/gncmod-backend-xml.cpp
rename to libgnucash/backend/xml/gncmod-backend-xml.cpp
diff --git a/src/backend/xml/io-example-account.cpp b/libgnucash/backend/xml/io-example-account.cpp
similarity index 100%
rename from src/backend/xml/io-example-account.cpp
rename to libgnucash/backend/xml/io-example-account.cpp
diff --git a/src/backend/xml/io-example-account.h b/libgnucash/backend/xml/io-example-account.h
similarity index 100%
rename from src/backend/xml/io-example-account.h
rename to libgnucash/backend/xml/io-example-account.h
diff --git a/src/backend/xml/io-gncxml-gen.cpp b/libgnucash/backend/xml/io-gncxml-gen.cpp
similarity index 100%
rename from src/backend/xml/io-gncxml-gen.cpp
rename to libgnucash/backend/xml/io-gncxml-gen.cpp
diff --git a/src/backend/xml/io-gncxml-gen.h b/libgnucash/backend/xml/io-gncxml-gen.h
similarity index 100%
rename from src/backend/xml/io-gncxml-gen.h
rename to libgnucash/backend/xml/io-gncxml-gen.h
diff --git a/src/backend/xml/io-gncxml-v1.cpp b/libgnucash/backend/xml/io-gncxml-v1.cpp
similarity index 100%
rename from src/backend/xml/io-gncxml-v1.cpp
rename to libgnucash/backend/xml/io-gncxml-v1.cpp
diff --git a/src/backend/xml/io-gncxml-v2.cpp b/libgnucash/backend/xml/io-gncxml-v2.cpp
similarity index 100%
rename from src/backend/xml/io-gncxml-v2.cpp
rename to libgnucash/backend/xml/io-gncxml-v2.cpp
diff --git a/src/backend/xml/io-gncxml-v2.h b/libgnucash/backend/xml/io-gncxml-v2.h
similarity index 100%
rename from src/backend/xml/io-gncxml-v2.h
rename to libgnucash/backend/xml/io-gncxml-v2.h
diff --git a/src/backend/xml/io-gncxml.h b/libgnucash/backend/xml/io-gncxml.h
similarity index 100%
rename from src/backend/xml/io-gncxml.h
rename to libgnucash/backend/xml/io-gncxml.h
diff --git a/src/backend/xml/io-utils.cpp b/libgnucash/backend/xml/io-utils.cpp
similarity index 100%
rename from src/backend/xml/io-utils.cpp
rename to libgnucash/backend/xml/io-utils.cpp
diff --git a/src/backend/xml/io-utils.h b/libgnucash/backend/xml/io-utils.h
similarity index 100%
rename from src/backend/xml/io-utils.h
rename to libgnucash/backend/xml/io-utils.h
diff --git a/src/backend/xml/sixtp-dom-generators.cpp b/libgnucash/backend/xml/sixtp-dom-generators.cpp
similarity index 100%
rename from src/backend/xml/sixtp-dom-generators.cpp
rename to libgnucash/backend/xml/sixtp-dom-generators.cpp
diff --git a/src/backend/xml/sixtp-dom-generators.h b/libgnucash/backend/xml/sixtp-dom-generators.h
similarity index 100%
rename from src/backend/xml/sixtp-dom-generators.h
rename to libgnucash/backend/xml/sixtp-dom-generators.h
diff --git a/src/backend/xml/sixtp-dom-parsers.cpp b/libgnucash/backend/xml/sixtp-dom-parsers.cpp
similarity index 100%
rename from src/backend/xml/sixtp-dom-parsers.cpp
rename to libgnucash/backend/xml/sixtp-dom-parsers.cpp
diff --git a/src/backend/xml/sixtp-dom-parsers.h b/libgnucash/backend/xml/sixtp-dom-parsers.h
similarity index 100%
rename from src/backend/xml/sixtp-dom-parsers.h
rename to libgnucash/backend/xml/sixtp-dom-parsers.h
diff --git a/src/backend/xml/sixtp-parsers.h b/libgnucash/backend/xml/sixtp-parsers.h
similarity index 100%
rename from src/backend/xml/sixtp-parsers.h
rename to libgnucash/backend/xml/sixtp-parsers.h
diff --git a/src/backend/xml/sixtp-stack.cpp b/libgnucash/backend/xml/sixtp-stack.cpp
similarity index 100%
rename from src/backend/xml/sixtp-stack.cpp
rename to libgnucash/backend/xml/sixtp-stack.cpp
diff --git a/src/backend/xml/sixtp-stack.h b/libgnucash/backend/xml/sixtp-stack.h
similarity index 100%
rename from src/backend/xml/sixtp-stack.h
rename to libgnucash/backend/xml/sixtp-stack.h
diff --git a/src/backend/xml/sixtp-to-dom-parser.cpp b/libgnucash/backend/xml/sixtp-to-dom-parser.cpp
similarity index 100%
rename from src/backend/xml/sixtp-to-dom-parser.cpp
rename to libgnucash/backend/xml/sixtp-to-dom-parser.cpp
diff --git a/src/backend/xml/sixtp-utils.cpp b/libgnucash/backend/xml/sixtp-utils.cpp
similarity index 100%
rename from src/backend/xml/sixtp-utils.cpp
rename to libgnucash/backend/xml/sixtp-utils.cpp
diff --git a/src/backend/xml/sixtp-utils.h b/libgnucash/backend/xml/sixtp-utils.h
similarity index 100%
rename from src/backend/xml/sixtp-utils.h
rename to libgnucash/backend/xml/sixtp-utils.h
diff --git a/src/backend/xml/sixtp.cpp b/libgnucash/backend/xml/sixtp.cpp
similarity index 100%
rename from src/backend/xml/sixtp.cpp
rename to libgnucash/backend/xml/sixtp.cpp
diff --git a/src/backend/xml/sixtp.h b/libgnucash/backend/xml/sixtp.h
similarity index 100%
rename from src/backend/xml/sixtp.h
rename to libgnucash/backend/xml/sixtp.h
diff --git a/src/backend/xml/test/CMakeLists.txt b/libgnucash/backend/xml/test/CMakeLists.txt
similarity index 67%
rename from src/backend/xml/test/CMakeLists.txt
rename to libgnucash/backend/xml/test/CMakeLists.txt
index 62ccb7153c..fc3d94ac11 100644
--- a/src/backend/xml/test/CMakeLists.txt
+++ b/libgnucash/backend/xml/test/CMakeLists.txt
@@ -2,12 +2,12 @@
 ADD_SUBDIRECTORY(test-files)
 
 SET(XML_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/src/backend/xml
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/test
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/engine/test-core
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src/test-core  # for unittest-support.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/test
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/common/test-core  # for unittest-support.h
   ${GLIB2_INCLUDE_DIRS}
   ${LIBXML2_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}
@@ -25,13 +25,13 @@ ENDFUNCTION()
 ################################
 
 SET(test_backend_xml_base_SOURCES
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-dom-parsers.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-dom-generators.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-utils.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-stack.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-to-dom-parser.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-xml-helper.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-dom-parsers.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-dom-generators.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-utils.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-stack.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-xml-helper.cpp
 )
 
 ## the xml backend is now a GModule - this test does
@@ -40,20 +40,20 @@ SET(test_backend_xml_base_SOURCES
 
 SET(test_backend_xml_module_SOURCES
   ${test_backend_xml_base_SOURCES}
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/io-example-account.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/io-gncxml-gen.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/io-gncxml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/io-utils.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-account-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-budget-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-lot-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-recurrence-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-schedxaction-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-freqspec-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-transaction-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-commodity-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-book-xml-v2.cpp
-  ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-pricedb-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/io-example-account.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/io-gncxml-gen.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/io-gncxml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/io-utils.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-account-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-book-xml-v2.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp
 )
 
 SET_LOCAL_DIST(test_backend_xml_DIST_local CMakeLists.txt grab-types.pl
diff --git a/libgnucash/backend/xml/test/Makefile.am b/libgnucash/backend/xml/test/Makefile.am
new file mode 100644
index 0000000000..fc3fe18c3d
--- /dev/null
+++ b/libgnucash/backend/xml/test/Makefile.am
@@ -0,0 +1,284 @@
+#
+SUBDIRS = test-files
+
+test_date_converting_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-date-converting.cpp
+
+test_dom_converters1_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-dom-converters1.cpp
+
+test_kvp_frames_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-kvp-frames.cpp
+
+test_load_backend_SOURCES = \
+test-load-backend.cpp
+test_load_xml2_SOURCES = \
+test-load-xml2.cpp
+test_save_in_lang_SOURCES = \
+test-save-in-lang.cpp
+
+# the xml backend is now a GModule - this test does
+# not load it as a module and cannot link to it
+# and remain portable.
+
+test_load_example_account_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-example-account.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-load-example-account.cpp
+
+test_string_converters_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-string-converters.cpp
+
+test_xml_account_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-xml-account.cpp
+
+test_xml_commodity_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-xml-commodity.cpp
+
+test_xml_pricedb_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-xml-pricedb.cpp
+
+test_xml_transaction_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-xml-transaction.cpp
+
+test_xml2_is_file_SOURCES = \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \
+  ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \
+  test-xml2-is-file.cpp
+
+TESTS = \
+  test-date-converting \
+  test-dom-converters1 \
+  test-kvp-frames \
+  test-load-example-account \
+  test-load-backend \
+  test-load-xml2 \
+  test-real-data.sh \
+  test-string-converters \
+  test-xml-account \
+  test-xml-commodity \
+  test-xml-pricedb \
+  test-xml-transaction \
+  test-xml2-is-file
+
+GNC_TEST_DEPS = \
+  --gnc-module-dir ${top_builddir}/libgnucash/gnc-module \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql  \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
+  GNC_TEST_FILES=test-files/xml2 \
+  SRCDIR=${srcdir} \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_LTLIBRARIES = libgnc-test-file-stuff.la
+
+libgnc_test_file_stuff_la_SOURCES = test-file-stuff.cpp
+libgnc_test_file_stuff_la_LIBADD = \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la
+
+check_PROGRAMS = \
+  test-date-converting \
+  test-dom-converters1 \
+  test-kvp-frames \
+  test-load-backend \
+  test-load-example-account \
+  test-load-xml2 \
+  test-save-in-lang \
+  test-string-converters \
+  test-xml-account \
+  test-xml-commodity \
+  test-xml-pricedb \
+  test-xml-transaction \
+  test-xml2-is-file
+
+noinst_HEADERS = test-file-stuff.h
+
+LDADD = \
+        ${top_builddir}/common/test-core/libtest-core.la \
+        ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+        ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+        ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \
+        ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+        ./libgnc-test-file-stuff.la \
+        ${LIBXML2_LIBS} \
+        ${ZLIB_LIBS} \
+        ${top_builddir}/lib/libc/libc-missing.la
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/engine/test-core \
+  -I${top_srcdir}/libgnucash/backend/xml \
+  -DU_SHOW_CPLUSPLUS_API=0 \
+  ${LIBXML2_CFLAGS} \
+  ${GLIB_CFLAGS} \
+  ${GUILE_CFLAGS} \
+  ${BOOST_CPPFLAGS}
+
+EXTRA_DIST = \
+  grab-types.pl \
+  test-dom-parser1.cpp \
+  test-real-data.sh \
+  test-xml2-is-file.cpp \
+  CMakeLists.txt
+
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
diff --git a/src/backend/xml/test/README b/libgnucash/backend/xml/test/README
similarity index 100%
rename from src/backend/xml/test/README
rename to libgnucash/backend/xml/test/README
diff --git a/src/backend/xml/test/grab-types.pl b/libgnucash/backend/xml/test/grab-types.pl
similarity index 100%
rename from src/backend/xml/test/grab-types.pl
rename to libgnucash/backend/xml/test/grab-types.pl
diff --git a/src/backend/xml/test/test-date-converting.cpp b/libgnucash/backend/xml/test/test-date-converting.cpp
similarity index 100%
rename from src/backend/xml/test/test-date-converting.cpp
rename to libgnucash/backend/xml/test/test-date-converting.cpp
diff --git a/src/backend/xml/test/test-dom-converters1.cpp b/libgnucash/backend/xml/test/test-dom-converters1.cpp
similarity index 100%
rename from src/backend/xml/test/test-dom-converters1.cpp
rename to libgnucash/backend/xml/test/test-dom-converters1.cpp
diff --git a/src/backend/xml/test/test-dom-parser1-1.xml b/libgnucash/backend/xml/test/test-dom-parser1-1.xml
similarity index 100%
rename from src/backend/xml/test/test-dom-parser1-1.xml
rename to libgnucash/backend/xml/test/test-dom-parser1-1.xml
diff --git a/src/backend/xml/test/test-dom-parser1.cpp b/libgnucash/backend/xml/test/test-dom-parser1.cpp
similarity index 100%
rename from src/backend/xml/test/test-dom-parser1.cpp
rename to libgnucash/backend/xml/test/test-dom-parser1.cpp
diff --git a/src/backend/xml/test/test-file-stuff.cpp b/libgnucash/backend/xml/test/test-file-stuff.cpp
similarity index 100%
rename from src/backend/xml/test/test-file-stuff.cpp
rename to libgnucash/backend/xml/test/test-file-stuff.cpp
diff --git a/src/backend/xml/test/test-file-stuff.h b/libgnucash/backend/xml/test/test-file-stuff.h
similarity index 100%
rename from src/backend/xml/test/test-file-stuff.h
rename to libgnucash/backend/xml/test/test-file-stuff.h
diff --git a/src/backend/xml/test/test-files/CMakeLists.txt b/libgnucash/backend/xml/test/test-files/CMakeLists.txt
similarity index 100%
rename from src/backend/xml/test/test-files/CMakeLists.txt
rename to libgnucash/backend/xml/test/test-files/CMakeLists.txt
diff --git a/src/backend/xml/test/test-files/Makefile.am b/libgnucash/backend/xml/test/test-files/Makefile.am
similarity index 100%
rename from src/backend/xml/test/test-files/Makefile.am
rename to libgnucash/backend/xml/test/test-files/Makefile.am
diff --git a/src/backend/xml/test/test-files/xml1/Money95bank_fr.gml b/libgnucash/backend/xml/test/test-files/xml1/Money95bank_fr.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/Money95bank_fr.gml
rename to libgnucash/backend/xml/test/test-files/xml1/Money95bank_fr.gml
diff --git a/src/backend/xml/test/test-files/xml1/Money95invst.gml b/libgnucash/backend/xml/test/test-files/xml1/Money95invst.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/Money95invst.gml
rename to libgnucash/backend/xml/test/test-files/xml1/Money95invst.gml
diff --git a/src/backend/xml/test/test-files/xml1/Money95mutual.gml b/libgnucash/backend/xml/test/test-files/xml1/Money95mutual.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/Money95mutual.gml
rename to libgnucash/backend/xml/test/test-files/xml1/Money95mutual.gml
diff --git a/src/backend/xml/test/test-files/xml1/Money95stocks.gml b/libgnucash/backend/xml/test/test-files/xml1/Money95stocks.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/Money95stocks.gml
rename to libgnucash/backend/xml/test/test-files/xml1/Money95stocks.gml
diff --git a/src/backend/xml/test/test-files/xml1/abc.gml b/libgnucash/backend/xml/test/test-files/xml1/abc.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/abc.gml
rename to libgnucash/backend/xml/test/test-files/xml1/abc.gml
diff --git a/src/backend/xml/test/test-files/xml1/abcall.gml b/libgnucash/backend/xml/test/test-files/xml1/abcall.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/abcall.gml
rename to libgnucash/backend/xml/test/test-files/xml1/abcall.gml
diff --git a/src/backend/xml/test/test-files/xml1/carols-data-file b/libgnucash/backend/xml/test/test-files/xml1/carols-data-file
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/carols-data-file
rename to libgnucash/backend/xml/test/test-files/xml1/carols-data-file
diff --git a/src/backend/xml/test/test-files/xml1/carols-data-file.gml b/libgnucash/backend/xml/test/test-files/xml1/carols-data-file.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/carols-data-file.gml
rename to libgnucash/backend/xml/test/test-files/xml1/carols-data-file.gml
diff --git a/src/backend/xml/test/test-files/xml1/cbb-export.gml b/libgnucash/backend/xml/test/test-files/xml1/cbb-export.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/cbb-export.gml
rename to libgnucash/backend/xml/test/test-files/xml1/cbb-export.gml
diff --git a/src/backend/xml/test/test-files/xml1/conrads-file b/libgnucash/backend/xml/test/test-files/xml1/conrads-file
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/conrads-file
rename to libgnucash/backend/xml/test/test-files/xml1/conrads-file
diff --git a/src/backend/xml/test/test-files/xml1/conrads-file.gml b/libgnucash/backend/xml/test/test-files/xml1/conrads-file.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/conrads-file.gml
rename to libgnucash/backend/xml/test/test-files/xml1/conrads-file.gml
diff --git a/src/backend/xml/test/test-files/xml1/every.gml b/libgnucash/backend/xml/test/test-files/xml1/every.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/every.gml
rename to libgnucash/backend/xml/test/test-files/xml1/every.gml
diff --git a/src/backend/xml/test/test-files/xml1/ms-money.gml b/libgnucash/backend/xml/test/test-files/xml1/ms-money.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/ms-money.gml
rename to libgnucash/backend/xml/test/test-files/xml1/ms-money.gml
diff --git a/src/backend/xml/test/test-files/xml1/pricedb1.gml b/libgnucash/backend/xml/test/test-files/xml1/pricedb1.gml
similarity index 100%
rename from src/backend/xml/test/test-files/xml1/pricedb1.gml
rename to libgnucash/backend/xml/test/test-files/xml1/pricedb1.gml
diff --git a/src/backend/xml/test/test-files/xml2/.gitignore b/libgnucash/backend/xml/test/test-files/xml2/.gitignore
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/.gitignore
rename to libgnucash/backend/xml/test/test-files/xml2/.gitignore
diff --git a/src/backend/xml/test/test-files/xml2/CMakeLists.txt b/libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/CMakeLists.txt
rename to libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt
diff --git a/src/backend/xml/test/test-files/xml2/Makefile.am b/libgnucash/backend/xml/test/test-files/xml2/Makefile.am
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/Makefile.am
rename to libgnucash/backend/xml/test/test-files/xml2/Makefile.am
diff --git a/src/backend/xml/test/test-files/xml2/Money95bank_fr.gml2 b/libgnucash/backend/xml/test/test-files/xml2/Money95bank_fr.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/Money95bank_fr.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/Money95bank_fr.gml2
diff --git a/src/backend/xml/test/test-files/xml2/Money95invst.gml2 b/libgnucash/backend/xml/test/test-files/xml2/Money95invst.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/Money95invst.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/Money95invst.gml2
diff --git a/src/backend/xml/test/test-files/xml2/Money95mutual.gml2 b/libgnucash/backend/xml/test/test-files/xml2/Money95mutual.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/Money95mutual.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/Money95mutual.gml2
diff --git a/src/backend/xml/test/test-files/xml2/Money95stocks.gml2 b/libgnucash/backend/xml/test/test-files/xml2/Money95stocks.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/Money95stocks.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/Money95stocks.gml2
diff --git a/src/backend/xml/test/test-files/xml2/abc.gml2 b/libgnucash/backend/xml/test/test-files/xml2/abc.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/abc.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/abc.gml2
diff --git a/src/backend/xml/test/test-files/xml2/abcall.gml2 b/libgnucash/backend/xml/test/test-files/xml2/abcall.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/abcall.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/abcall.gml2
diff --git a/src/backend/xml/test/test-files/xml2/carols-data-file.gml2 b/libgnucash/backend/xml/test/test-files/xml2/carols-data-file.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/carols-data-file.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/carols-data-file.gml2
diff --git a/src/backend/xml/test/test-files/xml2/cbb-export.gml2 b/libgnucash/backend/xml/test/test-files/xml2/cbb-export.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/cbb-export.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/cbb-export.gml2
diff --git a/src/backend/xml/test/test-files/xml2/conrads-file.gml2 b/libgnucash/backend/xml/test/test-files/xml2/conrads-file.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/conrads-file.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/conrads-file.gml2
diff --git a/src/backend/xml/test/test-files/xml2/every.gml2 b/libgnucash/backend/xml/test/test-files/xml2/every.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/every.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/every.gml2
diff --git a/src/backend/xml/test/test-files/xml2/goonies-file.gml2 b/libgnucash/backend/xml/test/test-files/xml2/goonies-file.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/goonies-file.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/goonies-file.gml2
diff --git a/src/backend/xml/test/test-files/xml2/hierachical-data-file.gml2 b/libgnucash/backend/xml/test/test-files/xml2/hierachical-data-file.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/hierachical-data-file.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/hierachical-data-file.gml2
diff --git a/src/backend/xml/test/test-files/xml2/ms-money.gml2 b/libgnucash/backend/xml/test/test-files/xml2/ms-money.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/ms-money.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/ms-money.gml2
diff --git a/src/backend/xml/test/test-files/xml2/pricedb1.gml2 b/libgnucash/backend/xml/test/test-files/xml2/pricedb1.gml2
similarity index 100%
rename from src/backend/xml/test/test-files/xml2/pricedb1.gml2
rename to libgnucash/backend/xml/test/test-files/xml2/pricedb1.gml2
diff --git a/src/backend/xml/test/test-kvp-frames.cpp b/libgnucash/backend/xml/test/test-kvp-frames.cpp
similarity index 100%
rename from src/backend/xml/test/test-kvp-frames.cpp
rename to libgnucash/backend/xml/test/test-kvp-frames.cpp
diff --git a/src/backend/xml/test/test-load-backend.cpp b/libgnucash/backend/xml/test/test-load-backend.cpp
similarity index 100%
rename from src/backend/xml/test/test-load-backend.cpp
rename to libgnucash/backend/xml/test/test-load-backend.cpp
diff --git a/src/backend/xml/test/test-load-example-account.cpp b/libgnucash/backend/xml/test/test-load-example-account.cpp
similarity index 100%
rename from src/backend/xml/test/test-load-example-account.cpp
rename to libgnucash/backend/xml/test/test-load-example-account.cpp
diff --git a/src/backend/xml/test/test-load-xml2.cpp b/libgnucash/backend/xml/test/test-load-xml2.cpp
similarity index 100%
rename from src/backend/xml/test/test-load-xml2.cpp
rename to libgnucash/backend/xml/test/test-load-xml2.cpp
diff --git a/src/backend/xml/test/test-real-data.sh.in b/libgnucash/backend/xml/test/test-real-data.sh.in
similarity index 100%
rename from src/backend/xml/test/test-real-data.sh.in
rename to libgnucash/backend/xml/test/test-real-data.sh.in
diff --git a/src/backend/xml/test/test-save-in-lang.cpp b/libgnucash/backend/xml/test/test-save-in-lang.cpp
similarity index 100%
rename from src/backend/xml/test/test-save-in-lang.cpp
rename to libgnucash/backend/xml/test/test-save-in-lang.cpp
diff --git a/src/backend/xml/test/test-string-converters.cpp b/libgnucash/backend/xml/test/test-string-converters.cpp
similarity index 100%
rename from src/backend/xml/test/test-string-converters.cpp
rename to libgnucash/backend/xml/test/test-string-converters.cpp
diff --git a/src/backend/xml/test/test-xml-account.cpp b/libgnucash/backend/xml/test/test-xml-account.cpp
similarity index 100%
rename from src/backend/xml/test/test-xml-account.cpp
rename to libgnucash/backend/xml/test/test-xml-account.cpp
diff --git a/src/backend/xml/test/test-xml-commodity.cpp b/libgnucash/backend/xml/test/test-xml-commodity.cpp
similarity index 100%
rename from src/backend/xml/test/test-xml-commodity.cpp
rename to libgnucash/backend/xml/test/test-xml-commodity.cpp
diff --git a/src/backend/xml/test/test-xml-pricedb.cpp b/libgnucash/backend/xml/test/test-xml-pricedb.cpp
similarity index 100%
rename from src/backend/xml/test/test-xml-pricedb.cpp
rename to libgnucash/backend/xml/test/test-xml-pricedb.cpp
diff --git a/src/backend/xml/test/test-xml-transaction.cpp b/libgnucash/backend/xml/test/test-xml-transaction.cpp
similarity index 100%
rename from src/backend/xml/test/test-xml-transaction.cpp
rename to libgnucash/backend/xml/test/test-xml-transaction.cpp
diff --git a/src/backend/xml/test/test-xml2-is-file.cpp b/libgnucash/backend/xml/test/test-xml2-is-file.cpp
similarity index 100%
rename from src/backend/xml/test/test-xml2-is-file.cpp
rename to libgnucash/backend/xml/test/test-xml2-is-file.cpp
diff --git a/src/backend/xml/xml-helpers.h b/libgnucash/backend/xml/xml-helpers.h
similarity index 100%
rename from src/backend/xml/xml-helpers.h
rename to libgnucash/backend/xml/xml-helpers.h
diff --git a/src/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt
similarity index 96%
rename from src/core-utils/CMakeLists.txt
rename to libgnucash/core-utils/CMakeLists.txt
index eefe503cf3..78474460e8 100644
--- a/src/core-utils/CMakeLists.txt
+++ b/libgnucash/core-utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/core-utils
+# CMakeLists.txt for libgnucash/core-utils
 
 ADD_SUBDIRECTORY(test)
 
@@ -119,7 +119,8 @@ SET(core_utils_noinst_HEADERS
 SET(core_utils_ALL_SOURCES ${core_utils_SOURCES} ${core_utils_noinst_HEADERS})
 SET(core_utils_ALL_LIBRARIES ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GTK_MAC_LDFLAGS})
 SET(core_utils_ALL_INCLUDES
-  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_BINARY_DIR}/common
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${GLIB2_INCLUDE_DIRS}
@@ -185,8 +186,8 @@ SET (core_utils_SCHEME core-utils.scm)
 
 SET(GUILE_OUTPUT_DIR   gnucash)
 SET(GUILE_MODULES      "")
-SET(GUILE_LOAD_DIRS    src/core-utils)
-SET(GUILE_LIBRARY_DIRS src/core-utils)
+SET(GUILE_LOAD_DIRS    libgnucash/core-utils)
+SET(GUILE_LIBRARY_DIRS libgnucash/core-utils)
 SET(GUILE_DEPENDS      gnc-core-utils)
 
 GNC_ADD_SCHEME_TARGETS(scm-core-utils
diff --git a/src/core-utils/Makefile.am b/libgnucash/core-utils/Makefile.am
similarity index 90%
rename from src/core-utils/Makefile.am
rename to libgnucash/core-utils/Makefile.am
index c827c4abcc..9733c60e7a 100644
--- a/src/core-utils/Makefile.am
+++ b/libgnucash/core-utils/Makefile.am
@@ -38,27 +38,27 @@ noinst_HEADERS = \
   gnc-path.h
 
 if BUILDING_FROM_VCS
-swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
+swig-core-utils-guile.c: core-utils.i ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
-swig-core-utils-python.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
+swig-core-utils-python.c: core-utils.i ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 endif
 
 AM_CPPFLAGS = \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_MAC_CFLAGS} \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src
+  -I${top_builddir}/common \
+  -I${top_srcdir}/common
 
 gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
 gncscmmod_DATA = core-utils.scm
@@ -84,8 +84,8 @@ libgnc_core_utils_python_la_CPPFLAGS = \
   ${GLIB_CFLAGS} \
   ${GTK_MAC_CFLAGS} \
   ${PYTHON_CPPFLAGS} \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src
+  -I${top_builddir}/common \
+  -I${top_srcdir}/common
 
 endif
 
@@ -105,12 +105,12 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --library-dir    ${top_builddir}/src/core-utils
+  --library-dir    ${top_builddir}/libgnucash/core-utils
 
 %.go : %.scm .scm-links $(lib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV})  \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV})  \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
diff --git a/src/core-utils/binreloc.c b/libgnucash/core-utils/binreloc.c
similarity index 100%
rename from src/core-utils/binreloc.c
rename to libgnucash/core-utils/binreloc.c
diff --git a/src/core-utils/binreloc.h b/libgnucash/core-utils/binreloc.h
similarity index 100%
rename from src/core-utils/binreloc.h
rename to libgnucash/core-utils/binreloc.h
diff --git a/src/core-utils/core-utils.i b/libgnucash/core-utils/core-utils.i
similarity index 100%
rename from src/core-utils/core-utils.i
rename to libgnucash/core-utils/core-utils.i
diff --git a/src/core-utils/core-utils.scm b/libgnucash/core-utils/core-utils.scm
similarity index 100%
rename from src/core-utils/core-utils.scm
rename to libgnucash/core-utils/core-utils.scm
diff --git a/src/core-utils/gnc-environment.c b/libgnucash/core-utils/gnc-environment.c
similarity index 100%
rename from src/core-utils/gnc-environment.c
rename to libgnucash/core-utils/gnc-environment.c
diff --git a/src/core-utils/gnc-environment.h b/libgnucash/core-utils/gnc-environment.h
similarity index 100%
rename from src/core-utils/gnc-environment.h
rename to libgnucash/core-utils/gnc-environment.h
diff --git a/src/core-utils/gnc-filepath-utils.c b/libgnucash/core-utils/gnc-filepath-utils.c
similarity index 100%
rename from src/core-utils/gnc-filepath-utils.c
rename to libgnucash/core-utils/gnc-filepath-utils.c
diff --git a/src/core-utils/gnc-filepath-utils.h b/libgnucash/core-utils/gnc-filepath-utils.h
similarity index 100%
rename from src/core-utils/gnc-filepath-utils.h
rename to libgnucash/core-utils/gnc-filepath-utils.h
diff --git a/src/core-utils/gnc-gkeyfile-utils.c b/libgnucash/core-utils/gnc-gkeyfile-utils.c
similarity index 100%
rename from src/core-utils/gnc-gkeyfile-utils.c
rename to libgnucash/core-utils/gnc-gkeyfile-utils.c
diff --git a/src/core-utils/gnc-gkeyfile-utils.h b/libgnucash/core-utils/gnc-gkeyfile-utils.h
similarity index 100%
rename from src/core-utils/gnc-gkeyfile-utils.h
rename to libgnucash/core-utils/gnc-gkeyfile-utils.h
diff --git a/src/core-utils/gnc-glib-utils.c b/libgnucash/core-utils/gnc-glib-utils.c
similarity index 100%
rename from src/core-utils/gnc-glib-utils.c
rename to libgnucash/core-utils/gnc-glib-utils.c
diff --git a/src/core-utils/gnc-glib-utils.h b/libgnucash/core-utils/gnc-glib-utils.h
similarity index 100%
rename from src/core-utils/gnc-glib-utils.h
rename to libgnucash/core-utils/gnc-glib-utils.h
diff --git a/src/core-utils/gnc-guile-utils.c b/libgnucash/core-utils/gnc-guile-utils.c
similarity index 100%
rename from src/core-utils/gnc-guile-utils.c
rename to libgnucash/core-utils/gnc-guile-utils.c
diff --git a/src/core-utils/gnc-guile-utils.h b/libgnucash/core-utils/gnc-guile-utils.h
similarity index 100%
rename from src/core-utils/gnc-guile-utils.h
rename to libgnucash/core-utils/gnc-guile-utils.h
diff --git a/src/core-utils/gnc-jalali.c b/libgnucash/core-utils/gnc-jalali.c
similarity index 100%
rename from src/core-utils/gnc-jalali.c
rename to libgnucash/core-utils/gnc-jalali.c
diff --git a/src/core-utils/gnc-jalali.h b/libgnucash/core-utils/gnc-jalali.h
similarity index 100%
rename from src/core-utils/gnc-jalali.h
rename to libgnucash/core-utils/gnc-jalali.h
diff --git a/src/core-utils/gnc-locale-utils.c b/libgnucash/core-utils/gnc-locale-utils.c
similarity index 100%
rename from src/core-utils/gnc-locale-utils.c
rename to libgnucash/core-utils/gnc-locale-utils.c
diff --git a/src/core-utils/gnc-locale-utils.h b/libgnucash/core-utils/gnc-locale-utils.h
similarity index 100%
rename from src/core-utils/gnc-locale-utils.h
rename to libgnucash/core-utils/gnc-locale-utils.h
diff --git a/src/core-utils/gnc-path.c b/libgnucash/core-utils/gnc-path.c
similarity index 100%
rename from src/core-utils/gnc-path.c
rename to libgnucash/core-utils/gnc-path.c
diff --git a/src/core-utils/gnc-path.h b/libgnucash/core-utils/gnc-path.h
similarity index 100%
rename from src/core-utils/gnc-path.h
rename to libgnucash/core-utils/gnc-path.h
diff --git a/src/core-utils/gnc-prefs-p.h b/libgnucash/core-utils/gnc-prefs-p.h
similarity index 100%
rename from src/core-utils/gnc-prefs-p.h
rename to libgnucash/core-utils/gnc-prefs-p.h
diff --git a/src/core-utils/gnc-prefs.c b/libgnucash/core-utils/gnc-prefs.c
similarity index 100%
rename from src/core-utils/gnc-prefs.c
rename to libgnucash/core-utils/gnc-prefs.c
diff --git a/src/core-utils/gnc-prefs.h b/libgnucash/core-utils/gnc-prefs.h
similarity index 100%
rename from src/core-utils/gnc-prefs.h
rename to libgnucash/core-utils/gnc-prefs.h
diff --git a/src/core-utils/gncla-dir.h.in b/libgnucash/core-utils/gncla-dir.h.in
similarity index 100%
rename from src/core-utils/gncla-dir.h.in
rename to libgnucash/core-utils/gncla-dir.h.in
diff --git a/src/core-utils/test/CMakeLists.txt b/libgnucash/core-utils/test/CMakeLists.txt
similarity index 80%
rename from src/core-utils/test/CMakeLists.txt
rename to libgnucash/core-utils/test/CMakeLists.txt
index ed51fbe30c..15bf1a4ffa 100644
--- a/src/core-utils/test/CMakeLists.txt
+++ b/libgnucash/core-utils/test/CMakeLists.txt
@@ -1,9 +1,9 @@
 
 
 SET(CORE_UTILS_TEST_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src/core-utils
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
+  ${CMAKE_SOURCE_DIR}/common/test-core
   ${GLIB2_INCLUDE_DIRS}
 )
 SET(CORE_UTILS_TEST_LIBS gnc-core-utils test-core)
diff --git a/src/core-utils/test/Makefile.am b/libgnucash/core-utils/test/Makefile.am
similarity index 68%
rename from src/core-utils/test/Makefile.am
rename to libgnucash/core-utils/test/Makefile.am
index a097569391..c88ace0bc5 100644
--- a/src/core-utils/test/Makefile.am
+++ b/libgnucash/core-utils/test/Makefile.am
@@ -1,20 +1,20 @@
 include $(top_srcdir)/test-templates/Makefile.decl
-MODULEPATH = src/core-utils
+MODULEPATH = libgnucash/core-utils
 
 # We add src/engine here, just to load qof.h, which
 # is pulled in via test-core
 AM_CPPFLAGS = \
   -I${top_srcdir} \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/engine \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 LDADD = \
   ../libgnc-core-utils.la \
-  ${top_builddir}/src/test-core/libtest-core.la \
+  ${top_builddir}/common/test-core/libtest-core.la \
   ${GLIB_LIBS}
 
 # these tests are ordered kind more or less in the order
@@ -26,11 +26,11 @@ TESTS = \
   test-gnc-glib-utils
 
 GNC_TEST_DEPS = \
-  --library-dir    ${top_builddir}/src/core-utils
+  --library-dir    ${top_builddir}/libgnucash/core-utils
 
 TESTS_ENVIRONMENT = \
   SRCDIR=${srcdir} \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
 
 check_PROGRAMS = ${TESTS}
 
@@ -39,7 +39,7 @@ test_gnc_glib_utils_SOURCES = \
   test-gnc-glib-utils.c
 
 test_gnc_glib_utils_LDADD = \
-        ${top_builddir}/src/test-core/libtest-core.la \
+        ${top_builddir}/common/test-core/libtest-core.la \
         $(GLIB_LIBS)
 
 test_gnc_glib_utils_CFLAGS = \
diff --git a/src/core-utils/test/test-gnc-glib-utils.c b/libgnucash/core-utils/test/test-gnc-glib-utils.c
similarity index 100%
rename from src/core-utils/test/test-gnc-glib-utils.c
rename to libgnucash/core-utils/test/test-gnc-glib-utils.c
diff --git a/src/core-utils/test/test-resolve-file-path.c b/libgnucash/core-utils/test/test-resolve-file-path.c
similarity index 100%
rename from src/core-utils/test/test-resolve-file-path.c
rename to libgnucash/core-utils/test/test-resolve-file-path.c
diff --git a/src/doc/CMakeLists.txt b/libgnucash/doc/CMakeLists.txt
similarity index 100%
rename from src/doc/CMakeLists.txt
rename to libgnucash/doc/CMakeLists.txt
diff --git a/src/doc/Makefile.am b/libgnucash/doc/Makefile.am
similarity index 100%
rename from src/doc/Makefile.am
rename to libgnucash/doc/Makefile.am
diff --git a/src/doc/README b/libgnucash/doc/README
similarity index 100%
rename from src/doc/README
rename to libgnucash/doc/README
diff --git a/src/doc/TODO-schedxactions b/libgnucash/doc/TODO-schedxactions
similarity index 100%
rename from src/doc/TODO-schedxactions
rename to libgnucash/doc/TODO-schedxactions
diff --git a/src/doc/TODO-sixtp b/libgnucash/doc/TODO-sixtp
similarity index 100%
rename from src/doc/TODO-sixtp
rename to libgnucash/doc/TODO-sixtp
diff --git a/src/doc/backup.txt b/libgnucash/doc/backup.txt
similarity index 100%
rename from src/doc/backup.txt
rename to libgnucash/doc/backup.txt
diff --git a/src/doc/books.txt b/libgnucash/doc/books.txt
similarity index 100%
rename from src/doc/books.txt
rename to libgnucash/doc/books.txt
diff --git a/src/doc/budget.txt b/libgnucash/doc/budget.txt
similarity index 100%
rename from src/doc/budget.txt
rename to libgnucash/doc/budget.txt
diff --git a/src/doc/business.txt b/libgnucash/doc/business.txt
similarity index 100%
rename from src/doc/business.txt
rename to libgnucash/doc/business.txt
diff --git a/src/doc/callgrind.txt b/libgnucash/doc/callgrind.txt
similarity index 100%
rename from src/doc/callgrind.txt
rename to libgnucash/doc/callgrind.txt
diff --git a/src/doc/constderv.html b/libgnucash/doc/constderv.html
similarity index 100%
rename from src/doc/constderv.html
rename to libgnucash/doc/constderv.html
diff --git a/src/doc/constraints.txt b/libgnucash/doc/constraints.txt
similarity index 100%
rename from src/doc/constraints.txt
rename to libgnucash/doc/constraints.txt
diff --git a/src/doc/currencies.txt b/libgnucash/doc/currencies.txt
similarity index 100%
rename from src/doc/currencies.txt
rename to libgnucash/doc/currencies.txt
diff --git a/src/doc/design/CMakeLists.txt b/libgnucash/doc/design/CMakeLists.txt
similarity index 100%
rename from src/doc/design/CMakeLists.txt
rename to libgnucash/doc/design/CMakeLists.txt
diff --git a/src/doc/design/Makefile.am b/libgnucash/doc/design/Makefile.am
similarity index 100%
rename from src/doc/design/Makefile.am
rename to libgnucash/doc/design/Makefile.am
diff --git a/src/doc/design/component-manager.texi b/libgnucash/doc/design/component-manager.texi
similarity index 100%
rename from src/doc/design/component-manager.texi
rename to libgnucash/doc/design/component-manager.texi
diff --git a/src/doc/design/concept-index.texi b/libgnucash/doc/design/concept-index.texi
similarity index 100%
rename from src/doc/design/concept-index.texi
rename to libgnucash/doc/design/concept-index.texi
diff --git a/src/doc/design/engine.texi b/libgnucash/doc/design/engine.texi
similarity index 100%
rename from src/doc/design/engine.texi
rename to libgnucash/doc/design/engine.texi
diff --git a/src/doc/design/fdl.texi b/libgnucash/doc/design/fdl.texi
similarity index 100%
rename from src/doc/design/fdl.texi
rename to libgnucash/doc/design/fdl.texi
diff --git a/src/doc/design/function-index.texi b/libgnucash/doc/design/function-index.texi
similarity index 100%
rename from src/doc/design/function-index.texi
rename to libgnucash/doc/design/function-index.texi
diff --git a/src/doc/design/gnucash-design.texi b/libgnucash/doc/design/gnucash-design.texi
similarity index 100%
rename from src/doc/design/gnucash-design.texi
rename to libgnucash/doc/design/gnucash-design.texi
diff --git a/src/doc/design/intro.texi b/libgnucash/doc/design/intro.texi
similarity index 100%
rename from src/doc/design/intro.texi
rename to libgnucash/doc/design/intro.texi
diff --git a/src/doc/design/register.texi b/libgnucash/doc/design/register.texi
similarity index 100%
rename from src/doc/design/register.texi
rename to libgnucash/doc/design/register.texi
diff --git a/src/doc/design/reports.texi b/libgnucash/doc/design/reports.texi
similarity index 100%
rename from src/doc/design/reports.texi
rename to libgnucash/doc/design/reports.texi
diff --git a/src/doc/design/top-level.texi b/libgnucash/doc/design/top-level.texi
similarity index 100%
rename from src/doc/design/top-level.texi
rename to libgnucash/doc/design/top-level.texi
diff --git a/src/doc/design/type-index.texi b/libgnucash/doc/design/type-index.texi
similarity index 100%
rename from src/doc/design/type-index.texi
rename to libgnucash/doc/design/type-index.texi
diff --git a/src/doc/design/user-preferences.texi b/libgnucash/doc/design/user-preferences.texi
similarity index 100%
rename from src/doc/design/user-preferences.texi
rename to libgnucash/doc/design/user-preferences.texi
diff --git a/src/doc/dia/components.dia b/libgnucash/doc/dia/components.dia
similarity index 100%
rename from src/doc/dia/components.dia
rename to libgnucash/doc/dia/components.dia
diff --git a/src/doc/dia/structures-alt.dia b/libgnucash/doc/dia/structures-alt.dia
similarity index 100%
rename from src/doc/dia/structures-alt.dia
rename to libgnucash/doc/dia/structures-alt.dia
diff --git a/src/doc/dia/structures.dia b/libgnucash/doc/dia/structures.dia
similarity index 100%
rename from src/doc/dia/structures.dia
rename to libgnucash/doc/dia/structures.dia
diff --git a/src/doc/doxygen.cfg.in b/libgnucash/doc/doxygen.cfg.in
similarity index 100%
rename from src/doc/doxygen.cfg.in
rename to libgnucash/doc/doxygen.cfg.in
diff --git a/src/doc/doxygen_main_page.c b/libgnucash/doc/doxygen_main_page.c
similarity index 100%
rename from src/doc/doxygen_main_page.c
rename to libgnucash/doc/doxygen_main_page.c
diff --git a/src/doc/engine.txt b/libgnucash/doc/engine.txt
similarity index 100%
rename from src/doc/engine.txt
rename to libgnucash/doc/engine.txt
diff --git a/src/doc/finderv.html b/libgnucash/doc/finderv.html
similarity index 100%
rename from src/doc/finderv.html
rename to libgnucash/doc/finderv.html
diff --git a/src/doc/finutil.html b/libgnucash/doc/finutil.html
similarity index 100%
rename from src/doc/finutil.html
rename to libgnucash/doc/finutil.html
diff --git a/src/doc/g2-architecture.txt b/libgnucash/doc/g2-architecture.txt
similarity index 100%
rename from src/doc/g2-architecture.txt
rename to libgnucash/doc/g2-architecture.txt
diff --git a/src/doc/generic-druid-framework.txt b/libgnucash/doc/generic-druid-framework.txt
similarity index 100%
rename from src/doc/generic-druid-framework.txt
rename to libgnucash/doc/generic-druid-framework.txt
diff --git a/src/doc/gnc-numeric-example.txt b/libgnucash/doc/gnc-numeric-example.txt
similarity index 100%
rename from src/doc/gnc-numeric-example.txt
rename to libgnucash/doc/gnc-numeric-example.txt
diff --git a/src/doc/guid.txt b/libgnucash/doc/guid.txt
similarity index 100%
rename from src/doc/guid.txt
rename to libgnucash/doc/guid.txt
diff --git a/src/doc/loans.txt b/libgnucash/doc/loans.txt
similarity index 100%
rename from src/doc/loans.txt
rename to libgnucash/doc/loans.txt
diff --git a/src/doc/lots.txt b/libgnucash/doc/lots.txt
similarity index 100%
rename from src/doc/lots.txt
rename to libgnucash/doc/lots.txt
diff --git a/src/doc/multicurrency-discussion.txt b/libgnucash/doc/multicurrency-discussion.txt
similarity index 100%
rename from src/doc/multicurrency-discussion.txt
rename to libgnucash/doc/multicurrency-discussion.txt
diff --git a/src/doc/prices.txt b/libgnucash/doc/prices.txt
similarity index 100%
rename from src/doc/prices.txt
rename to libgnucash/doc/prices.txt
diff --git a/src/doc/python-bindings-doxygen.py b/libgnucash/doc/python-bindings-doxygen.py
similarity index 100%
rename from src/doc/python-bindings-doxygen.py
rename to libgnucash/doc/python-bindings-doxygen.py
diff --git a/src/doc/qif.txt b/libgnucash/doc/qif.txt
similarity index 100%
rename from src/doc/qif.txt
rename to libgnucash/doc/qif.txt
diff --git a/src/doc/sx.rst b/libgnucash/doc/sx.rst
similarity index 100%
rename from src/doc/sx.rst
rename to libgnucash/doc/sx.rst
diff --git a/src/doc/tax.txt b/libgnucash/doc/tax.txt
similarity index 100%
rename from src/doc/tax.txt
rename to libgnucash/doc/tax.txt
diff --git a/src/doc/user-prefs-howto.txt b/libgnucash/doc/user-prefs-howto.txt
similarity index 100%
rename from src/doc/user-prefs-howto.txt
rename to libgnucash/doc/user-prefs-howto.txt
diff --git a/src/doc/xml/CMakeLists.txt b/libgnucash/doc/xml/CMakeLists.txt
similarity index 100%
rename from src/doc/xml/CMakeLists.txt
rename to libgnucash/doc/xml/CMakeLists.txt
diff --git a/src/doc/xml/Makefile.am b/libgnucash/doc/xml/Makefile.am
similarity index 100%
rename from src/doc/xml/Makefile.am
rename to libgnucash/doc/xml/Makefile.am
diff --git a/src/doc/xml/README b/libgnucash/doc/xml/README
similarity index 100%
rename from src/doc/xml/README
rename to libgnucash/doc/xml/README
diff --git a/src/doc/xml/account-v2.dtd b/libgnucash/doc/xml/account-v2.dtd
similarity index 100%
rename from src/doc/xml/account-v2.dtd
rename to libgnucash/doc/xml/account-v2.dtd
diff --git a/src/doc/xml/commodity-v2.dtd b/libgnucash/doc/xml/commodity-v2.dtd
similarity index 100%
rename from src/doc/xml/commodity-v2.dtd
rename to libgnucash/doc/xml/commodity-v2.dtd
diff --git a/src/doc/xml/defaults-v1.dtd b/libgnucash/doc/xml/defaults-v1.dtd
similarity index 100%
rename from src/doc/xml/defaults-v1.dtd
rename to libgnucash/doc/xml/defaults-v1.dtd
diff --git a/src/doc/xml/gnucash-v2.rnc b/libgnucash/doc/xml/gnucash-v2.rnc
similarity index 100%
rename from src/doc/xml/gnucash-v2.rnc
rename to libgnucash/doc/xml/gnucash-v2.rnc
diff --git a/src/doc/xml/io-gncxml-version1.dtd b/libgnucash/doc/xml/io-gncxml-version1.dtd
similarity index 100%
rename from src/doc/xml/io-gncxml-version1.dtd
rename to libgnucash/doc/xml/io-gncxml-version1.dtd
diff --git a/src/doc/xml/io-gncxml-version2.dtd b/libgnucash/doc/xml/io-gncxml-version2.dtd
similarity index 100%
rename from src/doc/xml/io-gncxml-version2.dtd
rename to libgnucash/doc/xml/io-gncxml-version2.dtd
diff --git a/src/doc/xml/preferences-v1.dtd b/libgnucash/doc/xml/preferences-v1.dtd
similarity index 100%
rename from src/doc/xml/preferences-v1.dtd
rename to libgnucash/doc/xml/preferences-v1.dtd
diff --git a/src/doc/xml/prices-v1.dtd b/libgnucash/doc/xml/prices-v1.dtd
similarity index 100%
rename from src/doc/xml/prices-v1.dtd
rename to libgnucash/doc/xml/prices-v1.dtd
diff --git a/src/doc/xml/transactions-v2.dtd b/libgnucash/doc/xml/transactions-v2.dtd
similarity index 100%
rename from src/doc/xml/transactions-v2.dtd
rename to libgnucash/doc/xml/transactions-v2.dtd
diff --git a/src/doc/xml/types.dtd b/libgnucash/doc/xml/types.dtd
similarity index 100%
rename from src/doc/xml/types.dtd
rename to libgnucash/doc/xml/types.dtd
diff --git a/src/engine/Account.c b/libgnucash/engine/Account.c
similarity index 100%
rename from src/engine/Account.c
rename to libgnucash/engine/Account.c
diff --git a/src/engine/Account.h b/libgnucash/engine/Account.h
similarity index 100%
rename from src/engine/Account.h
rename to libgnucash/engine/Account.h
diff --git a/src/engine/AccountP.h b/libgnucash/engine/AccountP.h
similarity index 100%
rename from src/engine/AccountP.h
rename to libgnucash/engine/AccountP.h
diff --git a/src/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
similarity index 95%
rename from src/engine/CMakeLists.txt
rename to libgnucash/engine/CMakeLists.txt
index c47c102a1f..4f25a1e6e4 100644
--- a/src/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/engine
+# CMakeLists.txt for libgnucash/engine
 
 ADD_SUBDIRECTORY(test-core)
 ADD_SUBDIRECTORY(test)
@@ -24,7 +24,6 @@ SET(engine_noinst_HEADERS
   qofobject-p.h
   qofquery-p.h
   qofquerycore-p.h
-  qofsession.hpp
 )
 
 SET (engine_HEADERS
@@ -64,31 +63,6 @@ SET (engine_HEADERS
   gnc-session.h
   gnc-timezone.hpp
   gnc-uri-utils.h
-  guid.h
-  kvp-frame.hpp
-  kvp-scm.h
-  kvp-value.hpp
-  policy.h
-  qof.h
-  qof-backend.hpp
-  qofbackend.h
-  qofbook.h
-  qofbookslots.h
-  qofchoice.h
-  qofclass.h
-  qofevent.h
-  qofid-p.h
-  qofid.h
-  qofinstance-p.h
-  qofinstance.h
-  qoflog.h
-  qofobject.h
-  qofquery.h
-  qofquerycore.h
-  qofsession.h
-  qofutil.h
-  qof-gobject.h
-  qof-string-cache.h
   gncAddress.h
   gncAddressP.h
   gncBillTerm.h
@@ -114,6 +88,33 @@ SET (engine_HEADERS
   gncTaxTableP.h
   gncVendor.h
   gncVendorP.h
+  guid.h
+  guid.hpp
+  kvp-frame.hpp
+  kvp-scm.h
+  kvp-value.hpp
+  policy.h
+  qof.h
+  qof-backend.hpp
+  qofbackend.h
+  qofbook.h
+  qofbookslots.h
+  qofchoice.h
+  qofclass.h
+  qofevent.h
+  qofid-p.h
+  qofid.h
+  qofinstance-p.h
+  qofinstance.h
+  qoflog.h
+  qofobject.h
+  qofquery.h
+  qofquerycore.h
+  qofsession.h
+  qofsession.hpp
+  qofutil.h
+  qof-gobject.h
+  qof-string-cache.h
 )
 
 IF (BUILDING_FROM_VCS)
@@ -231,8 +232,8 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-engine
     PRIVATE ${CMAKE_CURRENT_BINARY_DIR} # for iso-4217-currencies.c
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_BINARY_DIR}/src # for config.h
-        ${CMAKE_SOURCE_DIR}/src # for platform.h
+        ${CMAKE_BINARY_DIR}/common # for config.h
+        ${CMAKE_SOURCE_DIR}/common # for platform.h
         ${GLIB2_INCLUDE_DIRS}
         ${LIBINTL_INCLUDE_PATH}
         ${REGEX_INCLUDE_PATH}
@@ -254,7 +255,7 @@ qofobject.h
 qofsession.h
 )
 
-INSTALL(FILES ${qof_test_HEADERS} DESTINATION libexec/gnucash/src/engine/test)
+INSTALL(FILES ${qof_test_HEADERS} DESTINATION libexec/gnucash/libgnucash/engine/test)
 
 # Scheme
 
@@ -283,8 +284,8 @@ IF (WITH_SQL)
 ENDIF(WITH_SQL)
 
 SET(GUILE_MODULES      "")
-SET(GUILE_LOAD_DIRS    src/gnc-module)
-SET(GUILE_LIBRARY_DIRS src/gnc-module)
+SET(GUILE_LOAD_DIRS    libgnucash/gnc-module)
+SET(GUILE_LIBRARY_DIRS libgnucash/gnc-module)
 SET(GUILE_DEPENDS      ${BACKEND_DEPENDS} gnc-module gncmod-engine scm-gnc-module)
 
 
diff --git a/src/engine/FreqSpec.h b/libgnucash/engine/FreqSpec.h
similarity index 100%
rename from src/engine/FreqSpec.h
rename to libgnucash/engine/FreqSpec.h
diff --git a/src/engine/Makefile.am b/libgnucash/engine/Makefile.am
similarity index 90%
rename from src/engine/Makefile.am
rename to libgnucash/engine/Makefile.am
index c0ba0b59b0..b05e021890 100644
--- a/src/engine/Makefile.am
+++ b/libgnucash/engine/Makefile.am
@@ -7,10 +7,10 @@ pkglib_LTLIBRARIES = libgncmod-engine.la
 
 AM_CPPFLAGS = \
 	-I${top_srcdir}/lib/libc \
-	-I${top_srcdir}/src/core-utils \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src \
-	-I${top_srcdir}/src/gnc-module \
+	-I${top_srcdir}/libgnucash/core-utils \
+	-I${top_srcdir}/common \
+	-I${top_builddir}/common \
+	-I${top_srcdir}/libgnucash/gnc-module \
 	${GLIB_CFLAGS} \
 	${GUILE_CFLAGS} \
 	$(BOOST_CPPFLAGS)
@@ -119,7 +119,6 @@ gncinclude_HEADERS = \
   gnc-aqbanking-templates.h \
   gnc-budget.h \
   gnc-commodity.h \
-  gnc-date-p.h \
   gnc-date.h \
   gnc-datetime.hpp \
   gnc-engine.h \
@@ -134,11 +133,6 @@ gncinclude_HEADERS = \
   gnc-session.h \
   gnc-timezone.hpp \
   gnc-uri-utils.h \
-  guid.h \
-  kvp-frame.hpp \
-  kvp-scm.h \
-  kvp-value.hpp \
-  policy.h \
   gncAddress.h \
   gncAddressP.h \
   gncBillTerm.h \
@@ -164,6 +158,12 @@ gncinclude_HEADERS = \
   gncIDSearch.h \
   gncVendor.h \
   gncVendorP.h \
+  guid.h \
+  guid.hpp \
+  kvp-frame.hpp \
+  kvp-scm.h \
+  kvp-value.hpp \
+  policy.h \
   qof.h \
   qof-backend.hpp \
   qofbackend.h \
@@ -182,9 +182,9 @@ gncinclude_HEADERS = \
   qofquerycore.h \
   qofsession.h \
   qofsession.hpp \
-  qof-string-cache.h \
   qofutil.h \
-  qof-gobject.h
+  qof-gobject.h \
+  qof-string-cache.h
 
 noinst_HEADERS = \
   AccountP.h \
@@ -194,14 +194,16 @@ noinst_HEADERS = \
   SX-ttinfo.h \
   TransactionP.h \
   gnc-backend-prov.hpp \
+  gnc-date-p.h \
   gnc-hooks-scm.h \
+  gnc-int128.hpp \
   gnc-lot.h \
   gnc-lot-p.h \
   gnc-pricedb-p.h \
   policy-p.h  \
+  qofbook-p.h \
   qofclass-p.h \
   qofevent-p.h \
-  gnc-int128.hpp \
   qofobject-p.h \
   qofquery-p.h \
   qofquerycore-p.h
@@ -274,15 +276,15 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/core-utils
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/core-utils
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
@@ -296,14 +298,14 @@ noinst_DATA = .scm-links
 
 if BUILDING_FROM_VCS
 
-swig-engine.c: engine.i $(top_srcdir)/src/base-typemaps.i \
+swig-engine.c: engine.i $(top_srcdir)/common/base-typemaps.i \
                $(gncinclude_HEADERS) $(noinst_HEADERS)
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
diff --git a/src/engine/Query.c b/libgnucash/engine/Query.c
similarity index 100%
rename from src/engine/Query.c
rename to libgnucash/engine/Query.c
diff --git a/src/engine/Query.h b/libgnucash/engine/Query.h
similarity index 100%
rename from src/engine/Query.h
rename to libgnucash/engine/Query.h
diff --git a/src/engine/README b/libgnucash/engine/README
similarity index 100%
rename from src/engine/README
rename to libgnucash/engine/README
diff --git a/src/engine/README.query-api b/libgnucash/engine/README.query-api
similarity index 100%
rename from src/engine/README.query-api
rename to libgnucash/engine/README.query-api
diff --git a/src/engine/Recurrence.c b/libgnucash/engine/Recurrence.c
similarity index 100%
rename from src/engine/Recurrence.c
rename to libgnucash/engine/Recurrence.c
diff --git a/src/engine/Recurrence.h b/libgnucash/engine/Recurrence.h
similarity index 100%
rename from src/engine/Recurrence.h
rename to libgnucash/engine/Recurrence.h
diff --git a/src/engine/SX-book-p.h b/libgnucash/engine/SX-book-p.h
similarity index 100%
rename from src/engine/SX-book-p.h
rename to libgnucash/engine/SX-book-p.h
diff --git a/src/engine/SX-book.c b/libgnucash/engine/SX-book.c
similarity index 100%
rename from src/engine/SX-book.c
rename to libgnucash/engine/SX-book.c
diff --git a/src/engine/SX-book.h b/libgnucash/engine/SX-book.h
similarity index 100%
rename from src/engine/SX-book.h
rename to libgnucash/engine/SX-book.h
diff --git a/src/engine/SX-ttinfo.c b/libgnucash/engine/SX-ttinfo.c
similarity index 100%
rename from src/engine/SX-ttinfo.c
rename to libgnucash/engine/SX-ttinfo.c
diff --git a/src/engine/SX-ttinfo.h b/libgnucash/engine/SX-ttinfo.h
similarity index 100%
rename from src/engine/SX-ttinfo.h
rename to libgnucash/engine/SX-ttinfo.h
diff --git a/src/engine/SchedXaction.c b/libgnucash/engine/SchedXaction.c
similarity index 100%
rename from src/engine/SchedXaction.c
rename to libgnucash/engine/SchedXaction.c
diff --git a/src/engine/SchedXaction.h b/libgnucash/engine/SchedXaction.h
similarity index 100%
rename from src/engine/SchedXaction.h
rename to libgnucash/engine/SchedXaction.h
diff --git a/src/engine/Scrub.c b/libgnucash/engine/Scrub.c
similarity index 100%
rename from src/engine/Scrub.c
rename to libgnucash/engine/Scrub.c
diff --git a/src/engine/Scrub.h b/libgnucash/engine/Scrub.h
similarity index 100%
rename from src/engine/Scrub.h
rename to libgnucash/engine/Scrub.h
diff --git a/src/engine/Scrub2.c b/libgnucash/engine/Scrub2.c
similarity index 100%
rename from src/engine/Scrub2.c
rename to libgnucash/engine/Scrub2.c
diff --git a/src/engine/Scrub2.h b/libgnucash/engine/Scrub2.h
similarity index 100%
rename from src/engine/Scrub2.h
rename to libgnucash/engine/Scrub2.h
diff --git a/src/engine/Scrub3.c b/libgnucash/engine/Scrub3.c
similarity index 100%
rename from src/engine/Scrub3.c
rename to libgnucash/engine/Scrub3.c
diff --git a/src/engine/Scrub3.h b/libgnucash/engine/Scrub3.h
similarity index 100%
rename from src/engine/Scrub3.h
rename to libgnucash/engine/Scrub3.h
diff --git a/src/engine/ScrubBusiness.c b/libgnucash/engine/ScrubBusiness.c
similarity index 100%
rename from src/engine/ScrubBusiness.c
rename to libgnucash/engine/ScrubBusiness.c
diff --git a/src/engine/ScrubBusiness.h b/libgnucash/engine/ScrubBusiness.h
similarity index 100%
rename from src/engine/ScrubBusiness.h
rename to libgnucash/engine/ScrubBusiness.h
diff --git a/src/engine/ScrubP.h b/libgnucash/engine/ScrubP.h
similarity index 100%
rename from src/engine/ScrubP.h
rename to libgnucash/engine/ScrubP.h
diff --git a/src/engine/Split.c b/libgnucash/engine/Split.c
similarity index 100%
rename from src/engine/Split.c
rename to libgnucash/engine/Split.c
diff --git a/src/engine/Split.h b/libgnucash/engine/Split.h
similarity index 100%
rename from src/engine/Split.h
rename to libgnucash/engine/Split.h
diff --git a/src/engine/SplitP.h b/libgnucash/engine/SplitP.h
similarity index 100%
rename from src/engine/SplitP.h
rename to libgnucash/engine/SplitP.h
diff --git a/src/engine/TransLog.c b/libgnucash/engine/TransLog.c
similarity index 100%
rename from src/engine/TransLog.c
rename to libgnucash/engine/TransLog.c
diff --git a/src/engine/TransLog.h b/libgnucash/engine/TransLog.h
similarity index 100%
rename from src/engine/TransLog.h
rename to libgnucash/engine/TransLog.h
diff --git a/src/engine/Transaction.c b/libgnucash/engine/Transaction.c
similarity index 100%
rename from src/engine/Transaction.c
rename to libgnucash/engine/Transaction.c
diff --git a/src/engine/Transaction.h b/libgnucash/engine/Transaction.h
similarity index 100%
rename from src/engine/Transaction.h
rename to libgnucash/engine/Transaction.h
diff --git a/src/engine/TransactionP.h b/libgnucash/engine/TransactionP.h
similarity index 100%
rename from src/engine/TransactionP.h
rename to libgnucash/engine/TransactionP.h
diff --git a/src/engine/business-core.i b/libgnucash/engine/business-core.i
similarity index 100%
rename from src/engine/business-core.i
rename to libgnucash/engine/business-core.i
diff --git a/src/engine/business-core.scm b/libgnucash/engine/business-core.scm
similarity index 100%
rename from src/engine/business-core.scm
rename to libgnucash/engine/business-core.scm
diff --git a/src/engine/cap-gains.c b/libgnucash/engine/cap-gains.c
similarity index 100%
rename from src/engine/cap-gains.c
rename to libgnucash/engine/cap-gains.c
diff --git a/src/engine/cap-gains.h b/libgnucash/engine/cap-gains.h
similarity index 100%
rename from src/engine/cap-gains.h
rename to libgnucash/engine/cap-gains.h
diff --git a/src/engine/cashobjects.c b/libgnucash/engine/cashobjects.c
similarity index 100%
rename from src/engine/cashobjects.c
rename to libgnucash/engine/cashobjects.c
diff --git a/src/engine/cashobjects.h b/libgnucash/engine/cashobjects.h
similarity index 100%
rename from src/engine/cashobjects.h
rename to libgnucash/engine/cashobjects.h
diff --git a/src/engine/commodity-table.scm b/libgnucash/engine/commodity-table.scm
similarity index 100%
rename from src/engine/commodity-table.scm
rename to libgnucash/engine/commodity-table.scm
diff --git a/src/engine/design.txt b/libgnucash/engine/design.txt
similarity index 100%
rename from src/engine/design.txt
rename to libgnucash/engine/design.txt
diff --git a/src/engine/engine-common.i b/libgnucash/engine/engine-common.i
similarity index 100%
rename from src/engine/engine-common.i
rename to libgnucash/engine/engine-common.i
diff --git a/src/engine/engine-helpers-guile.h b/libgnucash/engine/engine-helpers-guile.h
similarity index 100%
rename from src/engine/engine-helpers-guile.h
rename to libgnucash/engine/engine-helpers-guile.h
diff --git a/src/engine/engine-helpers.c b/libgnucash/engine/engine-helpers.c
similarity index 100%
rename from src/engine/engine-helpers.c
rename to libgnucash/engine/engine-helpers.c
diff --git a/src/engine/engine-helpers.h b/libgnucash/engine/engine-helpers.h
similarity index 100%
rename from src/engine/engine-helpers.h
rename to libgnucash/engine/engine-helpers.h
diff --git a/src/engine/engine-interface.scm b/libgnucash/engine/engine-interface.scm
similarity index 100%
rename from src/engine/engine-interface.scm
rename to libgnucash/engine/engine-interface.scm
diff --git a/src/engine/engine-utilities.scm b/libgnucash/engine/engine-utilities.scm
similarity index 100%
rename from src/engine/engine-utilities.scm
rename to libgnucash/engine/engine-utilities.scm
diff --git a/src/engine/engine.i b/libgnucash/engine/engine.i
similarity index 100%
rename from src/engine/engine.i
rename to libgnucash/engine/engine.i
diff --git a/src/engine/engine.scm b/libgnucash/engine/engine.scm
similarity index 100%
rename from src/engine/engine.scm
rename to libgnucash/engine/engine.scm
diff --git a/src/engine/extensions.txt b/libgnucash/engine/extensions.txt
similarity index 100%
rename from src/engine/extensions.txt
rename to libgnucash/engine/extensions.txt
diff --git a/src/engine/glib-helpers.c b/libgnucash/engine/glib-helpers.c
similarity index 100%
rename from src/engine/glib-helpers.c
rename to libgnucash/engine/glib-helpers.c
diff --git a/src/engine/glib-helpers.h b/libgnucash/engine/glib-helpers.h
similarity index 100%
rename from src/engine/glib-helpers.h
rename to libgnucash/engine/glib-helpers.h
diff --git a/src/engine/gnc-aqbanking-templates.cpp b/libgnucash/engine/gnc-aqbanking-templates.cpp
similarity index 100%
rename from src/engine/gnc-aqbanking-templates.cpp
rename to libgnucash/engine/gnc-aqbanking-templates.cpp
diff --git a/src/engine/gnc-aqbanking-templates.h b/libgnucash/engine/gnc-aqbanking-templates.h
similarity index 100%
rename from src/engine/gnc-aqbanking-templates.h
rename to libgnucash/engine/gnc-aqbanking-templates.h
diff --git a/src/engine/gnc-backend-prov.hpp b/libgnucash/engine/gnc-backend-prov.hpp
similarity index 100%
rename from src/engine/gnc-backend-prov.hpp
rename to libgnucash/engine/gnc-backend-prov.hpp
diff --git a/src/engine/gnc-budget.c b/libgnucash/engine/gnc-budget.c
similarity index 100%
rename from src/engine/gnc-budget.c
rename to libgnucash/engine/gnc-budget.c
diff --git a/src/engine/gnc-budget.h b/libgnucash/engine/gnc-budget.h
similarity index 100%
rename from src/engine/gnc-budget.h
rename to libgnucash/engine/gnc-budget.h
diff --git a/src/engine/gnc-commodity.c b/libgnucash/engine/gnc-commodity.c
similarity index 100%
rename from src/engine/gnc-commodity.c
rename to libgnucash/engine/gnc-commodity.c
diff --git a/src/engine/gnc-commodity.h b/libgnucash/engine/gnc-commodity.h
similarity index 100%
rename from src/engine/gnc-commodity.h
rename to libgnucash/engine/gnc-commodity.h
diff --git a/src/engine/gnc-date-p.h b/libgnucash/engine/gnc-date-p.h
similarity index 100%
rename from src/engine/gnc-date-p.h
rename to libgnucash/engine/gnc-date-p.h
diff --git a/src/engine/gnc-date.cpp b/libgnucash/engine/gnc-date.cpp
similarity index 100%
rename from src/engine/gnc-date.cpp
rename to libgnucash/engine/gnc-date.cpp
diff --git a/src/engine/gnc-date.h b/libgnucash/engine/gnc-date.h
similarity index 100%
rename from src/engine/gnc-date.h
rename to libgnucash/engine/gnc-date.h
diff --git a/src/engine/gnc-datetime.cpp b/libgnucash/engine/gnc-datetime.cpp
similarity index 100%
rename from src/engine/gnc-datetime.cpp
rename to libgnucash/engine/gnc-datetime.cpp
diff --git a/src/engine/gnc-datetime.hpp b/libgnucash/engine/gnc-datetime.hpp
similarity index 100%
rename from src/engine/gnc-datetime.hpp
rename to libgnucash/engine/gnc-datetime.hpp
diff --git a/src/engine/gnc-engine.c b/libgnucash/engine/gnc-engine.c
similarity index 100%
rename from src/engine/gnc-engine.c
rename to libgnucash/engine/gnc-engine.c
diff --git a/src/engine/gnc-engine.h b/libgnucash/engine/gnc-engine.h
similarity index 100%
rename from src/engine/gnc-engine.h
rename to libgnucash/engine/gnc-engine.h
diff --git a/src/engine/gnc-event.c b/libgnucash/engine/gnc-event.c
similarity index 100%
rename from src/engine/gnc-event.c
rename to libgnucash/engine/gnc-event.c
diff --git a/src/engine/gnc-event.h b/libgnucash/engine/gnc-event.h
similarity index 100%
rename from src/engine/gnc-event.h
rename to libgnucash/engine/gnc-event.h
diff --git a/src/engine/gnc-features.c b/libgnucash/engine/gnc-features.c
similarity index 100%
rename from src/engine/gnc-features.c
rename to libgnucash/engine/gnc-features.c
diff --git a/src/engine/gnc-features.h b/libgnucash/engine/gnc-features.h
similarity index 100%
rename from src/engine/gnc-features.h
rename to libgnucash/engine/gnc-features.h
diff --git a/src/engine/gnc-hooks-scm.h b/libgnucash/engine/gnc-hooks-scm.h
similarity index 100%
rename from src/engine/gnc-hooks-scm.h
rename to libgnucash/engine/gnc-hooks-scm.h
diff --git a/src/engine/gnc-hooks.c b/libgnucash/engine/gnc-hooks.c
similarity index 100%
rename from src/engine/gnc-hooks.c
rename to libgnucash/engine/gnc-hooks.c
diff --git a/src/engine/gnc-hooks.h b/libgnucash/engine/gnc-hooks.h
similarity index 100%
rename from src/engine/gnc-hooks.h
rename to libgnucash/engine/gnc-hooks.h
diff --git a/src/engine/gnc-int128.cpp b/libgnucash/engine/gnc-int128.cpp
similarity index 100%
rename from src/engine/gnc-int128.cpp
rename to libgnucash/engine/gnc-int128.cpp
diff --git a/src/engine/gnc-int128.hpp b/libgnucash/engine/gnc-int128.hpp
similarity index 100%
rename from src/engine/gnc-int128.hpp
rename to libgnucash/engine/gnc-int128.hpp
diff --git a/src/engine/gnc-lot-p.h b/libgnucash/engine/gnc-lot-p.h
similarity index 100%
rename from src/engine/gnc-lot-p.h
rename to libgnucash/engine/gnc-lot-p.h
diff --git a/src/engine/gnc-lot.c b/libgnucash/engine/gnc-lot.c
similarity index 100%
rename from src/engine/gnc-lot.c
rename to libgnucash/engine/gnc-lot.c
diff --git a/src/engine/gnc-lot.h b/libgnucash/engine/gnc-lot.h
similarity index 100%
rename from src/engine/gnc-lot.h
rename to libgnucash/engine/gnc-lot.h
diff --git a/src/engine/gnc-numeric.cpp b/libgnucash/engine/gnc-numeric.cpp
similarity index 100%
rename from src/engine/gnc-numeric.cpp
rename to libgnucash/engine/gnc-numeric.cpp
diff --git a/src/engine/gnc-numeric.h b/libgnucash/engine/gnc-numeric.h
similarity index 100%
rename from src/engine/gnc-numeric.h
rename to libgnucash/engine/gnc-numeric.h
diff --git a/src/engine/gnc-numeric.hpp b/libgnucash/engine/gnc-numeric.hpp
similarity index 100%
rename from src/engine/gnc-numeric.hpp
rename to libgnucash/engine/gnc-numeric.hpp
diff --git a/src/engine/gnc-numeric.scm b/libgnucash/engine/gnc-numeric.scm
similarity index 100%
rename from src/engine/gnc-numeric.scm
rename to libgnucash/engine/gnc-numeric.scm
diff --git a/src/engine/gnc-pricedb-p.h b/libgnucash/engine/gnc-pricedb-p.h
similarity index 100%
rename from src/engine/gnc-pricedb-p.h
rename to libgnucash/engine/gnc-pricedb-p.h
diff --git a/src/engine/gnc-pricedb.c b/libgnucash/engine/gnc-pricedb.c
similarity index 100%
rename from src/engine/gnc-pricedb.c
rename to libgnucash/engine/gnc-pricedb.c
diff --git a/src/engine/gnc-pricedb.h b/libgnucash/engine/gnc-pricedb.h
similarity index 100%
rename from src/engine/gnc-pricedb.h
rename to libgnucash/engine/gnc-pricedb.h
diff --git a/src/engine/gnc-rational-rounding.hpp b/libgnucash/engine/gnc-rational-rounding.hpp
similarity index 100%
rename from src/engine/gnc-rational-rounding.hpp
rename to libgnucash/engine/gnc-rational-rounding.hpp
diff --git a/src/engine/gnc-rational.cpp b/libgnucash/engine/gnc-rational.cpp
similarity index 100%
rename from src/engine/gnc-rational.cpp
rename to libgnucash/engine/gnc-rational.cpp
diff --git a/src/engine/gnc-rational.hpp b/libgnucash/engine/gnc-rational.hpp
similarity index 100%
rename from src/engine/gnc-rational.hpp
rename to libgnucash/engine/gnc-rational.hpp
diff --git a/src/engine/gnc-session.c b/libgnucash/engine/gnc-session.c
similarity index 100%
rename from src/engine/gnc-session.c
rename to libgnucash/engine/gnc-session.c
diff --git a/src/engine/gnc-session.h b/libgnucash/engine/gnc-session.h
similarity index 100%
rename from src/engine/gnc-session.h
rename to libgnucash/engine/gnc-session.h
diff --git a/src/engine/gnc-timezone.cpp b/libgnucash/engine/gnc-timezone.cpp
similarity index 100%
rename from src/engine/gnc-timezone.cpp
rename to libgnucash/engine/gnc-timezone.cpp
diff --git a/src/engine/gnc-timezone.hpp b/libgnucash/engine/gnc-timezone.hpp
similarity index 100%
rename from src/engine/gnc-timezone.hpp
rename to libgnucash/engine/gnc-timezone.hpp
diff --git a/src/engine/gnc-uri-utils.c b/libgnucash/engine/gnc-uri-utils.c
similarity index 100%
rename from src/engine/gnc-uri-utils.c
rename to libgnucash/engine/gnc-uri-utils.c
diff --git a/src/engine/gnc-uri-utils.h b/libgnucash/engine/gnc-uri-utils.h
similarity index 100%
rename from src/engine/gnc-uri-utils.h
rename to libgnucash/engine/gnc-uri-utils.h
diff --git a/src/engine/gncAddress.c b/libgnucash/engine/gncAddress.c
similarity index 100%
rename from src/engine/gncAddress.c
rename to libgnucash/engine/gncAddress.c
diff --git a/src/engine/gncAddress.h b/libgnucash/engine/gncAddress.h
similarity index 100%
rename from src/engine/gncAddress.h
rename to libgnucash/engine/gncAddress.h
diff --git a/src/engine/gncAddressP.h b/libgnucash/engine/gncAddressP.h
similarity index 100%
rename from src/engine/gncAddressP.h
rename to libgnucash/engine/gncAddressP.h
diff --git a/src/engine/gncBillTerm.c b/libgnucash/engine/gncBillTerm.c
similarity index 100%
rename from src/engine/gncBillTerm.c
rename to libgnucash/engine/gncBillTerm.c
diff --git a/src/engine/gncBillTerm.h b/libgnucash/engine/gncBillTerm.h
similarity index 100%
rename from src/engine/gncBillTerm.h
rename to libgnucash/engine/gncBillTerm.h
diff --git a/src/engine/gncBillTermP.h b/libgnucash/engine/gncBillTermP.h
similarity index 100%
rename from src/engine/gncBillTermP.h
rename to libgnucash/engine/gncBillTermP.h
diff --git a/src/engine/gncBusGuile.c b/libgnucash/engine/gncBusGuile.c
similarity index 100%
rename from src/engine/gncBusGuile.c
rename to libgnucash/engine/gncBusGuile.c
diff --git a/src/engine/gncBusGuile.h b/libgnucash/engine/gncBusGuile.h
similarity index 100%
rename from src/engine/gncBusGuile.h
rename to libgnucash/engine/gncBusGuile.h
diff --git a/src/engine/gncBusiness.c b/libgnucash/engine/gncBusiness.c
similarity index 99%
rename from src/engine/gncBusiness.c
rename to libgnucash/engine/gncBusiness.c
index eb8d62d8c8..296a55e471 100644
--- a/src/engine/gncBusiness.c
+++ b/libgnucash/engine/gncBusiness.c
@@ -24,7 +24,7 @@
 #include "config.h"
 
 #include "gncBusiness.h"
-#include "engine/gncOwner.h"
+#include "gncOwner.h"
 
 /* The initialization of the business objects is done in
  * cashobjects_register() of <engine/cashobjects.h>. */
diff --git a/src/engine/gncBusiness.h b/libgnucash/engine/gncBusiness.h
similarity index 100%
rename from src/engine/gncBusiness.h
rename to libgnucash/engine/gncBusiness.h
diff --git a/src/engine/gncCustomer.c b/libgnucash/engine/gncCustomer.c
similarity index 100%
rename from src/engine/gncCustomer.c
rename to libgnucash/engine/gncCustomer.c
diff --git a/src/engine/gncCustomer.h b/libgnucash/engine/gncCustomer.h
similarity index 100%
rename from src/engine/gncCustomer.h
rename to libgnucash/engine/gncCustomer.h
diff --git a/src/engine/gncCustomerP.h b/libgnucash/engine/gncCustomerP.h
similarity index 100%
rename from src/engine/gncCustomerP.h
rename to libgnucash/engine/gncCustomerP.h
diff --git a/src/engine/gncEmployee.c b/libgnucash/engine/gncEmployee.c
similarity index 100%
rename from src/engine/gncEmployee.c
rename to libgnucash/engine/gncEmployee.c
diff --git a/src/engine/gncEmployee.h b/libgnucash/engine/gncEmployee.h
similarity index 100%
rename from src/engine/gncEmployee.h
rename to libgnucash/engine/gncEmployee.h
diff --git a/src/engine/gncEmployeeP.h b/libgnucash/engine/gncEmployeeP.h
similarity index 100%
rename from src/engine/gncEmployeeP.h
rename to libgnucash/engine/gncEmployeeP.h
diff --git a/src/engine/gncEntry.c b/libgnucash/engine/gncEntry.c
similarity index 100%
rename from src/engine/gncEntry.c
rename to libgnucash/engine/gncEntry.c
diff --git a/src/engine/gncEntry.h b/libgnucash/engine/gncEntry.h
similarity index 100%
rename from src/engine/gncEntry.h
rename to libgnucash/engine/gncEntry.h
diff --git a/src/engine/gncEntryP.h b/libgnucash/engine/gncEntryP.h
similarity index 100%
rename from src/engine/gncEntryP.h
rename to libgnucash/engine/gncEntryP.h
diff --git a/src/engine/gncIDSearch.c b/libgnucash/engine/gncIDSearch.c
similarity index 100%
rename from src/engine/gncIDSearch.c
rename to libgnucash/engine/gncIDSearch.c
diff --git a/src/engine/gncIDSearch.h b/libgnucash/engine/gncIDSearch.h
similarity index 100%
rename from src/engine/gncIDSearch.h
rename to libgnucash/engine/gncIDSearch.h
diff --git a/src/engine/gncInvoice.c b/libgnucash/engine/gncInvoice.c
similarity index 100%
rename from src/engine/gncInvoice.c
rename to libgnucash/engine/gncInvoice.c
diff --git a/src/engine/gncInvoice.h b/libgnucash/engine/gncInvoice.h
similarity index 100%
rename from src/engine/gncInvoice.h
rename to libgnucash/engine/gncInvoice.h
diff --git a/src/engine/gncInvoiceP.h b/libgnucash/engine/gncInvoiceP.h
similarity index 100%
rename from src/engine/gncInvoiceP.h
rename to libgnucash/engine/gncInvoiceP.h
diff --git a/src/engine/gncJob.c b/libgnucash/engine/gncJob.c
similarity index 100%
rename from src/engine/gncJob.c
rename to libgnucash/engine/gncJob.c
diff --git a/src/engine/gncJob.h b/libgnucash/engine/gncJob.h
similarity index 100%
rename from src/engine/gncJob.h
rename to libgnucash/engine/gncJob.h
diff --git a/src/engine/gncJobP.h b/libgnucash/engine/gncJobP.h
similarity index 100%
rename from src/engine/gncJobP.h
rename to libgnucash/engine/gncJobP.h
diff --git a/src/engine/gncOrder.c b/libgnucash/engine/gncOrder.c
similarity index 100%
rename from src/engine/gncOrder.c
rename to libgnucash/engine/gncOrder.c
diff --git a/src/engine/gncOrder.h b/libgnucash/engine/gncOrder.h
similarity index 100%
rename from src/engine/gncOrder.h
rename to libgnucash/engine/gncOrder.h
diff --git a/src/engine/gncOrderP.h b/libgnucash/engine/gncOrderP.h
similarity index 100%
rename from src/engine/gncOrderP.h
rename to libgnucash/engine/gncOrderP.h
diff --git a/src/engine/gncOwner.c b/libgnucash/engine/gncOwner.c
similarity index 100%
rename from src/engine/gncOwner.c
rename to libgnucash/engine/gncOwner.c
diff --git a/src/engine/gncOwner.h b/libgnucash/engine/gncOwner.h
similarity index 100%
rename from src/engine/gncOwner.h
rename to libgnucash/engine/gncOwner.h
diff --git a/src/engine/gncOwnerP.h b/libgnucash/engine/gncOwnerP.h
similarity index 100%
rename from src/engine/gncOwnerP.h
rename to libgnucash/engine/gncOwnerP.h
diff --git a/src/engine/gncTaxTable.c b/libgnucash/engine/gncTaxTable.c
similarity index 100%
rename from src/engine/gncTaxTable.c
rename to libgnucash/engine/gncTaxTable.c
diff --git a/src/engine/gncTaxTable.h b/libgnucash/engine/gncTaxTable.h
similarity index 100%
rename from src/engine/gncTaxTable.h
rename to libgnucash/engine/gncTaxTable.h
diff --git a/src/engine/gncTaxTableP.h b/libgnucash/engine/gncTaxTableP.h
similarity index 100%
rename from src/engine/gncTaxTableP.h
rename to libgnucash/engine/gncTaxTableP.h
diff --git a/src/engine/gncVendor.c b/libgnucash/engine/gncVendor.c
similarity index 100%
rename from src/engine/gncVendor.c
rename to libgnucash/engine/gncVendor.c
diff --git a/src/engine/gncVendor.h b/libgnucash/engine/gncVendor.h
similarity index 100%
rename from src/engine/gncVendor.h
rename to libgnucash/engine/gncVendor.h
diff --git a/src/engine/gncVendorP.h b/libgnucash/engine/gncVendorP.h
similarity index 100%
rename from src/engine/gncVendorP.h
rename to libgnucash/engine/gncVendorP.h
diff --git a/src/engine/gncmod-engine.c b/libgnucash/engine/gncmod-engine.c
similarity index 100%
rename from src/engine/gncmod-engine.c
rename to libgnucash/engine/gncmod-engine.c
diff --git a/src/engine/guid.cpp b/libgnucash/engine/guid.cpp
similarity index 100%
rename from src/engine/guid.cpp
rename to libgnucash/engine/guid.cpp
diff --git a/src/engine/guid.h b/libgnucash/engine/guid.h
similarity index 100%
rename from src/engine/guid.h
rename to libgnucash/engine/guid.h
diff --git a/src/engine/guid.hpp b/libgnucash/engine/guid.hpp
similarity index 100%
rename from src/engine/guid.hpp
rename to libgnucash/engine/guid.hpp
diff --git a/src/engine/iso-4217-currencies.xml b/libgnucash/engine/iso-4217-currencies.xml
similarity index 100%
rename from src/engine/iso-4217-currencies.xml
rename to libgnucash/engine/iso-4217-currencies.xml
diff --git a/src/engine/iso-currencies-to-c.xsl b/libgnucash/engine/iso-currencies-to-c.xsl
similarity index 100%
rename from src/engine/iso-currencies-to-c.xsl
rename to libgnucash/engine/iso-currencies-to-c.xsl
diff --git a/src/engine/kvp-frame.cpp b/libgnucash/engine/kvp-frame.cpp
similarity index 100%
rename from src/engine/kvp-frame.cpp
rename to libgnucash/engine/kvp-frame.cpp
diff --git a/src/engine/kvp-frame.hpp b/libgnucash/engine/kvp-frame.hpp
similarity index 100%
rename from src/engine/kvp-frame.hpp
rename to libgnucash/engine/kvp-frame.hpp
diff --git a/src/engine/kvp-scm.cpp b/libgnucash/engine/kvp-scm.cpp
similarity index 100%
rename from src/engine/kvp-scm.cpp
rename to libgnucash/engine/kvp-scm.cpp
diff --git a/src/engine/kvp-scm.h b/libgnucash/engine/kvp-scm.h
similarity index 100%
rename from src/engine/kvp-scm.h
rename to libgnucash/engine/kvp-scm.h
diff --git a/src/engine/kvp-value.cpp b/libgnucash/engine/kvp-value.cpp
similarity index 100%
rename from src/engine/kvp-value.cpp
rename to libgnucash/engine/kvp-value.cpp
diff --git a/src/engine/kvp-value.hpp b/libgnucash/engine/kvp-value.hpp
similarity index 100%
rename from src/engine/kvp-value.hpp
rename to libgnucash/engine/kvp-value.hpp
diff --git a/src/engine/kvp_doc.txt b/libgnucash/engine/kvp_doc.txt
similarity index 100%
rename from src/engine/kvp_doc.txt
rename to libgnucash/engine/kvp_doc.txt
diff --git a/src/engine/policy-p.h b/libgnucash/engine/policy-p.h
similarity index 100%
rename from src/engine/policy-p.h
rename to libgnucash/engine/policy-p.h
diff --git a/src/engine/policy.c b/libgnucash/engine/policy.c
similarity index 100%
rename from src/engine/policy.c
rename to libgnucash/engine/policy.c
diff --git a/src/engine/policy.h b/libgnucash/engine/policy.h
similarity index 100%
rename from src/engine/policy.h
rename to libgnucash/engine/policy.h
diff --git a/src/engine/qof-backend.cpp b/libgnucash/engine/qof-backend.cpp
similarity index 97%
rename from src/engine/qof-backend.cpp
rename to libgnucash/engine/qof-backend.cpp
index 24f58a9d62..cc87947ed2 100644
--- a/src/engine/qof-backend.cpp
+++ b/libgnucash/engine/qof-backend.cpp
@@ -112,10 +112,10 @@ static char* get_default_module_dir(const char* rel_path)
 #else
         if (rel_path)
             pkglibdir = g_build_path (G_DIR_SEPARATOR_S, builddir,
-                                      "src", "backend", rel_path, ".libs", NULL);
+                                      "libgnucash", "backend", rel_path, ".libs", NULL);
         else
             pkglibdir = g_build_path (G_DIR_SEPARATOR_S, builddir,
-                                      "src", "backend", ".libs", NULL);
+                                      "libgnucash", "backend", ".libs", NULL);
 #endif
     }
     else
diff --git a/src/engine/qof-backend.hpp b/libgnucash/engine/qof-backend.hpp
similarity index 100%
rename from src/engine/qof-backend.hpp
rename to libgnucash/engine/qof-backend.hpp
diff --git a/src/engine/qof-gobject.h b/libgnucash/engine/qof-gobject.h
similarity index 100%
rename from src/engine/qof-gobject.h
rename to libgnucash/engine/qof-gobject.h
diff --git a/src/engine/qof-string-cache.cpp b/libgnucash/engine/qof-string-cache.cpp
similarity index 100%
rename from src/engine/qof-string-cache.cpp
rename to libgnucash/engine/qof-string-cache.cpp
diff --git a/src/engine/qof-string-cache.h b/libgnucash/engine/qof-string-cache.h
similarity index 100%
rename from src/engine/qof-string-cache.h
rename to libgnucash/engine/qof-string-cache.h
diff --git a/src/engine/qof-win32.cpp b/libgnucash/engine/qof-win32.cpp
similarity index 100%
rename from src/engine/qof-win32.cpp
rename to libgnucash/engine/qof-win32.cpp
diff --git a/src/engine/qof.h b/libgnucash/engine/qof.h
similarity index 100%
rename from src/engine/qof.h
rename to libgnucash/engine/qof.h
diff --git a/src/engine/qofbackend.h b/libgnucash/engine/qofbackend.h
similarity index 100%
rename from src/engine/qofbackend.h
rename to libgnucash/engine/qofbackend.h
diff --git a/src/engine/qofbook-p.h b/libgnucash/engine/qofbook-p.h
similarity index 100%
rename from src/engine/qofbook-p.h
rename to libgnucash/engine/qofbook-p.h
diff --git a/src/engine/qofbook.cpp b/libgnucash/engine/qofbook.cpp
similarity index 100%
rename from src/engine/qofbook.cpp
rename to libgnucash/engine/qofbook.cpp
diff --git a/src/engine/qofbook.h b/libgnucash/engine/qofbook.h
similarity index 100%
rename from src/engine/qofbook.h
rename to libgnucash/engine/qofbook.h
diff --git a/src/engine/qofbookslots.h b/libgnucash/engine/qofbookslots.h
similarity index 100%
rename from src/engine/qofbookslots.h
rename to libgnucash/engine/qofbookslots.h
diff --git a/src/engine/qofchoice.cpp b/libgnucash/engine/qofchoice.cpp
similarity index 100%
rename from src/engine/qofchoice.cpp
rename to libgnucash/engine/qofchoice.cpp
diff --git a/src/engine/qofchoice.h b/libgnucash/engine/qofchoice.h
similarity index 100%
rename from src/engine/qofchoice.h
rename to libgnucash/engine/qofchoice.h
diff --git a/src/engine/qofclass-p.h b/libgnucash/engine/qofclass-p.h
similarity index 100%
rename from src/engine/qofclass-p.h
rename to libgnucash/engine/qofclass-p.h
diff --git a/src/engine/qofclass.cpp b/libgnucash/engine/qofclass.cpp
similarity index 100%
rename from src/engine/qofclass.cpp
rename to libgnucash/engine/qofclass.cpp
diff --git a/src/engine/qofclass.h b/libgnucash/engine/qofclass.h
similarity index 100%
rename from src/engine/qofclass.h
rename to libgnucash/engine/qofclass.h
diff --git a/src/engine/qofevent-p.h b/libgnucash/engine/qofevent-p.h
similarity index 100%
rename from src/engine/qofevent-p.h
rename to libgnucash/engine/qofevent-p.h
diff --git a/src/engine/qofevent.cpp b/libgnucash/engine/qofevent.cpp
similarity index 100%
rename from src/engine/qofevent.cpp
rename to libgnucash/engine/qofevent.cpp
diff --git a/src/engine/qofevent.h b/libgnucash/engine/qofevent.h
similarity index 100%
rename from src/engine/qofevent.h
rename to libgnucash/engine/qofevent.h
diff --git a/src/engine/qofid-p.h b/libgnucash/engine/qofid-p.h
similarity index 100%
rename from src/engine/qofid-p.h
rename to libgnucash/engine/qofid-p.h
diff --git a/src/engine/qofid.cpp b/libgnucash/engine/qofid.cpp
similarity index 100%
rename from src/engine/qofid.cpp
rename to libgnucash/engine/qofid.cpp
diff --git a/src/engine/qofid.h b/libgnucash/engine/qofid.h
similarity index 100%
rename from src/engine/qofid.h
rename to libgnucash/engine/qofid.h
diff --git a/src/engine/qofinstance-p.h b/libgnucash/engine/qofinstance-p.h
similarity index 100%
rename from src/engine/qofinstance-p.h
rename to libgnucash/engine/qofinstance-p.h
diff --git a/src/engine/qofinstance.cpp b/libgnucash/engine/qofinstance.cpp
similarity index 100%
rename from src/engine/qofinstance.cpp
rename to libgnucash/engine/qofinstance.cpp
diff --git a/src/engine/qofinstance.h b/libgnucash/engine/qofinstance.h
similarity index 100%
rename from src/engine/qofinstance.h
rename to libgnucash/engine/qofinstance.h
diff --git a/src/engine/qoflog.cpp b/libgnucash/engine/qoflog.cpp
similarity index 100%
rename from src/engine/qoflog.cpp
rename to libgnucash/engine/qoflog.cpp
diff --git a/src/engine/qoflog.h b/libgnucash/engine/qoflog.h
similarity index 100%
rename from src/engine/qoflog.h
rename to libgnucash/engine/qoflog.h
diff --git a/src/engine/qofobject-p.h b/libgnucash/engine/qofobject-p.h
similarity index 100%
rename from src/engine/qofobject-p.h
rename to libgnucash/engine/qofobject-p.h
diff --git a/src/engine/qofobject.cpp b/libgnucash/engine/qofobject.cpp
similarity index 100%
rename from src/engine/qofobject.cpp
rename to libgnucash/engine/qofobject.cpp
diff --git a/src/engine/qofobject.h b/libgnucash/engine/qofobject.h
similarity index 100%
rename from src/engine/qofobject.h
rename to libgnucash/engine/qofobject.h
diff --git a/src/engine/qofquery-p.h b/libgnucash/engine/qofquery-p.h
similarity index 100%
rename from src/engine/qofquery-p.h
rename to libgnucash/engine/qofquery-p.h
diff --git a/src/engine/qofquery.cpp b/libgnucash/engine/qofquery.cpp
similarity index 100%
rename from src/engine/qofquery.cpp
rename to libgnucash/engine/qofquery.cpp
diff --git a/src/engine/qofquery.h b/libgnucash/engine/qofquery.h
similarity index 100%
rename from src/engine/qofquery.h
rename to libgnucash/engine/qofquery.h
diff --git a/src/engine/qofquerycore-p.h b/libgnucash/engine/qofquerycore-p.h
similarity index 100%
rename from src/engine/qofquerycore-p.h
rename to libgnucash/engine/qofquerycore-p.h
diff --git a/src/engine/qofquerycore.cpp b/libgnucash/engine/qofquerycore.cpp
similarity index 100%
rename from src/engine/qofquerycore.cpp
rename to libgnucash/engine/qofquerycore.cpp
diff --git a/src/engine/qofquerycore.h b/libgnucash/engine/qofquerycore.h
similarity index 100%
rename from src/engine/qofquerycore.h
rename to libgnucash/engine/qofquerycore.h
diff --git a/src/engine/qofsession.cpp b/libgnucash/engine/qofsession.cpp
similarity index 100%
rename from src/engine/qofsession.cpp
rename to libgnucash/engine/qofsession.cpp
diff --git a/src/engine/qofsession.h b/libgnucash/engine/qofsession.h
similarity index 100%
rename from src/engine/qofsession.h
rename to libgnucash/engine/qofsession.h
diff --git a/src/engine/qofsession.hpp b/libgnucash/engine/qofsession.hpp
similarity index 100%
rename from src/engine/qofsession.hpp
rename to libgnucash/engine/qofsession.hpp
diff --git a/src/engine/qofutil.cpp b/libgnucash/engine/qofutil.cpp
similarity index 100%
rename from src/engine/qofutil.cpp
rename to libgnucash/engine/qofutil.cpp
diff --git a/src/engine/qofutil.h b/libgnucash/engine/qofutil.h
similarity index 100%
rename from src/engine/qofutil.h
rename to libgnucash/engine/qofutil.h
diff --git a/src/engine/test-core/CMakeLists.txt b/libgnucash/engine/test-core/CMakeLists.txt
similarity index 68%
rename from src/engine/test-core/CMakeLists.txt
rename to libgnucash/engine/test-core/CMakeLists.txt
index c376bd4019..56cfc9fb9f 100644
--- a/src/engine/test-core/CMakeLists.txt
+++ b/libgnucash/engine/test-core/CMakeLists.txt
@@ -9,11 +9,11 @@ ADD_LIBRARY(gncmod-test-engine STATIC ${libgncmod_test_engine_SOURCES})
 TARGET_INCLUDE_DIRECTORIES(gncmod-test-engine PRIVATE
   ${CMAKE_PREFIX_PATH}/include
   ${GMODULE_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/common/test-core
 )
 
 SET_DIST_LIST(engine_test_core_DIST CMakeLists.txt Makefile.am ${libgncmod_test_engine_SOURCES}
diff --git a/src/engine/test-core/Makefile.am b/libgnucash/engine/test-core/Makefile.am
similarity index 63%
rename from src/engine/test-core/Makefile.am
rename to libgnucash/engine/test-core/Makefile.am
index 6513014cd4..5e097abc44 100644
--- a/src/engine/test-core/Makefile.am
+++ b/libgnucash/engine/test-core/Makefile.am
@@ -1,24 +1,24 @@
 noinst_LTLIBRARIES=libgncmod-test-engine.la
 
 LDADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ../libgncmod-engine.la \
   ${GLIB_LIBS}
 
 libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.cpp
 libgncmod_test_engine_la_LDFLAGS = -module
 libgncmod_test_engine_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
   ../libgncmod-engine.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-engine-stuff.h test-engine-strings.h
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \
   ${BOOST_CPPFLAGS}
diff --git a/src/engine/test-core/gncmod-test-engine.c b/libgnucash/engine/test-core/gncmod-test-engine.c
similarity index 100%
rename from src/engine/test-core/gncmod-test-engine.c
rename to libgnucash/engine/test-core/gncmod-test-engine.c
diff --git a/src/engine/test-core/test-engine-strings.h b/libgnucash/engine/test-core/test-engine-strings.h
similarity index 100%
rename from src/engine/test-core/test-engine-strings.h
rename to libgnucash/engine/test-core/test-engine-strings.h
diff --git a/src/engine/test-core/test-engine-stuff.cpp b/libgnucash/engine/test-core/test-engine-stuff.cpp
similarity index 100%
rename from src/engine/test-core/test-engine-stuff.cpp
rename to libgnucash/engine/test-core/test-engine-stuff.cpp
diff --git a/src/engine/test-core/test-engine-stuff.h b/libgnucash/engine/test-core/test-engine-stuff.h
similarity index 100%
rename from src/engine/test-core/test-engine-stuff.h
rename to libgnucash/engine/test-core/test-engine-stuff.h
diff --git a/src/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
similarity index 90%
rename from src/engine/test/CMakeLists.txt
rename to libgnucash/engine/test/CMakeLists.txt
index c8cb436c37..209a120655 100644
--- a/src/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Common stuff
 
 SET(ENGINE_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/src/backend/xml
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/engine/test-core
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src/test-core  # for unittest-support.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/common/test-core  # for unittest-support.h
   ${GLIB2_INCLUDE_DIRS}
 )
 
@@ -56,11 +56,11 @@ SET(test_engine_SOURCES
 
 # This test does not run on Win32
 IF (NOT WIN32)
-  SET(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/src/test-core/unittest-support.c)
+  SET(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c)
   ADD_ENGINE_TEST(test-qof "${SOURCES}")
   TARGET_COMPILE_DEFINITIONS(test-qof PRIVATE TESTPROG=test_qof)
 
-  SET(SOURCES ${test_engine_SOURCES} ${CMAKE_SOURCE_DIR}/src/test-core/unittest-support.c)
+  SET(SOURCES ${test_engine_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c)
   ADD_ENGINE_TEST(test-engine "${SOURCES}")
   TARGET_COMPILE_OPTIONS(test-engine PRIVATE -Wno-write-strings)
   TARGET_COMPILE_DEFINITIONS(test-engine PRIVATE TESTPROG=test_engine)
@@ -83,14 +83,14 @@ ADD_ENGINE_TEST(test-job test-job.c)
 ADD_ENGINE_TEST(test-vendor test-vendor.c)
 
 SET(test_numeric_SOURCES
-  ${CMAKE_SOURCE_DIR}/src/engine/gnc-numeric.cpp
-  ${CMAKE_SOURCE_DIR}/src/engine/gnc-rational.cpp
-  ${CMAKE_SOURCE_DIR}/src/engine/gnc-int128.cpp
-  ${CMAKE_SOURCE_DIR}/src/engine/test/test-numeric.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-numeric.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-rational.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-int128.cpp
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine/test/test-numeric.cpp
 )
 ADD_ENGINE_TEST(test-numeric "${test_numeric_SOURCES}")
 
-SET(MODULEPATH ${CMAKE_SOURCE_DIR}/src/engine)
+SET(MODULEPATH ${CMAKE_SOURCE_DIR}/libgnucash/engine)
 SET(gtest_old_engine_LIBS
   gncmod-engine
   ${GLIB2_LDFLAGS}
@@ -107,8 +107,8 @@ SET(gtest_qof_LIBS
 
 SET(gtest_engine_INCLUDES
   ${MODULEPATH}
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src # for platform.h
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/common # for platform.h
   ${GLIB2_INCLUDE_DIRS}
   ${GTEST_INCLUDE_DIR})
 
@@ -200,7 +200,7 @@ GNC_ADD_SCHEME_TEST(scm-test-split test-split.scm)
 SET(engine_test_SCHEME test-extras.scm)
 
 SET(GUILE_MODULES      "")
-SET(GUILE_LOAD_DIRS    src/app-utils src/scm)
+SET(GUILE_LOAD_DIRS    libgnucash/app-utils libgnucash/scm)
 SET(GUILE_LIBRARY_DIRS "")
 SET(GUILE_DEPENDS      scm-app-utils scm-scm)
 
diff --git a/src/engine/test/Makefile.am b/libgnucash/engine/test/Makefile.am
similarity index 71%
rename from src/engine/test/Makefile.am
rename to libgnucash/engine/test/Makefile.am
index 1af7131890..6210fbbd05 100644
--- a/src/engine/test/Makefile.am
+++ b/libgnucash/engine/test/Makefile.am
@@ -1,25 +1,25 @@
 include $(top_srcdir)/test-templates/Makefile.decl
 
-MODULEPATH = src/engine
+MODULEPATH = libgnucash/engine
 
 AM_CPPFLAGS = \
   -I${top_srcdir} \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/engine/test-core \
-  -I${top_srcdir}/src/core-utils \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/libgnucash/engine/test-core \
+  -I${top_srcdir}/libgnucash/core-utils \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${BOOST_CPPFLAGS}
 
 LDADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/test-core/libtest-core.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/common/test-core/libtest-core.la \
   ../libgncmod-engine.la \
   ../test-core/libgncmod-test-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
   ${GLIB_LIBS}
 
 test_guid_SOURCES = test-guid.cpp
@@ -63,22 +63,22 @@ SCM_TESTS = \
 SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
 
 GNC_TEST_DEPS = \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/engine/test \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/engine/test \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/engine/test
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/engine/test \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/engine/test \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/libgnucash/engine/test
 
 test_account_object_SOURCES = test-account-object.cpp
 test_commodities_SOURCES = test-commodities.cpp
@@ -103,7 +103,7 @@ TESTS_ENVIRONMENT = \
   GUILE="${GUILE}" \
   SRCDIR=${srcdir} \
   GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
 
 check_PROGRAMS = ${TEST_GROUP_1} ${TEST_GROUP_2}
 
@@ -111,7 +111,7 @@ TESTS = ${TEST_GROUP_1} test-create-account ${TEST_GROUP_2} ${SCM_TESTS}
 
 test_link_SOURCES = test-link.c
 test_link_LDADD = ../libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la
 
 if WITH_GOOGLE_PROFILER
 LDADD += -lprofiler
@@ -187,7 +187,7 @@ test_engine_CXXFLAGS = -Wno-write-strings $(AM_CXXFLAGS)
 test_import_map_SOURCES = \
         gtest-import-map.cpp
 test_import_map_LDADD = \
-        ${top_builddir}/src/engine/libgncmod-engine.la \
+        ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
         ${GLIB_LIBS} \
         ${GTEST_LIBS}
 
@@ -199,7 +199,7 @@ endif
 test_import_map_CPPFLAGS = \
         -I${GTEST_HEADERS} \
         -I${top_srcdir}/${MODULEPATH} \
-        -I${top_srcdir}/src/core-utils \
+        -I${top_srcdir}/libgnucash/core-utils \
         ${GLIB_CFLAGS}
 
 TEST_GROUP_1 += test-import-map
diff --git a/src/engine/test/README b/libgnucash/engine/test/README
similarity index 100%
rename from src/engine/test/README
rename to libgnucash/engine/test/README
diff --git a/src/engine/test/dummy.cpp b/libgnucash/engine/test/dummy.cpp
similarity index 100%
rename from src/engine/test/dummy.cpp
rename to libgnucash/engine/test/dummy.cpp
diff --git a/src/engine/test/gtest-gnc-datetime.cpp b/libgnucash/engine/test/gtest-gnc-datetime.cpp
similarity index 100%
rename from src/engine/test/gtest-gnc-datetime.cpp
rename to libgnucash/engine/test/gtest-gnc-datetime.cpp
diff --git a/src/engine/test/gtest-gnc-int128.cpp b/libgnucash/engine/test/gtest-gnc-int128.cpp
similarity index 100%
rename from src/engine/test/gtest-gnc-int128.cpp
rename to libgnucash/engine/test/gtest-gnc-int128.cpp
diff --git a/src/engine/test/gtest-gnc-numeric.cpp b/libgnucash/engine/test/gtest-gnc-numeric.cpp
similarity index 100%
rename from src/engine/test/gtest-gnc-numeric.cpp
rename to libgnucash/engine/test/gtest-gnc-numeric.cpp
diff --git a/src/engine/test/gtest-gnc-rational.cpp b/libgnucash/engine/test/gtest-gnc-rational.cpp
similarity index 100%
rename from src/engine/test/gtest-gnc-rational.cpp
rename to libgnucash/engine/test/gtest-gnc-rational.cpp
diff --git a/src/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp
similarity index 100%
rename from src/engine/test/gtest-gnc-timezone.cpp
rename to libgnucash/engine/test/gtest-gnc-timezone.cpp
diff --git a/src/engine/test/gtest-import-map.cpp b/libgnucash/engine/test/gtest-import-map.cpp
similarity index 100%
rename from src/engine/test/gtest-import-map.cpp
rename to libgnucash/engine/test/gtest-import-map.cpp
diff --git a/src/engine/test/test-account-object.cpp b/libgnucash/engine/test/test-account-object.cpp
similarity index 100%
rename from src/engine/test/test-account-object.cpp
rename to libgnucash/engine/test/test-account-object.cpp
diff --git a/src/engine/test/test-account.scm b/libgnucash/engine/test/test-account.scm
similarity index 100%
rename from src/engine/test/test-account.scm
rename to libgnucash/engine/test/test-account.scm
diff --git a/src/engine/test/test-address.c b/libgnucash/engine/test/test-address.c
similarity index 100%
rename from src/engine/test/test-address.c
rename to libgnucash/engine/test/test-address.c
diff --git a/src/engine/test/test-business.c b/libgnucash/engine/test/test-business.c
similarity index 100%
rename from src/engine/test/test-business.c
rename to libgnucash/engine/test/test-business.c
diff --git a/src/engine/test/test-commodities.cpp b/libgnucash/engine/test/test-commodities.cpp
similarity index 100%
rename from src/engine/test/test-commodities.cpp
rename to libgnucash/engine/test/test-commodities.cpp
diff --git a/src/engine/test/test-create-account.in b/libgnucash/engine/test/test-create-account.in
similarity index 100%
rename from src/engine/test/test-create-account.in
rename to libgnucash/engine/test/test-create-account.in
diff --git a/src/engine/test/test-create-account.scm b/libgnucash/engine/test/test-create-account.scm
similarity index 100%
rename from src/engine/test/test-create-account.scm
rename to libgnucash/engine/test/test-create-account.scm
diff --git a/src/engine/test/test-customer.c b/libgnucash/engine/test/test-customer.c
similarity index 100%
rename from src/engine/test/test-customer.c
rename to libgnucash/engine/test/test-customer.c
diff --git a/src/engine/test/test-date.cpp b/libgnucash/engine/test/test-date.cpp
similarity index 100%
rename from src/engine/test/test-date.cpp
rename to libgnucash/engine/test/test-date.cpp
diff --git a/src/engine/test/test-employee.c b/libgnucash/engine/test/test-employee.c
similarity index 100%
rename from src/engine/test/test-employee.c
rename to libgnucash/engine/test/test-employee.c
diff --git a/src/engine/test/test-engine-kvp-properties.c b/libgnucash/engine/test/test-engine-kvp-properties.c
similarity index 100%
rename from src/engine/test/test-engine-kvp-properties.c
rename to libgnucash/engine/test/test-engine-kvp-properties.c
diff --git a/src/engine/test/test-engine.c b/libgnucash/engine/test/test-engine.c
similarity index 100%
rename from src/engine/test/test-engine.c
rename to libgnucash/engine/test/test-engine.c
diff --git a/src/engine/test/test-extras.scm b/libgnucash/engine/test/test-extras.scm
similarity index 100%
rename from src/engine/test/test-extras.scm
rename to libgnucash/engine/test/test-extras.scm
diff --git a/src/engine/test/test-gnc-date.c b/libgnucash/engine/test/test-gnc-date.c
similarity index 99%
rename from src/engine/test/test-gnc-date.c
rename to libgnucash/engine/test/test-gnc-date.c
index fb9334157c..8e31d5d6cb 100644
--- a/src/engine/test/test-gnc-date.c
+++ b/libgnucash/engine/test/test-gnc-date.c
@@ -27,7 +27,7 @@ extern "C"
 #endif
 
 #include <config.h>
-#include "../../platform.h"
+#include "platform.h"
 #include <string.h>
 #include <sys/time.h>
 #include <glib.h>
diff --git a/src/engine/test/test-gnc-guid-old.cpp b/libgnucash/engine/test/test-gnc-guid-old.cpp
similarity index 100%
rename from src/engine/test/test-gnc-guid-old.cpp
rename to libgnucash/engine/test/test-gnc-guid-old.cpp
diff --git a/src/engine/test/test-gnc-guid.cpp b/libgnucash/engine/test/test-gnc-guid.cpp
similarity index 100%
rename from src/engine/test/test-gnc-guid.cpp
rename to libgnucash/engine/test/test-gnc-guid.cpp
diff --git a/src/engine/test/test-gnc-uri-utils.c b/libgnucash/engine/test/test-gnc-uri-utils.c
similarity index 100%
rename from src/engine/test/test-gnc-uri-utils.c
rename to libgnucash/engine/test/test-gnc-uri-utils.c
diff --git a/src/engine/test/test-group-vs-book.cpp b/libgnucash/engine/test/test-group-vs-book.cpp
similarity index 100%
rename from src/engine/test/test-group-vs-book.cpp
rename to libgnucash/engine/test/test-group-vs-book.cpp
diff --git a/src/engine/test/test-guid.cpp b/libgnucash/engine/test/test-guid.cpp
similarity index 100%
rename from src/engine/test/test-guid.cpp
rename to libgnucash/engine/test/test-guid.cpp
diff --git a/src/engine/test/test-job.c b/libgnucash/engine/test/test-job.c
similarity index 100%
rename from src/engine/test/test-job.c
rename to libgnucash/engine/test/test-job.c
diff --git a/src/engine/test/test-kvp-frame.cpp b/libgnucash/engine/test/test-kvp-frame.cpp
similarity index 100%
rename from src/engine/test/test-kvp-frame.cpp
rename to libgnucash/engine/test/test-kvp-frame.cpp
diff --git a/src/engine/test/test-kvp-value.cpp b/libgnucash/engine/test/test-kvp-value.cpp
similarity index 100%
rename from src/engine/test/test-kvp-value.cpp
rename to libgnucash/engine/test/test-kvp-value.cpp
diff --git a/src/engine/test/test-link.c b/libgnucash/engine/test/test-link.c
similarity index 100%
rename from src/engine/test/test-link.c
rename to libgnucash/engine/test/test-link.c
diff --git a/src/engine/test/test-load-engine.c b/libgnucash/engine/test/test-load-engine.c
similarity index 100%
rename from src/engine/test/test-load-engine.c
rename to libgnucash/engine/test/test-load-engine.c
diff --git a/src/engine/test/test-lots.cpp b/libgnucash/engine/test/test-lots.cpp
similarity index 100%
rename from src/engine/test/test-lots.cpp
rename to libgnucash/engine/test/test-lots.cpp
diff --git a/src/engine/test/test-numeric.cpp b/libgnucash/engine/test/test-numeric.cpp
similarity index 100%
rename from src/engine/test/test-numeric.cpp
rename to libgnucash/engine/test/test-numeric.cpp
diff --git a/src/engine/test/test-object.c b/libgnucash/engine/test/test-object.c
similarity index 100%
rename from src/engine/test/test-object.c
rename to libgnucash/engine/test/test-object.c
diff --git a/src/engine/test/test-qof-string-cache.c b/libgnucash/engine/test/test-qof-string-cache.c
similarity index 100%
rename from src/engine/test/test-qof-string-cache.c
rename to libgnucash/engine/test/test-qof-string-cache.c
diff --git a/src/engine/test/test-qof.c b/libgnucash/engine/test/test-qof.c
similarity index 100%
rename from src/engine/test/test-qof.c
rename to libgnucash/engine/test/test-qof.c
diff --git a/src/engine/test/test-qofbackend.c b/libgnucash/engine/test/test-qofbackend.c
similarity index 100%
rename from src/engine/test/test-qofbackend.c
rename to libgnucash/engine/test/test-qofbackend.c
diff --git a/src/engine/test/test-qofbook.c b/libgnucash/engine/test/test-qofbook.c
similarity index 100%
rename from src/engine/test/test-qofbook.c
rename to libgnucash/engine/test/test-qofbook.c
diff --git a/src/engine/test/test-qofinstance.cpp b/libgnucash/engine/test/test-qofinstance.cpp
similarity index 100%
rename from src/engine/test/test-qofinstance.cpp
rename to libgnucash/engine/test/test-qofinstance.cpp
diff --git a/src/engine/test/test-qofobject.c b/libgnucash/engine/test/test-qofobject.c
similarity index 100%
rename from src/engine/test/test-qofobject.c
rename to libgnucash/engine/test/test-qofobject.c
diff --git a/src/engine/test/test-qofsession-old.cpp b/libgnucash/engine/test/test-qofsession-old.cpp
similarity index 100%
rename from src/engine/test/test-qofsession-old.cpp
rename to libgnucash/engine/test/test-qofsession-old.cpp
diff --git a/src/engine/test/test-qofsession.cpp b/libgnucash/engine/test/test-qofsession.cpp
similarity index 100%
rename from src/engine/test/test-qofsession.cpp
rename to libgnucash/engine/test/test-qofsession.cpp
diff --git a/src/engine/test/test-query.cpp b/libgnucash/engine/test/test-query.cpp
similarity index 100%
rename from src/engine/test/test-query.cpp
rename to libgnucash/engine/test/test-query.cpp
diff --git a/src/engine/test/test-querynew.c b/libgnucash/engine/test/test-querynew.c
similarity index 100%
rename from src/engine/test/test-querynew.c
rename to libgnucash/engine/test/test-querynew.c
diff --git a/src/engine/test/test-recurrence.c b/libgnucash/engine/test/test-recurrence.c
similarity index 100%
rename from src/engine/test/test-recurrence.c
rename to libgnucash/engine/test/test-recurrence.c
diff --git a/src/engine/test/test-scm-query-import.in b/libgnucash/engine/test/test-scm-query-import.in
similarity index 100%
rename from src/engine/test/test-scm-query-import.in
rename to libgnucash/engine/test/test-scm-query-import.in
diff --git a/src/engine/test/test-scm-query-import.scm b/libgnucash/engine/test/test-scm-query-import.scm
similarity index 100%
rename from src/engine/test/test-scm-query-import.scm
rename to libgnucash/engine/test/test-scm-query-import.scm
diff --git a/src/engine/test/test-scm-query.cpp b/libgnucash/engine/test/test-scm-query.cpp
similarity index 100%
rename from src/engine/test/test-scm-query.cpp
rename to libgnucash/engine/test/test-scm-query.cpp
diff --git a/src/engine/test/test-split-vs-account.cpp b/libgnucash/engine/test/test-split-vs-account.cpp
similarity index 100%
rename from src/engine/test/test-split-vs-account.cpp
rename to libgnucash/engine/test/test-split-vs-account.cpp
diff --git a/src/engine/test/test-split.scm b/libgnucash/engine/test/test-split.scm
similarity index 100%
rename from src/engine/test/test-split.scm
rename to libgnucash/engine/test/test-split.scm
diff --git a/src/engine/test/test-test-extras.scm b/libgnucash/engine/test/test-test-extras.scm
similarity index 100%
rename from src/engine/test/test-test-extras.scm
rename to libgnucash/engine/test/test-test-extras.scm
diff --git a/src/engine/test/test-transaction-reversal.cpp b/libgnucash/engine/test/test-transaction-reversal.cpp
similarity index 100%
rename from src/engine/test/test-transaction-reversal.cpp
rename to libgnucash/engine/test/test-transaction-reversal.cpp
diff --git a/src/engine/test/test-transaction-voiding.cpp b/libgnucash/engine/test/test-transaction-voiding.cpp
similarity index 100%
rename from src/engine/test/test-transaction-voiding.cpp
rename to libgnucash/engine/test/test-transaction-voiding.cpp
diff --git a/src/engine/test/test-vendor.c b/libgnucash/engine/test/test-vendor.c
similarity index 100%
rename from src/engine/test/test-vendor.c
rename to libgnucash/engine/test/test-vendor.c
diff --git a/src/engine/test/utest-Account.cpp b/libgnucash/engine/test/utest-Account.cpp
similarity index 100%
rename from src/engine/test/utest-Account.cpp
rename to libgnucash/engine/test/utest-Account.cpp
diff --git a/src/engine/test/utest-Budget.c b/libgnucash/engine/test/utest-Budget.c
similarity index 100%
rename from src/engine/test/utest-Budget.c
rename to libgnucash/engine/test/utest-Budget.c
diff --git a/src/engine/test/utest-Entry.c b/libgnucash/engine/test/utest-Entry.c
similarity index 100%
rename from src/engine/test/utest-Entry.c
rename to libgnucash/engine/test/utest-Entry.c
diff --git a/src/engine/test/utest-Invoice.c b/libgnucash/engine/test/utest-Invoice.c
similarity index 100%
rename from src/engine/test/utest-Invoice.c
rename to libgnucash/engine/test/utest-Invoice.c
diff --git a/src/engine/test/utest-Split.cpp b/libgnucash/engine/test/utest-Split.cpp
similarity index 100%
rename from src/engine/test/utest-Split.cpp
rename to libgnucash/engine/test/utest-Split.cpp
diff --git a/src/engine/test/utest-Transaction.cpp b/libgnucash/engine/test/utest-Transaction.cpp
similarity index 100%
rename from src/engine/test/utest-Transaction.cpp
rename to libgnucash/engine/test/utest-Transaction.cpp
diff --git a/src/engine/test/utest-gnc-pricedb.c b/libgnucash/engine/test/utest-gnc-pricedb.c
similarity index 100%
rename from src/engine/test/utest-gnc-pricedb.c
rename to libgnucash/engine/test/utest-gnc-pricedb.c
diff --git a/src/engine/xlate.pl b/libgnucash/engine/xlate.pl
similarity index 100%
rename from src/engine/xlate.pl
rename to libgnucash/engine/xlate.pl
diff --git a/src/gnc-module/CMakeLists.txt b/libgnucash/gnc-module/CMakeLists.txt
similarity index 92%
rename from src/gnc-module/CMakeLists.txt
rename to libgnucash/gnc-module/CMakeLists.txt
index ce06e3e779..519bb1f765 100644
--- a/src/gnc-module/CMakeLists.txt
+++ b/libgnucash/gnc-module/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for src/gnc-module
+# CMakeLists.txt for libgnucash/gnc-module
 ADD_SUBDIRECTORY(test)
 
 IF (BUILDING_FROM_VCS)
@@ -32,8 +32,8 @@ TARGET_COMPILE_DEFINITIONS (gnc-module PRIVATE -DG_LOG_DOMAIN=\"gnc.module\")
 TARGET_INCLUDE_DIRECTORIES (gnc-module
     PRIVATE ${GUILE_INCLUDE_DIRS}
     PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}
-            ${CMAKE_SOURCE_DIR}/src
-            ${CMAKE_BINARY_DIR}/src # for config.h
+            ${CMAKE_SOURCE_DIR}/common
+            ${CMAKE_BINARY_DIR}/common # for config.h
             ${GLIB2_INCLUDE_DIRS}
 )
 
diff --git a/src/gnc-module/Makefile.am b/libgnucash/gnc-module/Makefile.am
similarity index 81%
rename from src/gnc-module/Makefile.am
rename to libgnucash/gnc-module/Makefile.am
index cecaed5d63..d7b37484cc 100644
--- a/src/gnc-module/Makefile.am
+++ b/libgnucash/gnc-module/Makefile.am
@@ -4,8 +4,8 @@
 
 AM_CPPFLAGS = \
    -I${top_srcdir}/lib/libc \
-   -I${top_srcdir}/src \
-   -I${top_srcdir}/src/core-utils \
+   -I${top_srcdir}/common \
+   -I${top_srcdir}/libgnucash/core-utils \
    ${GLIB_CFLAGS} \
    ${GUILE_CFLAGS}
 
@@ -30,13 +30,13 @@ gncinclude_HEADERS = \
 noinst_DATA = .scm-links
 
 if BUILDING_FROM_VCS
-swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
+swig-gnc-module.c: gnc-module.i ${top_srcdir}/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
+	-I${top_srcdir}/common -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
@@ -68,13 +68,13 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/core-utils
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/core-utils
 
 %.go : %.scm .scm-links $(lib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
diff --git a/src/gnc-module/README b/libgnucash/gnc-module/README
similarity index 100%
rename from src/gnc-module/README
rename to libgnucash/gnc-module/README
diff --git a/src/gnc-module/doc/design.txt b/libgnucash/gnc-module/doc/design.txt
similarity index 100%
rename from src/gnc-module/doc/design.txt
rename to libgnucash/gnc-module/doc/design.txt
diff --git a/src/gnc-module/gnc-module-api.h b/libgnucash/gnc-module/gnc-module-api.h
similarity index 100%
rename from src/gnc-module/gnc-module-api.h
rename to libgnucash/gnc-module/gnc-module-api.h
diff --git a/src/gnc-module/gnc-module.c b/libgnucash/gnc-module/gnc-module.c
similarity index 100%
rename from src/gnc-module/gnc-module.c
rename to libgnucash/gnc-module/gnc-module.c
diff --git a/src/gnc-module/gnc-module.h b/libgnucash/gnc-module/gnc-module.h
similarity index 100%
rename from src/gnc-module/gnc-module.h
rename to libgnucash/gnc-module/gnc-module.h
diff --git a/src/gnc-module/gnc-module.i b/libgnucash/gnc-module/gnc-module.i
similarity index 100%
rename from src/gnc-module/gnc-module.i
rename to libgnucash/gnc-module/gnc-module.i
diff --git a/src/gnc-module/gnc-module.scm b/libgnucash/gnc-module/gnc-module.scm
similarity index 100%
rename from src/gnc-module/gnc-module.scm
rename to libgnucash/gnc-module/gnc-module.scm
diff --git a/src/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt
similarity index 96%
rename from src/gnc-module/test/CMakeLists.txt
rename to libgnucash/gnc-module/test/CMakeLists.txt
index 522f433bd6..99dd66da38 100644
--- a/src/gnc-module/test/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/CMakeLists.txt
@@ -5,9 +5,9 @@ ADD_SUBDIRECTORY(mod-baz)
 ADD_SUBDIRECTORY(misc-mods)
 
 SET(GNC_MODULE_TEST_INCLUDE_DIRS
-  ${CMAKE_BINARY_DIR}/src # for config.h
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common # for config.h
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
+  ${CMAKE_SOURCE_DIR}/common/test-core
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
diff --git a/libgnucash/gnc-module/test/Makefile.am b/libgnucash/gnc-module/test/Makefile.am
new file mode 100644
index 0000000000..13b01880c0
--- /dev/null
+++ b/libgnucash/gnc-module/test/Makefile.am
@@ -0,0 +1,72 @@
+SUBDIRS = mod-foo mod-bar mod-baz misc-mods
+
+LDADD = \
+  ${top_builddir}/common/test-core/libtest-core.la \
+  ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS}
+
+AM_CPPFLAGS = \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/common/test-core \
+  -I${top_srcdir}/libgnucash/engine \
+  ${GUILE_CFLAGS} \
+  ${GLIB_CFLAGS}
+
+TESTS = \
+  test-load-c \
+  test-load-scm \
+  test-gwrapped-c \
+  test-scm-module \
+  test-scm-multi \
+  test-load-deps \
+  test-modsysver \
+  test-incompatdep \
+  test-agedver \
+  test-dynload \
+  test-scm-dynload \
+  test-scm-init
+
+GNC_TEST_DEPS = \
+  --gnc-module-dir ${top_builddir}/libgnucash/gnc-module \
+  --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/mod-foo \
+  --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/mod-bar \
+  --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/mod-baz \
+  --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/misc-mods \
+  --guile-load-dir ${top_builddir}/common/test-core \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_srcdir}/libgnucash/gnc-module/test/mod-foo \
+  --guile-load-dir ${top_srcdir}/libgnucash/gnc-module/test/mod-baz \
+  --guile-load-dir ${top_srcdir}/libgnucash/gnc-module/test/mod-bar \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/common/test-core \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module/test/mod-foo \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module/test/mod-bar \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module/test/mod-baz
+
+TESTS_ENVIRONMENT = \
+  GUILE_WARN_DEPRECATED=no \
+  GUILE="${GUILE}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
+  test-load-c \
+  test-modsysver \
+  test-incompatdep \
+  test-agedver \
+  test-dynload
+
+test_dynload_LDFLAGS = ${GUILE_LIBS}
+
+EXTRA_DIST = \
+  test-gwrapped-c \
+  test-load-deps \
+  test-load-scm \
+  test-scm-dynload \
+  test-scm-init \
+  test-scm-module \
+  test-scm-multi \
+  CMakeLists.txt
+
+foo:
+	${TESTS_ENVIRONMENT} strace -f -o xxx ./test-load-c
diff --git a/src/gnc-module/test/README b/libgnucash/gnc-module/test/README
similarity index 100%
rename from src/gnc-module/test/README
rename to libgnucash/gnc-module/test/README
diff --git a/src/gnc-module/test/misc-mods/CMakeLists.txt b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
similarity index 92%
rename from src/gnc-module/test/misc-mods/CMakeLists.txt
rename to libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
index 973ee9b9de..0196333631 100644
--- a/src/gnc-module/test/misc-mods/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GLIB2_INCLUDE_DIRS}
 )
 
diff --git a/src/gnc-module/test/misc-mods/Makefile.am b/libgnucash/gnc-module/test/misc-mods/Makefile.am
similarity index 91%
rename from src/gnc-module/test/misc-mods/Makefile.am
rename to libgnucash/gnc-module/test/misc-mods/Makefile.am
index 0fc33124ce..d83af0e929 100644
--- a/src/gnc-module/test/misc-mods/Makefile.am
+++ b/libgnucash/gnc-module/test/misc-mods/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS}
 
diff --git a/src/gnc-module/test/misc-mods/agedver.c b/libgnucash/gnc-module/test/misc-mods/agedver.c
similarity index 100%
rename from src/gnc-module/test/misc-mods/agedver.c
rename to libgnucash/gnc-module/test/misc-mods/agedver.c
diff --git a/src/gnc-module/test/misc-mods/futuremodsys.c b/libgnucash/gnc-module/test/misc-mods/futuremodsys.c
similarity index 100%
rename from src/gnc-module/test/misc-mods/futuremodsys.c
rename to libgnucash/gnc-module/test/misc-mods/futuremodsys.c
diff --git a/src/gnc-module/test/misc-mods/incompatdep.c b/libgnucash/gnc-module/test/misc-mods/incompatdep.c
similarity index 100%
rename from src/gnc-module/test/misc-mods/incompatdep.c
rename to libgnucash/gnc-module/test/misc-mods/incompatdep.c
diff --git a/src/gnc-module/test/mod-bar/CMakeLists.txt b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
similarity index 87%
rename from src/gnc-module/test/mod-bar/CMakeLists.txt
rename to libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
index 47108b60b5..36b5905db5 100644
--- a/src/gnc-module/test/mod-bar/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
@@ -12,11 +12,11 @@ SET_SOURCE_FILES_PROPERTIES (gnc-mod-bar.c PROPERTY OBJECT_DEPENDS ${SWIG_BAR_C}
 
 TARGET_LINK_LIBRARIES(gncmodbar bar gnc-module)
 TARGET_INCLUDE_DIRECTORIES(gncmodbar PRIVATE
-  ${CMAKE_BINARY_DIR}/src
+  ${CMAKE_BINARY_DIR}/common
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/libgnucash/gnc-module/test/mod-bar/Makefile.am
similarity index 86%
rename from src/gnc-module/test/mod-bar/Makefile.am
rename to libgnucash/gnc-module/test/mod-bar/Makefile.am
index d0e38f3c79..9261530ebc 100644
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/libgnucash/gnc-module/test/mod-bar/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
@@ -28,7 +28,7 @@ swig-bar.c: bar.i
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
diff --git a/src/gnc-module/test/mod-bar/bar.c b/libgnucash/gnc-module/test/mod-bar/bar.c
similarity index 100%
rename from src/gnc-module/test/mod-bar/bar.c
rename to libgnucash/gnc-module/test/mod-bar/bar.c
diff --git a/src/gnc-module/test/mod-bar/bar.h b/libgnucash/gnc-module/test/mod-bar/bar.h
similarity index 100%
rename from src/gnc-module/test/mod-bar/bar.h
rename to libgnucash/gnc-module/test/mod-bar/bar.h
diff --git a/src/gnc-module/test/mod-bar/bar.i b/libgnucash/gnc-module/test/mod-bar/bar.i
similarity index 100%
rename from src/gnc-module/test/mod-bar/bar.i
rename to libgnucash/gnc-module/test/mod-bar/bar.i
diff --git a/src/gnc-module/test/mod-bar/gnc-mod-bar.c b/libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c
similarity index 100%
rename from src/gnc-module/test/mod-bar/gnc-mod-bar.c
rename to libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c
diff --git a/src/gnc-module/test/mod-bar/gnucash/bar.scm b/libgnucash/gnc-module/test/mod-bar/gnucash/bar.scm
similarity index 100%
rename from src/gnc-module/test/mod-bar/gnucash/bar.scm
rename to libgnucash/gnc-module/test/mod-bar/gnucash/bar.scm
diff --git a/src/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
similarity index 83%
rename from src/gnc-module/test/mod-baz/CMakeLists.txt
rename to libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index 1dc2dc715c..f287b7d847 100644
--- a/src/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -8,7 +8,7 @@ ENDIF()
 
 ADD_LIBRARY(baz EXCLUDE_FROM_ALL baz.c baz.h)
 TARGET_INCLUDE_DIRECTORIES(baz PRIVATE
-  ${CMAKE_SOURCE_DIR}/src/gnc-module/test/mod-foo
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module/test/mod-foo
 )
 TARGET_LINK_LIBRARIES(baz foo)
 
@@ -18,11 +18,11 @@ SET_SOURCE_FILES_PROPERTIES (gnc-mod-baz.c PROPERTY OBJECT_DEPENDS ${SWIG_BAZ_C}
 
 TARGET_LINK_LIBRARIES(gncmodbaz baz gnc-module)
 TARGET_INCLUDE_DIRECTORIES(gncmodbaz PRIVATE
-  ${CMAKE_BINARY_DIR}/src
+  ${CMAKE_BINARY_DIR}/common
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/libgnucash/gnc-module/test/mod-baz/Makefile.am
similarity index 83%
rename from src/gnc-module/test/mod-baz/Makefile.am
rename to libgnucash/gnc-module/test/mod-baz/Makefile.am
index 853ec3eb18..6914f93602 100644
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/libgnucash/gnc-module/test/mod-baz/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/gnc-module/test/mod-foo \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/libgnucash/gnc-module/test/mod-foo \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS}
 
@@ -32,7 +32,7 @@ swig-baz.c: baz.i
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
diff --git a/src/gnc-module/test/mod-baz/baz.c b/libgnucash/gnc-module/test/mod-baz/baz.c
similarity index 100%
rename from src/gnc-module/test/mod-baz/baz.c
rename to libgnucash/gnc-module/test/mod-baz/baz.c
diff --git a/src/gnc-module/test/mod-baz/baz.h b/libgnucash/gnc-module/test/mod-baz/baz.h
similarity index 100%
rename from src/gnc-module/test/mod-baz/baz.h
rename to libgnucash/gnc-module/test/mod-baz/baz.h
diff --git a/src/gnc-module/test/mod-baz/baz.i b/libgnucash/gnc-module/test/mod-baz/baz.i
similarity index 100%
rename from src/gnc-module/test/mod-baz/baz.i
rename to libgnucash/gnc-module/test/mod-baz/baz.i
diff --git a/src/gnc-module/test/mod-baz/gnc-mod-baz.c b/libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c
similarity index 100%
rename from src/gnc-module/test/mod-baz/gnc-mod-baz.c
rename to libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c
diff --git a/src/gnc-module/test/mod-baz/gnucash/baz.scm b/libgnucash/gnc-module/test/mod-baz/gnucash/baz.scm
similarity index 100%
rename from src/gnc-module/test/mod-baz/gnucash/baz.scm
rename to libgnucash/gnc-module/test/mod-baz/gnucash/baz.scm
diff --git a/src/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
similarity index 83%
rename from src/gnc-module/test/mod-foo/CMakeLists.txt
rename to libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index fcd78f8d56..c98c7d224c 100644
--- a/src/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -12,13 +12,13 @@ SET_SOURCE_FILES_PROPERTIES (gnc-mod-foo.c PROPERTY OBJECT_DEPENDS ${SWIG_FOO_C}
 
 TARGET_LINK_LIBRARIES(gncmodfoo foo gnc-module)
 TARGET_INCLUDE_DIRECTORIES(gncmodfoo PRIVATE
-  ${CMAKE_BINARY_DIR}/src
+  ${CMAKE_BINARY_DIR}/common
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/gnc-module
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
 
-SET_DIST_LIST(mod_foo_DIST CMakeLists.txt Makefile.am foo.i gnucash/foo.scm foo.c foo.h gnc-mod-foo.c)
\ No newline at end of file
+SET_DIST_LIST(mod_foo_DIST CMakeLists.txt Makefile.am foo.i gnucash/foo.scm foo.c foo.h gnc-mod-foo.c)
diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/libgnucash/gnc-module/test/mod-foo/Makefile.am
similarity index 87%
rename from src/gnc-module/test/mod-foo/Makefile.am
rename to libgnucash/gnc-module/test/mod-foo/Makefile.am
index 401eb21b34..bc92a3ebfd 100644
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/libgnucash/gnc-module/test/mod-foo/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS=\
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
@@ -34,7 +34,7 @@ swig-foo.c: foo.i
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
diff --git a/src/gnc-module/test/mod-foo/foo.c b/libgnucash/gnc-module/test/mod-foo/foo.c
similarity index 100%
rename from src/gnc-module/test/mod-foo/foo.c
rename to libgnucash/gnc-module/test/mod-foo/foo.c
diff --git a/src/gnc-module/test/mod-foo/foo.h b/libgnucash/gnc-module/test/mod-foo/foo.h
similarity index 100%
rename from src/gnc-module/test/mod-foo/foo.h
rename to libgnucash/gnc-module/test/mod-foo/foo.h
diff --git a/src/gnc-module/test/mod-foo/foo.i b/libgnucash/gnc-module/test/mod-foo/foo.i
similarity index 100%
rename from src/gnc-module/test/mod-foo/foo.i
rename to libgnucash/gnc-module/test/mod-foo/foo.i
diff --git a/src/gnc-module/test/mod-foo/gnc-mod-foo.c b/libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c
similarity index 100%
rename from src/gnc-module/test/mod-foo/gnc-mod-foo.c
rename to libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c
diff --git a/src/gnc-module/test/mod-foo/gnucash/foo.scm b/libgnucash/gnc-module/test/mod-foo/gnucash/foo.scm
similarity index 100%
rename from src/gnc-module/test/mod-foo/gnucash/foo.scm
rename to libgnucash/gnc-module/test/mod-foo/gnucash/foo.scm
diff --git a/src/gnc-module/test/test-agedver.c b/libgnucash/gnc-module/test/test-agedver.c
similarity index 94%
rename from src/gnc-module/test/test-agedver.c
rename to libgnucash/gnc-module/test/test-agedver.c
index 75a2ac2022..16469f355f 100644
--- a/src/gnc-module/test/test-agedver.c
+++ b/libgnucash/gnc-module/test/test-agedver.c
@@ -30,7 +30,7 @@ static void
 guile_main(void *closure, int argc, char ** argv)
 {
     GNCModule foo;
-    gchar *msg = "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
+    gchar *msg = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
     gchar *logdomain = "gnc.module";
     guint loglevel = G_LOG_LEVEL_WARNING;
     TestErrorStruct check = { loglevel, logdomain, msg };
diff --git a/src/gnc-module/test/test-dynload.c b/libgnucash/gnc-module/test/test-dynload.c
similarity index 96%
rename from src/gnc-module/test/test-dynload.c
rename to libgnucash/gnc-module/test/test-dynload.c
index 31853413d7..6c30553d46 100644
--- a/src/gnc-module/test/test-dynload.c
+++ b/libgnucash/gnc-module/test/test-dynload.c
@@ -36,7 +36,7 @@ static void
 guile_main(void *closure, int argc, char ** argv)
 {
     GModule *gmodule;
-    gchar *msg = "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
+    gchar *msg = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
     gchar *logdomain = "gnc.module";
     gchar *modpath;
     guint loglevel = G_LOG_LEVEL_WARNING;
diff --git a/src/gnc-module/test/test-gwrapped-c.in b/libgnucash/gnc-module/test/test-gwrapped-c.in
similarity index 100%
rename from src/gnc-module/test/test-gwrapped-c.in
rename to libgnucash/gnc-module/test/test-gwrapped-c.in
diff --git a/src/gnc-module/test/test-incompatdep.c b/libgnucash/gnc-module/test/test-incompatdep.c
similarity index 94%
rename from src/gnc-module/test/test-incompatdep.c
rename to libgnucash/gnc-module/test/test-incompatdep.c
index 70f923381a..ad303db72e 100644
--- a/src/gnc-module/test/test-incompatdep.c
+++ b/libgnucash/gnc-module/test/test-incompatdep.c
@@ -30,7 +30,7 @@ static void
 guile_main(void *closure, int argc, char ** argv)
 {
     GNCModule foo;
-    gchar *msg1 = "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
+    gchar *msg1 = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
     gchar *msg2 = "Could not locate module gnucash/incompatdep interface v.0";
     gchar *logdomain = "gnc.module";
     guint loglevel = G_LOG_LEVEL_WARNING;
diff --git a/src/gnc-module/test/test-load-c.c b/libgnucash/gnc-module/test/test-load-c.c
similarity index 94%
rename from src/gnc-module/test/test-load-c.c
rename to libgnucash/gnc-module/test/test-load-c.c
index bc6ee97692..5341452745 100644
--- a/src/gnc-module/test/test-load-c.c
+++ b/libgnucash/gnc-module/test/test-load-c.c
@@ -30,7 +30,7 @@ static void
 guile_main(void *closure, int argc, char ** argv)
 {
     GNCModule foo;
-    gchar *msg = "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
+    gchar *msg = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
     gchar *logdomain = "gnc.module";
     guint loglevel = G_LOG_LEVEL_WARNING;
     TestErrorStruct check = { loglevel, logdomain, msg };
diff --git a/src/gnc-module/test/test-load-deps.in b/libgnucash/gnc-module/test/test-load-deps.in
similarity index 100%
rename from src/gnc-module/test/test-load-deps.in
rename to libgnucash/gnc-module/test/test-load-deps.in
diff --git a/src/gnc-module/test/test-load-scm.in b/libgnucash/gnc-module/test/test-load-scm.in
similarity index 100%
rename from src/gnc-module/test/test-load-scm.in
rename to libgnucash/gnc-module/test/test-load-scm.in
diff --git a/src/gnc-module/test/test-modsysver.c b/libgnucash/gnc-module/test/test-modsysver.c
similarity index 94%
rename from src/gnc-module/test/test-modsysver.c
rename to libgnucash/gnc-module/test/test-modsysver.c
index 74ba9aae58..fe7d63b7c2 100644
--- a/src/gnc-module/test/test-modsysver.c
+++ b/libgnucash/gnc-module/test/test-modsysver.c
@@ -30,7 +30,7 @@ static void
 guile_main(void *closure, int argc, char ** argv)
 {
     GNCModule foo;
-    gchar *msg1 = "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
+    gchar *msg1 = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
     gchar *msg2 = "Could not locate module gnucash/futuremodsys interface v.0";
     gchar *logdomain = "gnc.module";
     guint loglevel = G_LOG_LEVEL_WARNING;
diff --git a/src/gnc-module/test/test-scm-dynload.in b/libgnucash/gnc-module/test/test-scm-dynload.in
similarity index 100%
rename from src/gnc-module/test/test-scm-dynload.in
rename to libgnucash/gnc-module/test/test-scm-dynload.in
diff --git a/src/gnc-module/test/test-scm-init.in b/libgnucash/gnc-module/test/test-scm-init.in
similarity index 100%
rename from src/gnc-module/test/test-scm-init.in
rename to libgnucash/gnc-module/test/test-scm-init.in
diff --git a/src/gnc-module/test/test-scm-module.in b/libgnucash/gnc-module/test/test-scm-module.in
similarity index 100%
rename from src/gnc-module/test/test-scm-module.in
rename to libgnucash/gnc-module/test/test-scm-module.in
diff --git a/src/gnc-module/test/test-scm-multi.in b/libgnucash/gnc-module/test/test-scm-multi.in
similarity index 100%
rename from src/gnc-module/test/test-scm-multi.in
rename to libgnucash/gnc-module/test/test-scm-multi.in
diff --git a/src/pixmaps/CMakeLists.txt b/libgnucash/pixmaps/CMakeLists.txt
similarity index 100%
rename from src/pixmaps/CMakeLists.txt
rename to libgnucash/pixmaps/CMakeLists.txt
diff --git a/src/pixmaps/Makefile.am b/libgnucash/pixmaps/Makefile.am
similarity index 100%
rename from src/pixmaps/Makefile.am
rename to libgnucash/pixmaps/Makefile.am
diff --git a/src/pixmaps/gnucash-icon-48x48.bmp b/libgnucash/pixmaps/gnucash-icon-48x48.bmp
similarity index 100%
rename from src/pixmaps/gnucash-icon-48x48.bmp
rename to libgnucash/pixmaps/gnucash-icon-48x48.bmp
diff --git a/src/pixmaps/gnucash-icon.ico b/libgnucash/pixmaps/gnucash-icon.ico
similarity index 100%
rename from src/pixmaps/gnucash-icon.ico
rename to libgnucash/pixmaps/gnucash-icon.ico
diff --git a/src/pixmaps/gnucash_splash.png b/libgnucash/pixmaps/gnucash_splash.png
similarity index 100%
rename from src/pixmaps/gnucash_splash.png
rename to libgnucash/pixmaps/gnucash_splash.png
diff --git a/src/pixmaps/hicolor/128x128/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/128x128/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/128x128/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/128x128/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-account-delete.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-delete.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-account-delete.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-delete.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-account-edit.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-edit.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-account-edit.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-edit.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-account-new.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-new.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-account-new.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-new.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-account-open.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-open.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-account-open.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-open.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-account-report.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-report.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-account-report.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-account-report.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-account.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-account.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-account.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-account.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-gnome-pdf.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-gnome-pdf.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-gnome-pdf.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-gnome-pdf.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-invoice-duplicate.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-duplicate.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-invoice-duplicate.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-duplicate.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-invoice-edit.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-edit.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-invoice-edit.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-edit.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-invoice-new.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-new.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-invoice-new.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-new.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-invoice-pay.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-pay.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-invoice-pay.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-pay.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-invoice-post.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-post.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-invoice-post.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-post.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-invoice-unpost.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-unpost.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-invoice-unpost.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice-unpost.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-invoice.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-invoice.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-invoice.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-jumpto.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-jumpto.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-jumpto.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-jumpto.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-split-trans.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-split-trans.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-split-trans.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-split-trans.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-sx-new.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-sx-new.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-sx-new.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-sx-new.png
diff --git a/src/pixmaps/hicolor/16x16/actions/gnc-transfer.png b/libgnucash/pixmaps/hicolor/16x16/actions/gnc-transfer.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/actions/gnc-transfer.png
rename to libgnucash/pixmaps/hicolor/16x16/actions/gnc-transfer.png
diff --git a/src/pixmaps/hicolor/16x16/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/16x16/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/16x16/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/16x16/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/22x22/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/22x22/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/22x22/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/22x22/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-account-delete.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-delete.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-account-delete.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-delete.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-account-edit.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-edit.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-account-edit.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-edit.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-account-new.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-new.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-account-new.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-new.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-account-open.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-open.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-account-open.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-open.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-account-report.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-report.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-account-report.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-account-report.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-account.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-account.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-account.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-account.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-gnome-pdf.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-gnome-pdf.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-gnome-pdf.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-gnome-pdf.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-invoice-duplicate.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-duplicate.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-invoice-duplicate.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-duplicate.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-invoice-edit.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-edit.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-invoice-edit.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-edit.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-invoice-new.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-new.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-invoice-new.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-new.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-invoice-pay.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-pay.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-invoice-pay.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-pay.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-invoice-post.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-post.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-invoice-post.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-post.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-invoice-unpost.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-unpost.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-invoice-unpost.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice-unpost.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-invoice.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-invoice.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-invoice.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-jumpto.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-jumpto.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-jumpto.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-jumpto.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-split-trans.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-split-trans.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-split-trans.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-split-trans.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-sx-new.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-sx-new.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-sx-new.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-sx-new.png
diff --git a/src/pixmaps/hicolor/24x24/actions/gnc-transfer.png b/libgnucash/pixmaps/hicolor/24x24/actions/gnc-transfer.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/actions/gnc-transfer.png
rename to libgnucash/pixmaps/hicolor/24x24/actions/gnc-transfer.png
diff --git a/src/pixmaps/hicolor/24x24/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/24x24/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/24x24/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/24x24/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/256x256/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/256x256/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/256x256/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/256x256/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/32x32/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/32x32/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/32x32/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/32x32/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/48x48/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/48x48/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/48x48/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/48x48/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/64x64/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/64x64/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/64x64/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/64x64/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/96x96/apps/gnucash-icon.png b/libgnucash/pixmaps/hicolor/96x96/apps/gnucash-icon.png
similarity index 100%
rename from src/pixmaps/hicolor/96x96/apps/gnucash-icon.png
rename to libgnucash/pixmaps/hicolor/96x96/apps/gnucash-icon.png
diff --git a/src/pixmaps/hicolor/scalable/apps/gnucash-icon.svg b/libgnucash/pixmaps/hicolor/scalable/apps/gnucash-icon.svg
similarity index 100%
rename from src/pixmaps/hicolor/scalable/apps/gnucash-icon.svg
rename to libgnucash/pixmaps/hicolor/scalable/apps/gnucash-icon.svg
diff --git a/src/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt
similarity index 100%
rename from src/quotes/CMakeLists.txt
rename to libgnucash/quotes/CMakeLists.txt
diff --git a/src/quotes/Makefile.am b/libgnucash/quotes/Makefile.am
similarity index 100%
rename from src/quotes/Makefile.am
rename to libgnucash/quotes/Makefile.am
diff --git a/src/quotes/Quote_example.pl b/libgnucash/quotes/Quote_example.pl
similarity index 100%
rename from src/quotes/Quote_example.pl
rename to libgnucash/quotes/Quote_example.pl
diff --git a/src/quotes/README b/libgnucash/quotes/README
similarity index 100%
rename from src/quotes/README
rename to libgnucash/quotes/README
diff --git a/src/quotes/gnc-fq-check.in b/libgnucash/quotes/gnc-fq-check.in
similarity index 100%
rename from src/quotes/gnc-fq-check.in
rename to libgnucash/quotes/gnc-fq-check.in
diff --git a/src/quotes/gnc-fq-dump b/libgnucash/quotes/gnc-fq-dump
similarity index 100%
rename from src/quotes/gnc-fq-dump
rename to libgnucash/quotes/gnc-fq-dump
diff --git a/src/quotes/gnc-fq-helper.in b/libgnucash/quotes/gnc-fq-helper.in
similarity index 100%
rename from src/quotes/gnc-fq-helper.in
rename to libgnucash/quotes/gnc-fq-helper.in
diff --git a/src/quotes/gnc-fq-update.in b/libgnucash/quotes/gnc-fq-update.in
similarity index 100%
rename from src/quotes/gnc-fq-update.in
rename to libgnucash/quotes/gnc-fq-update.in
diff --git a/src/quotes/gnc-value-portfolio b/libgnucash/quotes/gnc-value-portfolio
similarity index 100%
rename from src/quotes/gnc-value-portfolio
rename to libgnucash/quotes/gnc-value-portfolio
diff --git a/src/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt
similarity index 93%
rename from src/scm/CMakeLists.txt
rename to libgnucash/scm/CMakeLists.txt
index 2d29179cb6..72f0d788f8 100644
--- a/src/scm/CMakeLists.txt
+++ b/libgnucash/scm/CMakeLists.txt
@@ -23,8 +23,8 @@ ENDIF()
 # CONFIGURE_FILE(build-config.scm.in ${BUILD_CONFIG_SCM})
 
 SET(GUILE_MODULES      "")
-SET(GUILE_LOAD_DIRS    src/core-utils src/gnc-module)
-SET(GUILE_LIBRARY_DIRS src/core-utils src/gnc-module)
+SET(GUILE_LOAD_DIRS    libgnucash/core-utils libgnucash/gnc-module)
+SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module)
 SET(GUILE_DEPENDS      scm-core-utils scm-gnc-module)
 
 SET(scm_SCHEME_0
diff --git a/src/scm/Makefile.am b/libgnucash/scm/Makefile.am
similarity index 82%
rename from src/scm/Makefile.am
rename to libgnucash/scm/Makefile.am
index 318af4d18e..d6647c75d3 100644
--- a/src/scm/Makefile.am
+++ b/libgnucash/scm/Makefile.am
@@ -43,15 +43,15 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine
 
 %.go : %.scm .scm-links
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
diff --git a/src/scm/build-config.scm.in b/libgnucash/scm/build-config.scm.in
similarity index 100%
rename from src/scm/build-config.scm.in
rename to libgnucash/scm/build-config.scm.in
diff --git a/src/scm/config b/libgnucash/scm/config
similarity index 100%
rename from src/scm/config
rename to libgnucash/scm/config
diff --git a/src/scm/fin.scm b/libgnucash/scm/fin.scm
similarity index 100%
rename from src/scm/fin.scm
rename to libgnucash/scm/fin.scm
diff --git a/src/scm/gnumeric/CMakeLists.txt b/libgnucash/scm/gnumeric/CMakeLists.txt
similarity index 100%
rename from src/scm/gnumeric/CMakeLists.txt
rename to libgnucash/scm/gnumeric/CMakeLists.txt
diff --git a/src/scm/gnumeric/Makefile.am b/libgnucash/scm/gnumeric/Makefile.am
similarity index 100%
rename from src/scm/gnumeric/Makefile.am
rename to libgnucash/scm/gnumeric/Makefile.am
diff --git a/src/scm/gnumeric/gnumeric-utilities.scm b/libgnucash/scm/gnumeric/gnumeric-utilities.scm
similarity index 100%
rename from src/scm/gnumeric/gnumeric-utilities.scm
rename to libgnucash/scm/gnumeric/gnumeric-utilities.scm
diff --git a/src/scm/gnumeric/table-utils.scm b/libgnucash/scm/gnumeric/table-utils.scm
similarity index 100%
rename from src/scm/gnumeric/table-utils.scm
rename to libgnucash/scm/gnumeric/table-utils.scm
diff --git a/src/scm/main.scm b/libgnucash/scm/main.scm
similarity index 100%
rename from src/scm/main.scm
rename to libgnucash/scm/main.scm
diff --git a/src/scm/price-quotes.scm b/libgnucash/scm/price-quotes.scm
similarity index 100%
rename from src/scm/price-quotes.scm
rename to libgnucash/scm/price-quotes.scm
diff --git a/src/scm/printf.scm b/libgnucash/scm/printf.scm
similarity index 100%
rename from src/scm/printf.scm
rename to libgnucash/scm/printf.scm
diff --git a/src/scm/string.scm b/libgnucash/scm/string.scm
similarity index 100%
rename from src/scm/string.scm
rename to libgnucash/scm/string.scm
diff --git a/src/scm/substring-search.scm b/libgnucash/scm/substring-search.scm
similarity index 100%
rename from src/scm/substring-search.scm
rename to libgnucash/scm/substring-search.scm
diff --git a/src/scm/xml-generator.scm b/libgnucash/scm/xml-generator.scm
similarity index 100%
rename from src/scm/xml-generator.scm
rename to libgnucash/scm/xml-generator.scm
diff --git a/src/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt
similarity index 100%
rename from src/tax/CMakeLists.txt
rename to libgnucash/tax/CMakeLists.txt
diff --git a/src/tax/Makefile.am b/libgnucash/tax/Makefile.am
similarity index 100%
rename from src/tax/Makefile.am
rename to libgnucash/tax/Makefile.am
diff --git a/src/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt
similarity index 78%
rename from src/tax/us/CMakeLists.txt
rename to libgnucash/tax/us/CMakeLists.txt
index bf3f5fb2d6..62aac51a4a 100644
--- a/src/tax/us/CMakeLists.txt
+++ b/libgnucash/tax/us/CMakeLists.txt
@@ -9,7 +9,7 @@ ADD_LIBRARY(gncmod-tax-us ${tax_us_SOURCES})
 TARGET_LINK_LIBRARIES(gncmod-tax-us gnc-module ${GLIB2_LDFLAGS} ${GUILE_LDFLAGS})
 
 TARGET_INCLUDE_DIRECTORIES(gncmod-tax-us
-    PRIVATE ${CMAKE_BINARY_DIR}/src ${GUILE_INCLUDE_DIRS})
+    PRIVATE ${CMAKE_BINARY_DIR}/common ${GUILE_INCLUDE_DIRS})
 
 INSTALL(TARGETS gncmod-tax-us
   LIBRARY DESTINATION lib/gnucash
@@ -22,9 +22,9 @@ INSTALL(TARGETS gncmod-tax-us
 SET(gncmod_tax_us_SCHEME_1 txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm)
 SET(gncmod_tax_us_SCHEME_2 de_DE.scm us.scm)
 
-SET(GUILE_MODULES      src/app-utils src/engine)
-SET(GUILE_LOAD_DIRS    src/app-utils src/core-utils src/engine src/gnc-module src/scm)
-SET(GUILE_LIBRARY_DIRS src/app-utils src/engine src/gnc-module)
+SET(GUILE_MODULES      libgnucash/app-utils libgnucash/engine)
+SET(GUILE_LOAD_DIRS    libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module libgnucash/scm)
+SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/engine libgnucash/gnc-module)
 SET(GUILE_DEPENDS      scm-app-utils)
 
 GNC_ADD_SCHEME_TARGETS(scm-tax-us-1
diff --git a/src/tax/us/Makefile.am b/libgnucash/tax/us/Makefile.am
similarity index 69%
rename from src/tax/us/Makefile.am
rename to libgnucash/tax/us/Makefile.am
index 082710b8da..ac7d2d5aac 100644
--- a/src/tax/us/Makefile.am
+++ b/libgnucash/tax/us/Makefile.am
@@ -12,8 +12,8 @@ libgncmod_tax_us_la_LIBADD = \
  ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/gnc-module \
   ${GLIB_CFLAGS} ${GUILE_CFLAGS}
 
 gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/tax
@@ -46,21 +46,21 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module
+  --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax
diff --git a/src/tax/us/de_DE.scm b/libgnucash/tax/us/de_DE.scm
similarity index 100%
rename from src/tax/us/de_DE.scm
rename to libgnucash/tax/us/de_DE.scm
diff --git a/src/tax/us/de_DE/taxtxf - LIES MICH.txt b/libgnucash/tax/us/de_DE/taxtxf - LIES MICH.txt
similarity index 100%
rename from src/tax/us/de_DE/taxtxf - LIES MICH.txt
rename to libgnucash/tax/us/de_DE/taxtxf - LIES MICH.txt
diff --git a/src/tax/us/de_DE/txf-USt-Bericht.html b/libgnucash/tax/us/de_DE/txf-USt-Bericht.html
similarity index 100%
rename from src/tax/us/de_DE/txf-USt-Bericht.html
rename to libgnucash/tax/us/de_DE/txf-USt-Bericht.html
diff --git a/src/tax/us/de_DE/txf-USt-VA Anleitung 2011.pdf b/libgnucash/tax/us/de_DE/txf-USt-VA Anleitung 2011.pdf
similarity index 100%
rename from src/tax/us/de_DE/txf-USt-VA Anleitung 2011.pdf
rename to libgnucash/tax/us/de_DE/txf-USt-VA Anleitung 2011.pdf
diff --git a/src/tax/us/gncmod-tax-us.c b/libgnucash/tax/us/gncmod-tax-us.c
similarity index 100%
rename from src/tax/us/gncmod-tax-us.c
rename to libgnucash/tax/us/gncmod-tax-us.c
diff --git a/src/tax/us/test/CMakeLists.txt b/libgnucash/tax/us/test/CMakeLists.txt
similarity index 100%
rename from src/tax/us/test/CMakeLists.txt
rename to libgnucash/tax/us/test/CMakeLists.txt
diff --git a/libgnucash/tax/us/test/Makefile.am b/libgnucash/tax/us/test/Makefile.am
new file mode 100644
index 0000000000..70f98af125
--- /dev/null
+++ b/libgnucash/tax/us/test/Makefile.am
@@ -0,0 +1,19 @@
+TESTS = test-link-module
+
+# Some of these dirs may not be needed anymore.
+GNC_TEST_DEPS = \
+  --gnc-module-dir ${top_builddir}/libgnucash/tax/us \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/tax/us \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module
+
+TESTS_ENVIRONMENT = \
+  GUILE="${GUILE}" \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+
+check_PROGRAMS=test-link-module
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD=../libgncmod-tax-us.la ${GUILE_LIBS} ${GLIB_LIBS}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/tax/us/test/test-link-module.c b/libgnucash/tax/us/test/test-link-module.c
similarity index 100%
rename from src/tax/us/test/test-link-module.c
rename to libgnucash/tax/us/test/test-link-module.c
diff --git a/src/tax/us/test/test-load-module.in b/libgnucash/tax/us/test/test-load-module.in
similarity index 100%
rename from src/tax/us/test/test-load-module.in
rename to libgnucash/tax/us/test/test-load-module.in
diff --git a/src/tax/us/txf-de_DE.scm b/libgnucash/tax/us/txf-de_DE.scm
similarity index 100%
rename from src/tax/us/txf-de_DE.scm
rename to libgnucash/tax/us/txf-de_DE.scm
diff --git a/src/tax/us/txf-help-de_DE.scm b/libgnucash/tax/us/txf-help-de_DE.scm
similarity index 100%
rename from src/tax/us/txf-help-de_DE.scm
rename to libgnucash/tax/us/txf-help-de_DE.scm
diff --git a/src/tax/us/txf-help.scm b/libgnucash/tax/us/txf-help.scm
similarity index 100%
rename from src/tax/us/txf-help.scm
rename to libgnucash/tax/us/txf-help.scm
diff --git a/src/tax/us/txf.scm b/libgnucash/tax/us/txf.scm
similarity index 100%
rename from src/tax/us/txf.scm
rename to libgnucash/tax/us/txf.scm
diff --git a/src/tax/us/us.scm b/libgnucash/tax/us/us.scm
similarity index 100%
rename from src/tax/us/us.scm
rename to libgnucash/tax/us/us.scm
diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in
index a3d58ac5b8..ad75a39efc 100644
--- a/make-gnucash-potfiles.in
+++ b/make-gnucash-potfiles.in
@@ -37,7 +37,7 @@ close IN;
 # in order to use the same algorithm in both cmake and autools based builds
 
 my @possible_files = `cd @-SRCDIR-@ && \\
-                      find src lib -name '*.c' \\
+                      find bindings common libgnucash gnucash lib -name '*.c' \\
                       -o -name '*.cpp' -o -name '*.glade' \\
                       -o -name '*.desktop.in' -o -name '*.keys.in' \\
                       -o -name '*.gschema.xml.in.in' -o -name '*.scm' \\
@@ -76,8 +76,8 @@ foreach my $file (@possible_files) {
     print $type . $path . $name . "\n";
 }
 
-# These are also added, even though they are outside of src/
-print "src/gnome/gnucash.appdata.xml.in\n";
-print "src/gnome/gnucash.desktop.in.in\n";
-print "src/engine/qofbookslots.h\n";
+# These are manually added, because they're not picked up by the generation script
+print "gnucash/gnome/gnucash.appdata.xml.in\n";
+print "gnucash/gnome/gnucash.desktop.in.in\n";
+print "libgnucash/engine/qofbookslots.h\n";
 print "doc/tip_of_the_day.list.in\n";
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index bf8f0ba83b..7fc3091590 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -73,10 +73,10 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
     ${CMAKE_SOURCE_DIR}/*.c ${CMAKE_SOURCE_DIR}/*.cpp ${CMAKE_SOURCE_DIR}/*.glade ${CMAKE_SOURCE_DIR}/*.desktop.in
     ${CMAKE_SOURCE_DIR}/*.keys.in  ${CMAKE_SOURCE_DIR}/*.gschema.xml.in.in ${CMAKE_SOURCE_DIR}/*.scm)
 
-  # Only consider files in the src/ directory. Also check against list of ignore patterns
+  # Only consider files in the common, libgnucash, and gnucash/ directories. Also check against list of ignore patterns
   SET(FILES "")
   FOREACH(path ${FILES_IN})
-    STRING(REGEX MATCH "^(src/|lib)" IS_SRC ${path})
+    STRING(REGEX MATCH "^(common/|lib|gnucash|bindings)" IS_SRC ${path})
     IF (IS_SRC)
       SET(IS_IGNORED FALSE)
       FOREACH(pattern ${IGNORE_PATTERNS})
@@ -129,10 +129,10 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
     FILE(APPEND ${POTFILES_IN_PATH} "${path}\n")
   ENDFOREACH()
 
-  # These are also added, even though they are outside of src/
-  FILE(APPEND ${POTFILES_IN_PATH} "src/gnome/gnucash.appdata.xml.in
-src/gnome/gnucash.desktop.in.in
-src/engine/qofbookslots.h
+  # These are manually added, because they're not picked up by the generation script
+  FILE(APPEND ${POTFILES_IN_PATH} "gnucash/gnome/gnucash.appdata.xml.in
+gnucash/gnome/gnucash.desktop.in.in
+libgnucash/engine/qofbookslots.h
 doc/tip_of_the_day.list.in
 ")
 
diff --git a/po/POTFILES.ignore b/po/POTFILES.ignore
index 6d5b9a403f..fd3be296a1 100644
--- a/po/POTFILES.ignore
+++ b/po/POTFILES.ignore
@@ -1,10 +1,10 @@
 # Work around the intltool-0.35.5 / automake-1.10 failures
 # due to "missing" files.  These files may be distributed.
-src/gnome/gnucash.desktop.in.in
-src/gnome/gnucash.desktop.in
-src/engine/iso-4217-currencies.c
+gnucash/gnome/gnucash.desktop.in.in
+gnucash/gnome/gnucash.desktop.in
+libgnucash/engine/iso-4217-currencies.c
 # The features in import-export/qif are still unused.
-src/import-export/qif/qif-defaults.c
-src/import-export/qif/qif-parse.c
+gnucash/import-export/qif/qif-defaults.c
+gnucash/import-export/qif/qif-parse.c
 # This file is autogenerated, so it's only in the tree after an in-source build:
-src/gnome-utils/gnc-warnings.c
+gnucash/gnome-utils/gnc-warnings.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b5d9eeceaf..b50400619a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,466 @@
 # This is a list of files which contain translatable strings.
 # This file was generated by ../make-gnucash-potfiles.
+gnucash/bin/gnucash-bin.c
+gnucash/gnome/assistant-acct-period.c
+gnucash/gnome/assistant-hierarchy.c
+gnucash/gnome/assistant-loan.c
+gnucash/gnome/assistant-stock-split.c
+gnucash/gnome/business-gnome-utils.c
+gnucash/gnome/business-options-gnome.c
+gnucash/gnome/business-urls.c
+gnucash/gnome/dialog-billterms.c
+gnucash/gnome/dialog-choose-owner.c
+gnucash/gnome/dialog-commodities.c
+gnucash/gnome/dialog-customer.c
+gnucash/gnome/dialog-date-close.c
+gnucash/gnome/dialog-employee.c
+gnucash/gnome/dialog-fincalc.c
+gnucash/gnome/dialog-find-account.c
+gnucash/gnome/dialog-find-transactions2.c
+gnucash/gnome/dialog-find-transactions.c
+gnucash/gnome/dialog-imap-editor.c
+gnucash/gnome/dialog-invoice.c
+gnucash/gnome/dialog-job.c
+gnucash/gnome/dialog-lot-viewer.c
+gnucash/gnome/dialog-new-user.c
+gnucash/gnome/dialog-order.c
+gnucash/gnome/dialog-payment.c
+gnucash/gnome/dialog-price-edit-db.c
+gnucash/gnome/dialog-price-editor.c
+gnucash/gnome/dialog-print-check.c
+gnucash/gnome/dialog-progress.c
+gnucash/gnome/dialog-sx-editor2.c
+gnucash/gnome/dialog-sx-editor.c
+gnucash/gnome/dialog-sx-from-trans.c
+gnucash/gnome/dialog-sx-since-last-run.c
+gnucash/gnome/dialog-tax-info.c
+gnucash/gnome/dialog-trans-assoc.c
+gnucash/gnome/dialog-vendor.c
+gnucash/gnome/gnc-budget-view.c
+gnucash/gnome/gnc-plugin-account-tree.c
+gnucash/gnome/gnc-plugin-basic-commands.c
+gnucash/gnome/gnc-plugin-budget.c
+gnucash/gnome/gnc-plugin-business.c
+gnucash/gnome/gnc-plugin-page-account-tree.c
+gnucash/gnome/gnc-plugin-page-budget.c
+gnucash/gnome/gnc-plugin-page-invoice.c
+gnucash/gnome/gnc-plugin-page-owner-tree.c
+gnucash/gnome/gnc-plugin-page-register2.c
+gnucash/gnome/gnc-plugin-page-register.c
+gnucash/gnome/gnc-plugin-page-sx-list.c
+gnucash/gnome/gnc-plugin-register2.c
+gnucash/gnome/gnc-plugin-register.c
+gnucash/gnome/gnc-split-reg2.c
+gnucash/gnome/gnc-split-reg.c
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in
+gnucash/gnome/gtkbuilder/assistant-acct-period.glade
+gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
+gnucash/gnome/gtkbuilder/assistant-loan.glade
+gnucash/gnome/gtkbuilder/assistant-stock-split.glade
+gnucash/gnome/gtkbuilder/business-options-gnome.glade
+gnucash/gnome/gtkbuilder/business-prefs.glade
+gnucash/gnome/gtkbuilder/dialog-billterms.glade
+gnucash/gnome/gtkbuilder/dialog-choose-owner.glade
+gnucash/gnome/gtkbuilder/dialog-commodities.glade
+gnucash/gnome/gtkbuilder/dialog-customer.glade
+gnucash/gnome/gtkbuilder/dialog-date-close.glade
+gnucash/gnome/gtkbuilder/dialog-employee.glade
+gnucash/gnome/gtkbuilder/dialog-fincalc.glade
+gnucash/gnome/gtkbuilder/dialog-find-account.glade
+gnucash/gnome/gtkbuilder/dialog-imap-editor.glade
+gnucash/gnome/gtkbuilder/dialog-invoice.glade
+gnucash/gnome/gtkbuilder/dialog-job.glade
+gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade
+gnucash/gnome/gtkbuilder/dialog-new-user.glade
+gnucash/gnome/gtkbuilder/dialog-order.glade
+gnucash/gnome/gtkbuilder/dialog-payment.glade
+gnucash/gnome/gtkbuilder/dialog-price.glade
+gnucash/gnome/gtkbuilder/dialog-print-check.glade
+gnucash/gnome/gtkbuilder/dialog-progress.glade
+gnucash/gnome/gtkbuilder/dialog-sx.glade
+gnucash/gnome/gtkbuilder/dialog-tax-info.glade
+gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade
+gnucash/gnome/gtkbuilder/dialog-vendor.glade
+gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade
+gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade
+gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
+gnucash/gnome/gtkbuilder/window-autoclear.glade
+gnucash/gnome/gtkbuilder/window-reconcile.glade
+gnucash/gnome/reconcile-view.c
+gnucash/gnome/search-owner.c
+gnucash/gnome/top-level.c
+gnucash/gnome/window-autoclear.c
+gnucash/gnome/window-reconcile2.c
+gnucash/gnome/window-reconcile.c
+gnucash/gnome-search/dialog-search.c
+gnucash/gnome-search/dialog-search.glade
+gnucash/gnome-search/gnc-general-search.c
+gnucash/gnome-search/gncmod-gnome-search.c
+gnucash/gnome-search/search-account.c
+gnucash/gnome-search/search-boolean.c
+gnucash/gnome-search/search-core-type.c
+gnucash/gnome-search/search-core-utils.c
+gnucash/gnome-search/search-date.c
+gnucash/gnome-search/search-double.c
+gnucash/gnome-search/search-int64.c
+gnucash/gnome-search/search-numeric.c
+gnucash/gnome-search/search-reconciled.c
+gnucash/gnome-search/search-string.c
+gnucash/gnome-utils/account-quickfill.c
+gnucash/gnome-utils/assistant-xml-encoding.c
+gnucash/gnome-utils/cursors.c
+gnucash/gnome-utils/dialog-account.c
+gnucash/gnome-utils/dialog-book-close.c
+gnucash/gnome-utils/dialog-commodity.c
+gnucash/gnome-utils/dialog-dup-trans.c
+gnucash/gnome-utils/dialog-file-access.c
+gnucash/gnome-utils/dialog-object-references.c
+gnucash/gnome-utils/dialog-options.c
+gnucash/gnome-utils/dialog-preferences.c
+gnucash/gnome-utils/dialog-query-view.c
+gnucash/gnome-utils/dialog-reset-warnings.c
+gnucash/gnome-utils/dialog-tax-table.c
+gnucash/gnome-utils/dialog-totd.c
+gnucash/gnome-utils/dialog-transfer.c
+gnucash/gnome-utils/dialog-userpass.c
+gnucash/gnome-utils/dialog-utils.c
+gnucash/gnome-utils/gnc-account-sel.c
+gnucash/gnome-utils/gnc-amount-edit.c
+gnucash/gnome-utils/gnc-autosave.c
+gnucash/gnome-utils/gnc-cell-renderer-date.c
+gnucash/gnome-utils/gnc-cell-renderer-popup.c
+gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
+gnucash/gnome-utils/gnc-combott.c
+gnucash/gnome-utils/gnc-commodity-edit.c
+gnucash/gnome-utils/gnc-currency-edit.c
+gnucash/gnome-utils/gnc-date-delta.c
+gnucash/gnome-utils/gnc-date-edit.c
+gnucash/gnome-utils/gnc-date-format.c
+gnucash/gnome-utils/gnc-dense-cal.c
+gnucash/gnome-utils/gnc-dense-cal-model.c
+gnucash/gnome-utils/gnc-dense-cal-store.c
+gnucash/gnome-utils/gnc-embedded-window.c
+gnucash/gnome-utils/gnc-file.c
+gnucash/gnome-utils/gnc-frequency.c
+gnucash/gnome-utils/gnc-general-select.c
+gnucash/gnome-utils/gnc-gnome-utils.c
+gnucash/gnome-utils/gnc-gobject-utils.c
+gnucash/gnome-utils/gnc-gtk-utils.c
+gnucash/gnome-utils/gnc-gui-query.c
+gnucash/gnome-utils/gnc-icons.c
+gnucash/gnome-utils/gnc-keyring.c
+gnucash/gnome-utils/gnc-main-window.c
+gnucash/gnome-utils/gnc-menu-extensions.c
+gnucash/gnome-utils/gnc-menu-extensions.scm
+gnucash/gnome-utils/gncmod-gnome-utils.c
+gnucash/gnome-utils/gnc-period-select.c
+gnucash/gnome-utils/gnc-plugin.c
+gnucash/gnome-utils/gnc-plugin-file-history.c
+gnucash/gnome-utils/gnc-plugin-manager.c
+gnucash/gnome-utils/gnc-plugin-menu-additions.c
+gnucash/gnome-utils/gnc-plugin-page.c
+gnucash/gnome-utils/gnc-query-view.c
+gnucash/gnome-utils/gnc-recurrence.c
+gnucash/gnome-utils/gnc-splash.c
+gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
+gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
+gnucash/gnome-utils/gnc-tree-control-split-reg.c
+gnucash/gnome-utils/gnc-tree-model-account.c
+gnucash/gnome-utils/gnc-tree-model-account-types.c
+gnucash/gnome-utils/gnc-tree-model-budget.c
+gnucash/gnome-utils/gnc-tree-model.c
+gnucash/gnome-utils/gnc-tree-model-commodity.c
+gnucash/gnome-utils/gnc-tree-model-owner.c
+gnucash/gnome-utils/gnc-tree-model-price.c
+gnucash/gnome-utils/gnc-tree-model-split-reg.c
+gnucash/gnome-utils/gnc-tree-util-split-reg.c
+gnucash/gnome-utils/gnc-tree-view-account.c
+gnucash/gnome-utils/gnc-tree-view.c
+gnucash/gnome-utils/gnc-tree-view-commodity.c
+gnucash/gnome-utils/gnc-tree-view-owner.c
+gnucash/gnome-utils/gnc-tree-view-price.c
+gnucash/gnome-utils/gnc-tree-view-split-reg.c
+gnucash/gnome-utils/gnc-tree-view-sx-list.c
+gnucash/gnome-utils/gnc-window.c
+gnucash/gnome-utils/gnome-utils.scm
+[type: gettext/gsettings]gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in
+[type: gettext/gsettings]gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in
+gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
+gnucash/gnome-utils/gtkbuilder/dialog-account.glade
+gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade
+gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade
+gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade
+gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade
+gnucash/gnome-utils/gtkbuilder/dialog-options.glade
+gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
+gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade
+gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
+gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade
+gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
+gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade
+gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade
+gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade
+gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade
+gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade
+gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
+gnucash/gnome-utils/misc-gnome-utils.c
+gnucash/gnome-utils/print-session.c
+gnucash/gnome-utils/search-param.c
+gnucash/gnome-utils/tree-view-utils.c
+gnucash/gnome-utils/window-main-summarybar.c
+gnucash/html/gnc-html.c
+gnucash/html/gnc-html-factory.c
+gnucash/html/gnc-html-history.c
+gnucash/html/gnc-html-webkit1.c
+gnucash/html/gnc-html-webkit2.c
+gnucash/html/gncmod-html.c
+gnucash/import-export/aqb/assistant-ab-initial.c
+gnucash/import-export/aqb/assistant-ab-initial.glade
+gnucash/import-export/aqb/dialog-ab-daterange.c
+gnucash/import-export/aqb/dialog-ab.glade
+gnucash/import-export/aqb/dialog-ab-pref.glade
+gnucash/import-export/aqb/dialog-ab-trans.c
+gnucash/import-export/aqb/gnc-ab-getbalance.c
+gnucash/import-export/aqb/gnc-ab-gettrans.c
+gnucash/import-export/aqb/gnc-ab-kvp.c
+gnucash/import-export/aqb/gnc-ab-transfer.c
+gnucash/import-export/aqb/gnc-ab-utils.c
+gnucash/import-export/aqb/gnc-file-aqb-import.c
+gnucash/import-export/aqb/gnc-gwen-gui.c
+gnucash/import-export/aqb/gncmod-aqbanking.c
+gnucash/import-export/aqb/gnc-plugin-aqbanking.c
+[type: gettext/gsettings]gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in
+gnucash/import-export/csv-exp/assistant-csv-export.c
+gnucash/import-export/csv-exp/assistant-csv-export.glade
+gnucash/import-export/csv-exp/csv-transactions-export.c
+gnucash/import-export/csv-exp/csv-tree-export.c
+gnucash/import-export/csv-exp/gncmod-csv-export.c
+gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
+[type: gettext/gsettings]gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in
+gnucash/import-export/csv-imp/assistant-csv-account-import.c
+gnucash/import-export/csv-imp/assistant-csv-account-import.glade
+gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+gnucash/import-export/csv-imp/assistant-csv-trans-import.glade
+gnucash/import-export/csv-imp/csv-account-import.c
+gnucash/import-export/csv-imp/gnc-csv-account-map.c
+gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
+gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
+gnucash/import-export/csv-imp/gnc-csv-trans-settings.cpp
+gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
+gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
+gnucash/import-export/csv-imp/gncmod-csv-import.c
+gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
+gnucash/import-export/csv-imp/gnc-tokenizer.cpp
+gnucash/import-export/csv-imp/gnc-trans-props.cpp
+gnucash/import-export/csv-imp/gnc-tx-import.cpp
+[type: gettext/gsettings]gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in
+gnucash/import-export/dialog-import.glade
+gnucash/import-export/gncmod-generic-import.c
+[type: gettext/gsettings]gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in
+gnucash/import-export/import-account-matcher.c
+gnucash/import-export/import-backend.c
+gnucash/import-export/import-commodity-matcher.c
+gnucash/import-export/import-format-dialog.c
+gnucash/import-export/import-main-matcher.c
+gnucash/import-export/import-match-picker.c
+gnucash/import-export/import-parse.c
+gnucash/import-export/import-pending-matches.c
+gnucash/import-export/import-settings.c
+gnucash/import-export/import-utilities.c
+gnucash/import-export/log-replay/gnc-log-replay.c
+gnucash/import-export/log-replay/gncmod-log-replay.c
+gnucash/import-export/log-replay/gnc-plugin-log-replay.c
+gnucash/import-export/ofx/gncmod-ofx-import.c
+gnucash/import-export/ofx/gnc-ofx-import.c
+gnucash/import-export/ofx/gnc-ofx-kvp.c
+gnucash/import-export/ofx/gnc-plugin-ofx.c
+[type: gettext/gsettings]gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in
+gnucash/import-export/qif/qif-context.c
+gnucash/import-export/qif/qif-file.c
+gnucash/import-export/qif/qif-objects.c
+gnucash/import-export/qif-imp/assistant-qif-import.c
+gnucash/import-export/qif-imp/assistant-qif-import.glade
+gnucash/import-export/qif-imp/dialog-account-picker.c
+gnucash/import-export/qif-imp/dialog-account-picker.glade
+gnucash/import-export/qif-imp/gncmod-qif-import.c
+gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
+[type: gettext/gsettings]gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in
+gnucash/import-export/qif-imp/qif-dialog-utils.scm
+gnucash/import-export/qif-imp/qif-file.scm
+gnucash/import-export/qif-imp/qif-guess-map.scm
+gnucash/import-export/qif-imp/qif-import.scm
+gnucash/import-export/qif-imp/qif-merge-groups.scm
+gnucash/import-export/qif-imp/qif-objects.scm
+gnucash/import-export/qif-imp/qif-parse.scm
+gnucash/import-export/qif-imp/qif-to-gnc.scm
+gnucash/import-export/qif-imp/qif-utils.scm
+gnucash/plugins/bi_import/dialog-bi-import.c
+gnucash/plugins/bi_import/dialog-bi-import-gui.c
+gnucash/plugins/bi_import/dialog-bi-import-helper.c
+gnucash/plugins/bi_import/gncmod-bi-import.c
+gnucash/plugins/bi_import/gnc-plugin-bi-import.c
+gnucash/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade
+gnucash/plugins/customer_import/dialog-customer-import.c
+gnucash/plugins/customer_import/dialog-customer-import-gui.c
+gnucash/plugins/customer_import/gnc-plugin-customer_import.c
+gnucash/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
+gnucash/plugins/customer_import/libgncmod-customer_import.c
+gnucash/plugins/example/gncmod-example.c
+gnucash/plugins/example/gnc-plugin.example.c
+gnucash/python/gncmod-python.c
+gnucash/register/ledger-core/gncEntryLedger.c
+gnucash/register/ledger-core/gncEntryLedgerControl.c
+gnucash/register/ledger-core/gncEntryLedgerDisplay.c
+gnucash/register/ledger-core/gncEntryLedgerLayout.c
+gnucash/register/ledger-core/gncEntryLedgerLoad.c
+gnucash/register/ledger-core/gncEntryLedgerModel.c
+gnucash/register/ledger-core/gnc-ledger-display2.c
+gnucash/register/ledger-core/gnc-ledger-display.c
+gnucash/register/ledger-core/gncmod-ledger-core.c
+gnucash/register/ledger-core/split-register.c
+gnucash/register/ledger-core/split-register-control.c
+gnucash/register/ledger-core/split-register-layout.c
+gnucash/register/ledger-core/split-register-load.c
+gnucash/register/ledger-core/split-register-model.c
+gnucash/register/ledger-core/split-register-model-save.c
+gnucash/register/ledger-core/split-register-util.c
+gnucash/register/register-core/basiccell.c
+gnucash/register/register-core/cellblock.c
+gnucash/register/register-core/cell-factory.c
+gnucash/register/register-core/checkboxcell.c
+gnucash/register/register-core/formulacell.c
+gnucash/register/register-core/gncmod-register-core.c
+gnucash/register/register-core/gtable.c
+gnucash/register/register-core/numcell.c
+gnucash/register/register-core/pricecell.c
+gnucash/register/register-core/quickfillcell.c
+gnucash/register/register-core/recncell.c
+gnucash/register/register-core/register-common.c
+gnucash/register/register-core/table-allgui.c
+gnucash/register/register-core/table-control.c
+gnucash/register/register-core/table-layout.c
+gnucash/register/register-core/table-model.c
+gnucash/register/register-gnome/combocell-gnome.c
+gnucash/register/register-gnome/datecell-gnome.c
+gnucash/register/register-gnome/formulacell-gnome.c
+gnucash/register/register-gnome/gncmod-register-gnome.c
+gnucash/register/register-gnome/gnucash-color.c
+gnucash/register/register-gnome/gnucash-cursor.c
+gnucash/register/register-gnome/gnucash-date-picker.c
+gnucash/register/register-gnome/gnucash-header.c
+gnucash/register/register-gnome/gnucash-item-edit.c
+gnucash/register/register-gnome/gnucash-item-list.c
+gnucash/register/register-gnome/gnucash-register.c
+gnucash/register/register-gnome/gnucash-scrolled-window.c
+gnucash/register/register-gnome/gnucash-sheet.c
+gnucash/register/register-gnome/gnucash-sheet-private.c
+gnucash/register/register-gnome/gnucash-style.c
+gnucash/register/register-gnome/pricecell-gnome.c
+gnucash/register/register-gnome/quickfillcell-gnome.c
+gnucash/register/register-gnome/table-gnome.c
+gnucash/report/business-reports/aging.scm
+gnucash/report/business-reports/balsheet-eg.eguile.scm
+gnucash/report/business-reports/balsheet-eg.scm
+gnucash/report/business-reports/business-reports.scm
+gnucash/report/business-reports/customer-summary.scm
+gnucash/report/business-reports/easy-invoice.scm
+gnucash/report/business-reports/fancy-invoice.scm
+gnucash/report/business-reports/invoice.scm
+gnucash/report/business-reports/job-report.scm
+gnucash/report/business-reports/owner-report.scm
+gnucash/report/business-reports/payables.scm
+gnucash/report/business-reports/receipt.eguile.scm
+gnucash/report/business-reports/receipt.scm
+gnucash/report/business-reports/receivables.scm
+gnucash/report/business-reports/taxinvoice.eguile.scm
+gnucash/report/business-reports/taxinvoice.scm
+gnucash/report/locale-specific/us/de_DE.scm
+gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
+gnucash/report/locale-specific/us/taxtxf-de_DE.scm
+gnucash/report/locale-specific/us/taxtxf.scm
+gnucash/report/locale-specific/us/us.scm
+gnucash/report/report-gnome/dialog-custom-report.c
+gnucash/report/report-gnome/dialog-custom-report.glade
+gnucash/report/report-gnome/dialog-report-column-view.c
+gnucash/report/report-gnome/dialog-report.glade
+gnucash/report/report-gnome/dialog-report-style-sheet.c
+gnucash/report/report-gnome/gncmod-report-gnome.c
+gnucash/report/report-gnome/gnc-plugin-page-report.c
+gnucash/report/report-gnome/report-gnome.scm
+gnucash/report/report-gnome/window-report.c
+gnucash/report/report-system/collectors.scm
+gnucash/report/report-system/commodity-utilities.scm
+gnucash/report/report-system/eguile-gnc.scm
+gnucash/report/report-system/eguile-html-utilities.scm
+gnucash/report/report-system/eguile-utilities.scm
+gnucash/report/report-system/gncmod-report-system.c
+gnucash/report/report-system/gnc-report.c
+gnucash/report/report-system/html-acct-table.scm
+gnucash/report/report-system/html-barchart.scm
+gnucash/report/report-system/html-document.scm
+gnucash/report/report-system/html-fonts.scm
+gnucash/report/report-system/html-jqplot.scm
+gnucash/report/report-system/html-linechart.scm
+gnucash/report/report-system/html-piechart.scm
+gnucash/report/report-system/html-scatter.scm
+gnucash/report/report-system/html-style-info.scm
+gnucash/report/report-system/html-style-sheet.scm
+gnucash/report/report-system/html-table.scm
+gnucash/report/report-system/html-text.scm
+gnucash/report/report-system/html-utilities.scm
+gnucash/report/report-system/list-extras.scm
+gnucash/report/report-system/options-utilities.scm
+gnucash/report/report-system/report-collectors.scm
+gnucash/report/report-system/report.scm
+gnucash/report/report-system/report-system.scm
+gnucash/report/report-system/report-utilities.scm
+gnucash/report/standard-reports/account-piecharts.scm
+gnucash/report/standard-reports/account-summary.scm
+gnucash/report/standard-reports/advanced-portfolio.scm
+gnucash/report/standard-reports/average-balance.scm
+gnucash/report/standard-reports/balance-sheet.scm
+gnucash/report/standard-reports/budget-balance-sheet.scm
+gnucash/report/standard-reports/budget-barchart.scm
+gnucash/report/standard-reports/budget-flow.scm
+gnucash/report/standard-reports/budget-income-statement.scm
+gnucash/report/standard-reports/budget.scm
+gnucash/report/standard-reports/cash-flow.scm
+gnucash/report/standard-reports/category-barchart.scm
+gnucash/report/standard-reports/daily-reports.scm
+gnucash/report/standard-reports/equity-statement.scm
+gnucash/report/standard-reports/general-journal.scm
+gnucash/report/standard-reports/general-ledger.scm
+gnucash/report/standard-reports/income-statement.scm
+gnucash/report/standard-reports/net-barchart.scm
+gnucash/report/standard-reports/net-linechart.scm
+gnucash/report/standard-reports/portfolio.scm
+gnucash/report/standard-reports/price-scatter.scm
+gnucash/report/standard-reports/register.scm
+gnucash/report/standard-reports/standard-reports.scm
+gnucash/report/standard-reports/sx-summary.scm
+gnucash/report/standard-reports/transaction.scm
+gnucash/report/standard-reports/trial-balance.scm
+gnucash/report/stylesheets/gncmod-stylesheets.c
+gnucash/report/stylesheets/gnc-plugin-stylesheets.c
+gnucash/report/stylesheets/stylesheet-easy.scm
+gnucash/report/stylesheets/stylesheet-fancy.scm
+gnucash/report/stylesheets/stylesheet-footer.scm
+gnucash/report/stylesheets/stylesheet-head-or-tail.scm
+gnucash/report/stylesheets/stylesheet-plain.scm
+gnucash/report/stylesheets/stylesheets.scm
+gnucash/report/utility-reports/hello-world.scm
+gnucash/report/utility-reports/utility-reports.scm
+gnucash/report/utility-reports/view-column.scm
+gnucash/report/utility-reports/welcome-to-gnucash.scm
 lib/goffice/go-charmap-sel.c
 lib/goffice/go-glib-extras.c
 lib/goffice/go-optionmenu.c
@@ -7,676 +468,215 @@ lib/libc/libc-missing-noop.c
 lib/libc/setenv.c
 lib/libc/strfmon.c
 lib/libc/strptime.c
-src/app-utils/app-utils.scm
-src/app-utils/business-helpers.c
-src/app-utils/business-options.c
-src/app-utils/business-options.scm
-src/app-utils/business-prefs.scm
-src/app-utils/calculation/expression_parser.c
-src/app-utils/calculation/fin.c
-src/app-utils/c-interface.scm
-src/app-utils/config-var.scm
-src/app-utils/date-utilities.scm
-src/app-utils/file-utils.c
-src/app-utils/gettext.scm
-src/app-utils/gfec.c
-src/app-utils/gnc-accounting-period.c
-src/app-utils/gnc-account-merge.c
-src/app-utils/gnc-addr-quickfill.c
-src/app-utils/gnc-component-manager.c
-src/app-utils/gnc-entry-quickfill.c
-src/app-utils/gnc-euro.c
-src/app-utils/gnc-exp-parser.c
-src/app-utils/gnc-gdate-utils.c
-src/app-utils/gnc-gettext-util.c
-src/app-utils/gnc-gsettings.c
-src/app-utils/gnc-helpers.c
-src/app-utils/gnc-help-utils.c
-src/app-utils/gncmod-app-utils.c
-src/app-utils/gnc-prefs-utils.c
-src/app-utils/gnc-state.c
-src/app-utils/gnc-sx-instance-model.c
-src/app-utils/gnc-ui-balances.c
-src/app-utils/gnc-ui-util.c
-src/app-utils/guile-util.c
-src/app-utils/hooks.scm
-src/app-utils/migrate-prefs.scm
-src/app-utils/options.scm
-src/app-utils/option-util.c
-src/app-utils/prefs.scm
-src/app-utils/QuickFill.c
-src/app-utils/simple-obj.scm
-src/backend/dbi/gnc-backend-dbi.cpp
-src/backend/dbi/gnc-dbisqlconnection.cpp
-src/backend/dbi/gnc-dbisqlresult.cpp
-src/backend/sql/escape.cpp
-src/backend/sql/gnc-account-sql.cpp
-src/backend/sql/gnc-address-sql.cpp
-src/backend/sql/gnc-bill-term-sql.cpp
-src/backend/sql/gnc-book-sql.cpp
-src/backend/sql/gnc-budget-sql.cpp
-src/backend/sql/gnc-commodity-sql.cpp
-src/backend/sql/gnc-customer-sql.cpp
-src/backend/sql/gnc-employee-sql.cpp
-src/backend/sql/gnc-entry-sql.cpp
-src/backend/sql/gnc-invoice-sql.cpp
-src/backend/sql/gnc-job-sql.cpp
-src/backend/sql/gnc-lots-sql.cpp
-src/backend/sql/gnc-order-sql.cpp
-src/backend/sql/gnc-owner-sql.cpp
-src/backend/sql/gnc-price-sql.cpp
-src/backend/sql/gnc-recurrence-sql.cpp
-src/backend/sql/gnc-schedxaction-sql.cpp
-src/backend/sql/gnc-slots-sql.cpp
-src/backend/sql/gnc-sql-backend.cpp
-src/backend/sql/gnc-sql-column-table-entry.cpp
-src/backend/sql/gnc-sql-object-backend.cpp
-src/backend/sql/gnc-sql-result.cpp
-src/backend/sql/gnc-tax-table-sql.cpp
-src/backend/sql/gnc-transaction-sql.cpp
-src/backend/sql/gnc-vendor-sql.cpp
-src/backend/xml/gnc-account-xml-v2.cpp
-src/backend/xml/gnc-address-xml-v2.cpp
-src/backend/xml/gnc-backend-xml.cpp
-src/backend/xml/gnc-bill-term-xml-v2.cpp
-src/backend/xml/gnc-book-xml-v2.cpp
-src/backend/xml/gnc-budget-xml-v2.cpp
-src/backend/xml/gnc-commodity-xml-v2.cpp
-src/backend/xml/gnc-customer-xml-v2.cpp
-src/backend/xml/gnc-employee-xml-v2.cpp
-src/backend/xml/gnc-entry-xml-v2.cpp
-src/backend/xml/gnc-freqspec-xml-v2.cpp
-src/backend/xml/gnc-invoice-xml-v2.cpp
-src/backend/xml/gnc-job-xml-v2.cpp
-src/backend/xml/gnc-lot-xml-v2.cpp
-src/backend/xml/gnc-order-xml-v2.cpp
-src/backend/xml/gnc-owner-xml-v2.cpp
-src/backend/xml/gnc-pricedb-xml-v2.cpp
-src/backend/xml/gnc-recurrence-xml-v2.cpp
-src/backend/xml/gnc-schedxaction-xml-v2.cpp
-src/backend/xml/gnc-tax-table-xml-v2.cpp
-src/backend/xml/gnc-transaction-xml-v2.cpp
-src/backend/xml/gnc-vendor-xml-v2.cpp
-src/backend/xml/gnc-xml-backend.cpp
-src/backend/xml/gnc-xml-helper.cpp
-src/backend/xml/io-example-account.cpp
-src/backend/xml/io-gncxml-gen.cpp
-src/backend/xml/io-gncxml-v1.cpp
-src/backend/xml/io-gncxml-v2.cpp
-src/backend/xml/io-utils.cpp
-src/backend/xml/sixtp.cpp
-src/backend/xml/sixtp-dom-generators.cpp
-src/backend/xml/sixtp-dom-parsers.cpp
-src/backend/xml/sixtp-stack.cpp
-src/backend/xml/sixtp-to-dom-parser.cpp
-src/backend/xml/sixtp-utils.cpp
-src/bin/gnucash-bin.c
-src/core-utils/binreloc.c
-src/core-utils/core-utils.scm
-src/core-utils/gnc-environment.c
-src/core-utils/gnc-filepath-utils.c
-src/core-utils/gnc-gkeyfile-utils.c
-src/core-utils/gnc-glib-utils.c
-src/core-utils/gnc-guile-utils.c
-src/core-utils/gnc-jalali.c
-src/core-utils/gnc-locale-utils.c
-src/core-utils/gnc-path.c
-src/core-utils/gnc-prefs.c
-src/doc/doxygen_main_page.c
-src/engine/Account.c
-src/engine/business-core.scm
-src/engine/cap-gains.c
-src/engine/cashobjects.c
-src/engine/commodity-table.scm
-src/engine/engine-helpers.c
-src/engine/engine-interface.scm
-src/engine/engine.scm
-src/engine/engine-utilities.scm
-src/engine/glib-helpers.c
-src/engine/gncAddress.c
-src/engine/gnc-aqbanking-templates.cpp
-src/engine/gncBillTerm.c
-src/engine/gnc-budget.c
-src/engine/gncBusGuile.c
-src/engine/gncBusiness.c
-src/engine/gnc-commodity.c
-src/engine/gncCustomer.c
-src/engine/gnc-date.cpp
-src/engine/gnc-datetime.cpp
-src/engine/gncEmployee.c
-src/engine/gnc-engine.c
-src/engine/gncEntry.c
-src/engine/gnc-event.c
-src/engine/gnc-features.c
-src/engine/gnc-hooks.c
-src/engine/gncIDSearch.c
-src/engine/gnc-int128.cpp
-src/engine/gncInvoice.c
-src/engine/gncJob.c
-src/engine/gnc-lot.c
-src/engine/gncmod-engine.c
-src/engine/gnc-numeric.cpp
-src/engine/gnc-numeric.scm
-src/engine/gncOrder.c
-src/engine/gncOwner.c
-src/engine/gnc-pricedb.c
-src/engine/gnc-rational.cpp
-src/engine/gnc-session.c
-src/engine/gncTaxTable.c
-src/engine/gnc-timezone.cpp
-src/engine/gnc-uri-utils.c
-src/engine/gncVendor.c
-src/engine/guid.cpp
-src/engine/kvp-frame.cpp
-src/engine/kvp-scm.cpp
-src/engine/kvp-value.cpp
-src/engine/policy.c
-src/engine/qof-backend.cpp
-src/engine/qofbook.cpp
-src/engine/qofchoice.cpp
-src/engine/qofclass.cpp
-src/engine/qofevent.cpp
-src/engine/qofid.cpp
-src/engine/qofinstance.cpp
-src/engine/qoflog.cpp
-src/engine/qofobject.cpp
-src/engine/qofquerycore.cpp
-src/engine/qofquery.cpp
-src/engine/qofsession.cpp
-src/engine/qof-string-cache.cpp
-src/engine/qofutil.cpp
-src/engine/qof-win32.cpp
-src/engine/Query.c
-src/engine/Recurrence.c
-src/engine/SchedXaction.c
-src/engine/Scrub2.c
-src/engine/Scrub3.c
-src/engine/ScrubBusiness.c
-src/engine/Scrub.c
-src/engine/Split.c
-src/engine/SX-book.c
-src/engine/SX-ttinfo.c
-src/engine/Transaction.c
-src/engine/TransLog.c
-src/gnc-module/gnc-module.c
-src/gnc-module/gnc-module.scm
-src/gnome/assistant-acct-period.c
-src/gnome/assistant-hierarchy.c
-src/gnome/assistant-loan.c
-src/gnome/assistant-stock-split.c
-src/gnome/business-gnome-utils.c
-src/gnome/business-options-gnome.c
-src/gnome/business-urls.c
-src/gnome/dialog-billterms.c
-src/gnome/dialog-choose-owner.c
-src/gnome/dialog-commodities.c
-src/gnome/dialog-customer.c
-src/gnome/dialog-date-close.c
-src/gnome/dialog-employee.c
-src/gnome/dialog-fincalc.c
-src/gnome/dialog-find-account.c
-src/gnome/dialog-find-transactions2.c
-src/gnome/dialog-find-transactions.c
-src/gnome/dialog-imap-editor.c
-src/gnome/dialog-invoice.c
-src/gnome/dialog-job.c
-src/gnome/dialog-lot-viewer.c
-src/gnome/dialog-new-user.c
-src/gnome/dialog-order.c
-src/gnome/dialog-payment.c
-src/gnome/dialog-price-edit-db.c
-src/gnome/dialog-price-editor.c
-src/gnome/dialog-print-check.c
-src/gnome/dialog-progress.c
-src/gnome/dialog-sx-editor2.c
-src/gnome/dialog-sx-editor.c
-src/gnome/dialog-sx-from-trans.c
-src/gnome/dialog-sx-since-last-run.c
-src/gnome/dialog-tax-info.c
-src/gnome/dialog-trans-assoc.c
-src/gnome/dialog-vendor.c
-src/gnome/gnc-budget-view.c
-src/gnome/gnc-plugin-account-tree.c
-src/gnome/gnc-plugin-basic-commands.c
-src/gnome/gnc-plugin-budget.c
-src/gnome/gnc-plugin-business.c
-src/gnome/gnc-plugin-page-account-tree.c
-src/gnome/gnc-plugin-page-budget.c
-src/gnome/gnc-plugin-page-invoice.c
-src/gnome/gnc-plugin-page-owner-tree.c
-src/gnome/gnc-plugin-page-register2.c
-src/gnome/gnc-plugin-page-register.c
-src/gnome/gnc-plugin-page-sx-list.c
-src/gnome/gnc-plugin-register2.c
-src/gnome/gnc-plugin-register.c
-src/gnome/gnc-split-reg2.c
-src/gnome/gnc-split-reg.c
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in
-src/gnome/gtkbuilder/assistant-acct-period.glade
-src/gnome/gtkbuilder/assistant-hierarchy.glade
-src/gnome/gtkbuilder/assistant-loan.glade
-src/gnome/gtkbuilder/assistant-stock-split.glade
-src/gnome/gtkbuilder/business-options-gnome.glade
-src/gnome/gtkbuilder/business-prefs.glade
-src/gnome/gtkbuilder/dialog-billterms.glade
-src/gnome/gtkbuilder/dialog-choose-owner.glade
-src/gnome/gtkbuilder/dialog-commodities.glade
-src/gnome/gtkbuilder/dialog-customer.glade
-src/gnome/gtkbuilder/dialog-date-close.glade
-src/gnome/gtkbuilder/dialog-employee.glade
-src/gnome/gtkbuilder/dialog-fincalc.glade
-src/gnome/gtkbuilder/dialog-find-account.glade
-src/gnome/gtkbuilder/dialog-imap-editor.glade
-src/gnome/gtkbuilder/dialog-invoice.glade
-src/gnome/gtkbuilder/dialog-job.glade
-src/gnome/gtkbuilder/dialog-lot-viewer.glade
-src/gnome/gtkbuilder/dialog-new-user.glade
-src/gnome/gtkbuilder/dialog-order.glade
-src/gnome/gtkbuilder/dialog-payment.glade
-src/gnome/gtkbuilder/dialog-price.glade
-src/gnome/gtkbuilder/dialog-print-check.glade
-src/gnome/gtkbuilder/dialog-progress.glade
-src/gnome/gtkbuilder/dialog-sx.glade
-src/gnome/gtkbuilder/dialog-tax-info.glade
-src/gnome/gtkbuilder/dialog-trans-assoc.glade
-src/gnome/gtkbuilder/dialog-vendor.glade
-src/gnome/gtkbuilder/gnc-plugin-page-budget.glade
-src/gnome/gtkbuilder/gnc-plugin-page-register2.glade
-src/gnome/gtkbuilder/gnc-plugin-page-register.glade
-src/gnome/gtkbuilder/window-autoclear.glade
-src/gnome/gtkbuilder/window-reconcile.glade
-src/gnome/reconcile-view.c
-src/gnome/search-owner.c
-src/gnome/top-level.c
-src/gnome/window-autoclear.c
-src/gnome/window-reconcile2.c
-src/gnome/window-reconcile.c
-src/gnome-search/dialog-search.c
-src/gnome-search/dialog-search.glade
-src/gnome-search/gnc-general-search.c
-src/gnome-search/gncmod-gnome-search.c
-src/gnome-search/search-account.c
-src/gnome-search/search-boolean.c
-src/gnome-search/search-core-type.c
-src/gnome-search/search-core-utils.c
-src/gnome-search/search-date.c
-src/gnome-search/search-double.c
-src/gnome-search/search-int64.c
-src/gnome-search/search-numeric.c
-src/gnome-search/search-reconciled.c
-src/gnome-search/search-string.c
-src/gnome-utils/account-quickfill.c
-src/gnome-utils/assistant-xml-encoding.c
-src/gnome-utils/cursors.c
-src/gnome-utils/dialog-account.c
-src/gnome-utils/dialog-book-close.c
-src/gnome-utils/dialog-commodity.c
-src/gnome-utils/dialog-dup-trans.c
-src/gnome-utils/dialog-file-access.c
-src/gnome-utils/dialog-object-references.c
-src/gnome-utils/dialog-options.c
-src/gnome-utils/dialog-preferences.c
-src/gnome-utils/dialog-query-view.c
-src/gnome-utils/dialog-reset-warnings.c
-src/gnome-utils/dialog-tax-table.c
-src/gnome-utils/dialog-totd.c
-src/gnome-utils/dialog-transfer.c
-src/gnome-utils/dialog-userpass.c
-src/gnome-utils/dialog-utils.c
-src/gnome-utils/gnc-account-sel.c
-src/gnome-utils/gnc-amount-edit.c
-src/gnome-utils/gnc-autosave.c
-src/gnome-utils/gnc-cell-renderer-date.c
-src/gnome-utils/gnc-cell-renderer-popup.c
-src/gnome-utils/gnc-cell-renderer-popup-entry.c
-src/gnome-utils/gnc-combott.c
-src/gnome-utils/gnc-commodity-edit.c
-src/gnome-utils/gnc-currency-edit.c
-src/gnome-utils/gnc-date-delta.c
-src/gnome-utils/gnc-date-edit.c
-src/gnome-utils/gnc-date-format.c
-src/gnome-utils/gnc-dense-cal.c
-src/gnome-utils/gnc-dense-cal-model.c
-src/gnome-utils/gnc-dense-cal-store.c
-src/gnome-utils/gnc-embedded-window.c
-src/gnome-utils/gnc-file.c
-src/gnome-utils/gnc-frequency.c
-src/gnome-utils/gnc-general-select.c
-src/gnome-utils/gnc-gnome-utils.c
-src/gnome-utils/gnc-gobject-utils.c
-src/gnome-utils/gnc-gtk-utils.c
-src/gnome-utils/gnc-gui-query.c
-src/gnome-utils/gnc-icons.c
-src/gnome-utils/gnc-keyring.c
-src/gnome-utils/gnc-main-window.c
-src/gnome-utils/gnc-menu-extensions.c
-src/gnome-utils/gnc-menu-extensions.scm
-src/gnome-utils/gncmod-gnome-utils.c
-src/gnome-utils/gnc-period-select.c
-src/gnome-utils/gnc-plugin.c
-src/gnome-utils/gnc-plugin-file-history.c
-src/gnome-utils/gnc-plugin-manager.c
-src/gnome-utils/gnc-plugin-menu-additions.c
-src/gnome-utils/gnc-plugin-page.c
-src/gnome-utils/gnc-query-view.c
-src/gnome-utils/gnc-recurrence.c
-src/gnome-utils/gnc-splash.c
-src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
-src/gnome-utils/gnc-sx-list-tree-model-adapter.c
-src/gnome-utils/gnc-tree-control-split-reg.c
-src/gnome-utils/gnc-tree-model-account.c
-src/gnome-utils/gnc-tree-model-account-types.c
-src/gnome-utils/gnc-tree-model-budget.c
-src/gnome-utils/gnc-tree-model.c
-src/gnome-utils/gnc-tree-model-commodity.c
-src/gnome-utils/gnc-tree-model-owner.c
-src/gnome-utils/gnc-tree-model-price.c
-src/gnome-utils/gnc-tree-model-split-reg.c
-src/gnome-utils/gnc-tree-util-split-reg.c
-src/gnome-utils/gnc-tree-view-account.c
-src/gnome-utils/gnc-tree-view.c
-src/gnome-utils/gnc-tree-view-commodity.c
-src/gnome-utils/gnc-tree-view-owner.c
-src/gnome-utils/gnc-tree-view-price.c
-src/gnome-utils/gnc-tree-view-split-reg.c
-src/gnome-utils/gnc-tree-view-sx-list.c
-src/gnome-utils/gnc-window.c
-src/gnome-utils/gnome-utils.scm
-[type: gettext/gsettings]src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in
-[type: gettext/gsettings]src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in
-src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
-src/gnome-utils/gtkbuilder/dialog-account.glade
-src/gnome-utils/gtkbuilder/dialog-book-close.glade
-src/gnome-utils/gtkbuilder/dialog-commodity.glade
-src/gnome-utils/gtkbuilder/dialog-file-access.glade
-src/gnome-utils/gtkbuilder/dialog-object-references.glade
-src/gnome-utils/gtkbuilder/dialog-options.glade
-src/gnome-utils/gtkbuilder/dialog-preferences.glade
-src/gnome-utils/gtkbuilder/dialog-query-view.glade
-src/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
-src/gnome-utils/gtkbuilder/dialog-tax-table.glade
-src/gnome-utils/gtkbuilder/dialog-totd.glade
-src/gnome-utils/gtkbuilder/dialog-transfer.glade
-src/gnome-utils/gtkbuilder/dialog-userpass.glade
-src/gnome-utils/gtkbuilder/gnc-date-format.glade
-src/gnome-utils/gtkbuilder/gnc-frequency.glade
-src/gnome-utils/gtkbuilder/gnc-recurrence.glade
-src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
-src/gnome-utils/misc-gnome-utils.c
-src/gnome-utils/print-session.c
-src/gnome-utils/search-param.c
-src/gnome-utils/tree-view-utils.c
-src/gnome-utils/window-main-summarybar.c
-src/html/gnc-html.c
-src/html/gnc-html-factory.c
-src/html/gnc-html-history.c
-src/html/gnc-html-webkit1.c
-src/html/gnc-html-webkit2.c
-src/html/gncmod-html.c
-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-pref.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-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.cpp
-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-account-map.c
-src/import-export/csv-imp/gnc-csv-gnumeric-popup.c
-src/import-export/csv-imp/gnc-csv-tokenizer.cpp
-src/import-export/csv-imp/gnc-csv-trans-settings.cpp
-src/import-export/csv-imp/gnc-dummy-tokenizer.cpp
-src/import-export/csv-imp/gnc-fw-tokenizer.cpp
-src/import-export/csv-imp/gncmod-csv-import.c
-src/import-export/csv-imp/gnc-plugin-csv-import.c
-src/import-export/csv-imp/gnc-tokenizer.cpp
-src/import-export/csv-imp/gnc-trans-props.cpp
-src/import-export/csv-imp/gnc-tx-import.cpp
-[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
-src/import-export/import-account-matcher.c
-src/import-export/import-backend.c
-src/import-export/import-commodity-matcher.c
-src/import-export/import-format-dialog.c
-src/import-export/import-main-matcher.c
-src/import-export/import-match-picker.c
-src/import-export/import-parse.c
-src/import-export/import-pending-matches.c
-src/import-export/import-settings.c
-src/import-export/import-utilities.c
-src/import-export/log-replay/gnc-log-replay.c
-src/import-export/log-replay/gncmod-log-replay.c
-src/import-export/log-replay/gnc-plugin-log-replay.c
-src/import-export/ofx/gncmod-ofx-import.c
-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/qif-context.c
-src/import-export/qif/qif-file.c
-src/import-export/qif/qif-objects.c
-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-imp/qif-dialog-utils.scm
-src/import-export/qif-imp/qif-file.scm
-src/import-export/qif-imp/qif-guess-map.scm
-src/import-export/qif-imp/qif-import.scm
-src/import-export/qif-imp/qif-merge-groups.scm
-src/import-export/qif-imp/qif-objects.scm
-src/import-export/qif-imp/qif-parse.scm
-src/import-export/qif-imp/qif-to-gnc.scm
-src/import-export/qif-imp/qif-utils.scm
-src/plugins/bi_import/dialog-bi-import.c
-src/plugins/bi_import/dialog-bi-import-gui.c
-src/plugins/bi_import/dialog-bi-import-helper.c
-src/plugins/bi_import/gncmod-bi-import.c
-src/plugins/bi_import/gnc-plugin-bi-import.c
-src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade
-src/plugins/customer_import/dialog-customer-import.c
-src/plugins/customer_import/dialog-customer-import-gui.c
-src/plugins/customer_import/gnc-plugin-customer_import.c
-src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
-src/plugins/customer_import/libgncmod-customer_import.c
-src/plugins/example/gncmod-example.c
-src/plugins/example/gnc-plugin.example.c
-src/python/gncmod-python.c
-src/register/ledger-core/gncEntryLedger.c
-src/register/ledger-core/gncEntryLedgerControl.c
-src/register/ledger-core/gncEntryLedgerDisplay.c
-src/register/ledger-core/gncEntryLedgerLayout.c
-src/register/ledger-core/gncEntryLedgerLoad.c
-src/register/ledger-core/gncEntryLedgerModel.c
-src/register/ledger-core/gnc-ledger-display2.c
-src/register/ledger-core/gnc-ledger-display.c
-src/register/ledger-core/gncmod-ledger-core.c
-src/register/ledger-core/split-register.c
-src/register/ledger-core/split-register-control.c
-src/register/ledger-core/split-register-layout.c
-src/register/ledger-core/split-register-load.c
-src/register/ledger-core/split-register-model.c
-src/register/ledger-core/split-register-model-save.c
-src/register/ledger-core/split-register-util.c
-src/register/register-core/basiccell.c
-src/register/register-core/cellblock.c
-src/register/register-core/cell-factory.c
-src/register/register-core/checkboxcell.c
-src/register/register-core/formulacell.c
-src/register/register-core/gncmod-register-core.c
-src/register/register-core/gtable.c
-src/register/register-core/numcell.c
-src/register/register-core/pricecell.c
-src/register/register-core/quickfillcell.c
-src/register/register-core/recncell.c
-src/register/register-core/register-common.c
-src/register/register-core/table-allgui.c
-src/register/register-core/table-control.c
-src/register/register-core/table-layout.c
-src/register/register-core/table-model.c
-src/register/register-gnome/combocell-gnome.c
-src/register/register-gnome/datecell-gnome.c
-src/register/register-gnome/formulacell-gnome.c
-src/register/register-gnome/gncmod-register-gnome.c
-src/register/register-gnome/gnucash-color.c
-src/register/register-gnome/gnucash-cursor.c
-src/register/register-gnome/gnucash-date-picker.c
-src/register/register-gnome/gnucash-header.c
-src/register/register-gnome/gnucash-item-edit.c
-src/register/register-gnome/gnucash-item-list.c
-src/register/register-gnome/gnucash-register.c
-src/register/register-gnome/gnucash-scrolled-window.c
-src/register/register-gnome/gnucash-sheet.c
-src/register/register-gnome/gnucash-sheet-private.c
-src/register/register-gnome/gnucash-style.c
-src/register/register-gnome/pricecell-gnome.c
-src/register/register-gnome/quickfillcell-gnome.c
-src/register/register-gnome/table-gnome.c
-src/report/business-reports/aging.scm
-src/report/business-reports/balsheet-eg.eguile.scm
-src/report/business-reports/balsheet-eg.scm
-src/report/business-reports/business-reports.scm
-src/report/business-reports/customer-summary.scm
-src/report/business-reports/easy-invoice.scm
-src/report/business-reports/fancy-invoice.scm
-src/report/business-reports/invoice.scm
-src/report/business-reports/job-report.scm
-src/report/business-reports/owner-report.scm
-src/report/business-reports/payables.scm
-src/report/business-reports/receipt.eguile.scm
-src/report/business-reports/receipt.scm
-src/report/business-reports/receivables.scm
-src/report/business-reports/taxinvoice.eguile.scm
-src/report/business-reports/taxinvoice.scm
-src/report/locale-specific/us/de_DE.scm
-src/report/locale-specific/us/gncmod-locale-reports-us.c
-src/report/locale-specific/us/taxtxf-de_DE.scm
-src/report/locale-specific/us/taxtxf.scm
-src/report/locale-specific/us/us.scm
-src/report/report-gnome/dialog-custom-report.c
-src/report/report-gnome/dialog-custom-report.glade
-src/report/report-gnome/dialog-report-column-view.c
-src/report/report-gnome/dialog-report.glade
-src/report/report-gnome/dialog-report-style-sheet.c
-src/report/report-gnome/gncmod-report-gnome.c
-src/report/report-gnome/gnc-plugin-page-report.c
-src/report/report-gnome/report-gnome.scm
-src/report/report-gnome/window-report.c
-src/report/report-system/collectors.scm
-src/report/report-system/commodity-utilities.scm
-src/report/report-system/eguile-gnc.scm
-src/report/report-system/eguile-html-utilities.scm
-src/report/report-system/eguile-utilities.scm
-src/report/report-system/gncmod-report-system.c
-src/report/report-system/gnc-report.c
-src/report/report-system/html-acct-table.scm
-src/report/report-system/html-barchart.scm
-src/report/report-system/html-document.scm
-src/report/report-system/html-fonts.scm
-src/report/report-system/html-jqplot.scm
-src/report/report-system/html-linechart.scm
-src/report/report-system/html-piechart.scm
-src/report/report-system/html-scatter.scm
-src/report/report-system/html-style-info.scm
-src/report/report-system/html-style-sheet.scm
-src/report/report-system/html-table.scm
-src/report/report-system/html-text.scm
-src/report/report-system/html-utilities.scm
-src/report/report-system/list-extras.scm
-src/report/report-system/options-utilities.scm
-src/report/report-system/report-collectors.scm
-src/report/report-system/report.scm
-src/report/report-system/report-system.scm
-src/report/report-system/report-utilities.scm
-src/report/standard-reports/account-piecharts.scm
-src/report/standard-reports/account-summary.scm
-src/report/standard-reports/advanced-portfolio.scm
-src/report/standard-reports/average-balance.scm
-src/report/standard-reports/balance-sheet.scm
-src/report/standard-reports/budget-balance-sheet.scm
-src/report/standard-reports/budget-barchart.scm
-src/report/standard-reports/budget-flow.scm
-src/report/standard-reports/budget-income-statement.scm
-src/report/standard-reports/budget.scm
-src/report/standard-reports/cash-flow.scm
-src/report/standard-reports/category-barchart.scm
-src/report/standard-reports/daily-reports.scm
-src/report/standard-reports/equity-statement.scm
-src/report/standard-reports/general-journal.scm
-src/report/standard-reports/general-ledger.scm
-src/report/standard-reports/income-statement.scm
-src/report/standard-reports/net-barchart.scm
-src/report/standard-reports/net-linechart.scm
-src/report/standard-reports/portfolio.scm
-src/report/standard-reports/price-scatter.scm
-src/report/standard-reports/register.scm
-src/report/standard-reports/standard-reports.scm
-src/report/standard-reports/sx-summary.scm
-src/report/standard-reports/transaction.scm
-src/report/standard-reports/trial-balance.scm
-src/report/stylesheets/gncmod-stylesheets.c
-src/report/stylesheets/gnc-plugin-stylesheets.c
-src/report/stylesheets/stylesheet-easy.scm
-src/report/stylesheets/stylesheet-fancy.scm
-src/report/stylesheets/stylesheet-footer.scm
-src/report/stylesheets/stylesheet-head-or-tail.scm
-src/report/stylesheets/stylesheet-plain.scm
-src/report/stylesheets/stylesheets.scm
-src/report/utility-reports/hello-world.scm
-src/report/utility-reports/utility-reports.scm
-src/report/utility-reports/view-column.scm
-src/report/utility-reports/welcome-to-gnucash.scm
-src/scm/fin.scm
-src/scm/gnumeric/gnumeric-utilities.scm
-src/scm/gnumeric/table-utils.scm
-src/scm/main.scm
-src/scm/price-quotes.scm
-src/scm/printf.scm
-src/scm/string.scm
-src/scm/substring-search.scm
-src/scm/xml-generator.scm
-src/tax/us/de_DE.scm
-src/tax/us/gncmod-tax-us.c
-src/tax/us/txf-de_DE.scm
-src/tax/us/txf-help-de_DE.scm
-src/tax/us/txf-help.scm
-src/tax/us/txf.scm
-src/tax/us/us.scm
-src/gnome/gnucash.appdata.xml.in
-src/gnome/gnucash.desktop.in.in
-src/engine/qofbookslots.h
+libgnucash/app-utils/app-utils.scm
+libgnucash/app-utils/business-helpers.c
+libgnucash/app-utils/business-options.c
+libgnucash/app-utils/business-options.scm
+libgnucash/app-utils/business-prefs.scm
+libgnucash/app-utils/calculation/expression_parser.c
+libgnucash/app-utils/calculation/fin.c
+libgnucash/app-utils/c-interface.scm
+libgnucash/app-utils/config-var.scm
+libgnucash/app-utils/date-utilities.scm
+libgnucash/app-utils/file-utils.c
+libgnucash/app-utils/gettext.scm
+libgnucash/app-utils/gfec.c
+libgnucash/app-utils/gnc-accounting-period.c
+libgnucash/app-utils/gnc-account-merge.c
+libgnucash/app-utils/gnc-addr-quickfill.c
+libgnucash/app-utils/gnc-component-manager.c
+libgnucash/app-utils/gnc-entry-quickfill.c
+libgnucash/app-utils/gnc-euro.c
+libgnucash/app-utils/gnc-exp-parser.c
+libgnucash/app-utils/gnc-gdate-utils.c
+libgnucash/app-utils/gnc-gettext-util.c
+libgnucash/app-utils/gnc-gsettings.c
+libgnucash/app-utils/gnc-helpers.c
+libgnucash/app-utils/gnc-help-utils.c
+libgnucash/app-utils/gncmod-app-utils.c
+libgnucash/app-utils/gnc-prefs-utils.c
+libgnucash/app-utils/gnc-state.c
+libgnucash/app-utils/gnc-sx-instance-model.c
+libgnucash/app-utils/gnc-ui-balances.c
+libgnucash/app-utils/gnc-ui-util.c
+libgnucash/app-utils/guile-util.c
+libgnucash/app-utils/hooks.scm
+libgnucash/app-utils/migrate-prefs.scm
+libgnucash/app-utils/options.scm
+libgnucash/app-utils/option-util.c
+libgnucash/app-utils/prefs.scm
+libgnucash/app-utils/QuickFill.c
+libgnucash/app-utils/simple-obj.scm
+libgnucash/backend/dbi/gnc-backend-dbi.cpp
+libgnucash/backend/dbi/gnc-dbisqlconnection.cpp
+libgnucash/backend/dbi/gnc-dbisqlresult.cpp
+libgnucash/backend/sql/escape.cpp
+libgnucash/backend/sql/gnc-account-sql.cpp
+libgnucash/backend/sql/gnc-address-sql.cpp
+libgnucash/backend/sql/gnc-bill-term-sql.cpp
+libgnucash/backend/sql/gnc-book-sql.cpp
+libgnucash/backend/sql/gnc-budget-sql.cpp
+libgnucash/backend/sql/gnc-commodity-sql.cpp
+libgnucash/backend/sql/gnc-customer-sql.cpp
+libgnucash/backend/sql/gnc-employee-sql.cpp
+libgnucash/backend/sql/gnc-entry-sql.cpp
+libgnucash/backend/sql/gnc-invoice-sql.cpp
+libgnucash/backend/sql/gnc-job-sql.cpp
+libgnucash/backend/sql/gnc-lots-sql.cpp
+libgnucash/backend/sql/gnc-order-sql.cpp
+libgnucash/backend/sql/gnc-owner-sql.cpp
+libgnucash/backend/sql/gnc-price-sql.cpp
+libgnucash/backend/sql/gnc-recurrence-sql.cpp
+libgnucash/backend/sql/gnc-schedxaction-sql.cpp
+libgnucash/backend/sql/gnc-slots-sql.cpp
+libgnucash/backend/sql/gnc-sql-backend.cpp
+libgnucash/backend/sql/gnc-sql-column-table-entry.cpp
+libgnucash/backend/sql/gnc-sql-object-backend.cpp
+libgnucash/backend/sql/gnc-sql-result.cpp
+libgnucash/backend/sql/gnc-tax-table-sql.cpp
+libgnucash/backend/sql/gnc-transaction-sql.cpp
+libgnucash/backend/sql/gnc-vendor-sql.cpp
+libgnucash/backend/xml/gnc-account-xml-v2.cpp
+libgnucash/backend/xml/gnc-address-xml-v2.cpp
+libgnucash/backend/xml/gnc-backend-xml.cpp
+libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp
+libgnucash/backend/xml/gnc-book-xml-v2.cpp
+libgnucash/backend/xml/gnc-budget-xml-v2.cpp
+libgnucash/backend/xml/gnc-commodity-xml-v2.cpp
+libgnucash/backend/xml/gnc-customer-xml-v2.cpp
+libgnucash/backend/xml/gnc-employee-xml-v2.cpp
+libgnucash/backend/xml/gnc-entry-xml-v2.cpp
+libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp
+libgnucash/backend/xml/gnc-invoice-xml-v2.cpp
+libgnucash/backend/xml/gnc-job-xml-v2.cpp
+libgnucash/backend/xml/gnc-lot-xml-v2.cpp
+libgnucash/backend/xml/gnc-order-xml-v2.cpp
+libgnucash/backend/xml/gnc-owner-xml-v2.cpp
+libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp
+libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp
+libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp
+libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp
+libgnucash/backend/xml/gnc-transaction-xml-v2.cpp
+libgnucash/backend/xml/gnc-vendor-xml-v2.cpp
+libgnucash/backend/xml/gnc-xml-backend.cpp
+libgnucash/backend/xml/gnc-xml-helper.cpp
+libgnucash/backend/xml/io-example-account.cpp
+libgnucash/backend/xml/io-gncxml-gen.cpp
+libgnucash/backend/xml/io-gncxml-v1.cpp
+libgnucash/backend/xml/io-gncxml-v2.cpp
+libgnucash/backend/xml/io-utils.cpp
+libgnucash/backend/xml/sixtp.cpp
+libgnucash/backend/xml/sixtp-dom-generators.cpp
+libgnucash/backend/xml/sixtp-dom-parsers.cpp
+libgnucash/backend/xml/sixtp-stack.cpp
+libgnucash/backend/xml/sixtp-to-dom-parser.cpp
+libgnucash/backend/xml/sixtp-utils.cpp
+libgnucash/core-utils/binreloc.c
+libgnucash/core-utils/core-utils.scm
+libgnucash/core-utils/gnc-environment.c
+libgnucash/core-utils/gnc-filepath-utils.c
+libgnucash/core-utils/gnc-gkeyfile-utils.c
+libgnucash/core-utils/gnc-glib-utils.c
+libgnucash/core-utils/gnc-guile-utils.c
+libgnucash/core-utils/gnc-jalali.c
+libgnucash/core-utils/gnc-locale-utils.c
+libgnucash/core-utils/gnc-path.c
+libgnucash/core-utils/gnc-prefs.c
+libgnucash/doc/doxygen_main_page.c
+libgnucash/engine/Account.c
+libgnucash/engine/business-core.scm
+libgnucash/engine/cap-gains.c
+libgnucash/engine/cashobjects.c
+libgnucash/engine/commodity-table.scm
+libgnucash/engine/engine-helpers.c
+libgnucash/engine/engine-interface.scm
+libgnucash/engine/engine.scm
+libgnucash/engine/engine-utilities.scm
+libgnucash/engine/glib-helpers.c
+libgnucash/engine/gncAddress.c
+libgnucash/engine/gnc-aqbanking-templates.cpp
+libgnucash/engine/gncBillTerm.c
+libgnucash/engine/gnc-budget.c
+libgnucash/engine/gncBusGuile.c
+libgnucash/engine/gncBusiness.c
+libgnucash/engine/gnc-commodity.c
+libgnucash/engine/gncCustomer.c
+libgnucash/engine/gnc-date.cpp
+libgnucash/engine/gnc-datetime.cpp
+libgnucash/engine/gncEmployee.c
+libgnucash/engine/gnc-engine.c
+libgnucash/engine/gncEntry.c
+libgnucash/engine/gnc-event.c
+libgnucash/engine/gnc-features.c
+libgnucash/engine/gnc-hooks.c
+libgnucash/engine/gncIDSearch.c
+libgnucash/engine/gnc-int128.cpp
+libgnucash/engine/gncInvoice.c
+libgnucash/engine/gncJob.c
+libgnucash/engine/gnc-lot.c
+libgnucash/engine/gncmod-engine.c
+libgnucash/engine/gnc-numeric.cpp
+libgnucash/engine/gnc-numeric.scm
+libgnucash/engine/gncOrder.c
+libgnucash/engine/gncOwner.c
+libgnucash/engine/gnc-pricedb.c
+libgnucash/engine/gnc-rational.cpp
+libgnucash/engine/gnc-session.c
+libgnucash/engine/gncTaxTable.c
+libgnucash/engine/gnc-timezone.cpp
+libgnucash/engine/gnc-uri-utils.c
+libgnucash/engine/gncVendor.c
+libgnucash/engine/guid.cpp
+libgnucash/engine/kvp-frame.cpp
+libgnucash/engine/kvp-scm.cpp
+libgnucash/engine/kvp-value.cpp
+libgnucash/engine/policy.c
+libgnucash/engine/qof-backend.cpp
+libgnucash/engine/qofbook.cpp
+libgnucash/engine/qofchoice.cpp
+libgnucash/engine/qofclass.cpp
+libgnucash/engine/qofevent.cpp
+libgnucash/engine/qofid.cpp
+libgnucash/engine/qofinstance.cpp
+libgnucash/engine/qoflog.cpp
+libgnucash/engine/qofobject.cpp
+libgnucash/engine/qofquerycore.cpp
+libgnucash/engine/qofquery.cpp
+libgnucash/engine/qofsession.cpp
+libgnucash/engine/qof-string-cache.cpp
+libgnucash/engine/qofutil.cpp
+libgnucash/engine/qof-win32.cpp
+libgnucash/engine/Query.c
+libgnucash/engine/Recurrence.c
+libgnucash/engine/SchedXaction.c
+libgnucash/engine/Scrub2.c
+libgnucash/engine/Scrub3.c
+libgnucash/engine/ScrubBusiness.c
+libgnucash/engine/Scrub.c
+libgnucash/engine/Split.c
+libgnucash/engine/SX-book.c
+libgnucash/engine/SX-ttinfo.c
+libgnucash/engine/Transaction.c
+libgnucash/engine/TransLog.c
+libgnucash/gnc-module/gnc-module.c
+libgnucash/gnc-module/gnc-module.scm
+libgnucash/scm/fin.scm
+libgnucash/scm/gnumeric/gnumeric-utilities.scm
+libgnucash/scm/gnumeric/table-utils.scm
+libgnucash/scm/main.scm
+libgnucash/scm/price-quotes.scm
+libgnucash/scm/printf.scm
+libgnucash/scm/string.scm
+libgnucash/scm/substring-search.scm
+libgnucash/scm/xml-generator.scm
+libgnucash/tax/us/de_DE.scm
+libgnucash/tax/us/gncmod-tax-us.c
+libgnucash/tax/us/txf-de_DE.scm
+libgnucash/tax/us/txf-help-de_DE.scm
+libgnucash/tax/us/txf-help.scm
+libgnucash/tax/us/txf.scm
+libgnucash/tax/us/us.scm
+gnucash/gnome/gnucash.appdata.xml.in
+gnucash/gnome/gnucash.desktop.in.in
+libgnucash/engine/qofbookslots.h
 doc/tip_of_the_day.list.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 11ae5e5156..38b05abcce 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,9 +1,9 @@
 # These are files that we don't want to translate, because they are
 # not distributed.
-src/backend/dbi/gncmod-backend-dbi.c
-src/backend/xml/gncmod-backend-xml.c
-src/backend/xml/gncmod-backend-xml.cpp
-src/gnome-utils/gnc-tree-model-selection.c
+libgnucash/backend/dbi/gncmod-backend-dbi.c
+libgnucash/backend/xml/gncmod-backend-xml.c
+libgnucash/backend/xml/gncmod-backend-xml.cpp
+gnucash/gnome-utils/gnc-tree-model-selection.c
 
 # Skip softlinks to scm files. These softlinks are created in builddir
 # for testing purposes, intltool-extract isn't smart enough to ignore
@@ -11,92 +11,91 @@ src/gnome-utils/gnc-tree-model-selection.c
 # and intltool-update use absolute paths to the srcdir when it's not
 # the same as builddir which messes up the file names in gnucash.pot.
 
-src/app-utils/gnucash/app-utils.scm
-src/app-utils/gnucash/gettext.scm
-src/business/business-gnome/gnucash/business-gnome.scm
-src/core-utils/gnucash/core-utils.scm
-src/engine/gnucash/business-core.scm
-src/engine/gnucash/engine.scm
-src/gnc-module/gnucash/gnc-module.scm
-src/gnome-utils/gnucash/gnome-utils.scm
-src/import-export/qif-imp/gnucash/import-export/qif-import.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-guess-map.scm
-src/import-export/qif-imp/qif-import/qif-import.scm
-src/import-export/qif-imp/qif-import/qif-merge-groups.scm
-src/import-export/qif-imp/qif-import/qif-objects.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-import/qif-utils.scm
-src/report/business-reports/gnucash/report/aging.scm
-src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
-src/report/business-reports/gnucash/report/balsheet-eg.scm
-src/report/business-reports/gnucash/report/business-reports.scm
-src/report/business-reports/gnucash/report/customer-summary.scm
-src/report/business-reports/gnucash/report/easy-invoice.scm
-src/report/business-reports/gnucash/report/fancy-invoice.scm
-src/report/business-reports/gnucash/report/invoice.scm
-src/report/business-reports/gnucash/report/job-report.scm
-src/report/business-reports/gnucash/report/owner-report.scm
-src/report/business-reports/gnucash/report/payables.scm
-src/report/business-reports/gnucash/report/receipt.eguile.scm
-src/report/business-reports/gnucash/report/receipt.scm
-src/report/business-reports/gnucash/report/receivables.scm
-src/report/business-reports/gnucash/report/taxinvoice.eguile.scm
-src/report/business-reports/gnucash/report/taxinvoice.scm
-src/report/locale-specific/us/gnucash/report/locale-specific/de_DE.scm
-src/report/locale-specific/us/gnucash/report/locale-specific/us.scm
-src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-src/report/locale-specific/us/gnucash/report/taxtxf.scm
-src/report/report-gnome/gnucash/report/report-gnome.scm
-src/report/report-system/gnucash/report/eguile-gnc.scm
-src/report/report-system/gnucash/report/eguile-html-utilities.scm
-src/report/report-system/gnucash/report/eguile-utilities.scm
-src/report/report-system/gnucash/report/report-system.scm
-src/report/report-system/gnucash/report/report-system/collectors.scm
-src/report/report-system/gnucash/report/report-system/list-extras.scm
-src/report/report-system/gnucash/report/report-system/report-collectors.scm
-src/report/standard-reports/gnucash/report/standard-reports.scm
-src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
-src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
-src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
-src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm
-src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm
-src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm
-src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm
-src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm
-src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm
-src/report/standard-reports/gnucash/report/standard-reports/budget.scm
-src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm
-src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm
-src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm
-src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm
-src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm
-src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm
-src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm
-src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm
-src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm
-src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm
-src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm
-src/report/standard-reports/gnucash/report/standard-reports/register.scm
-src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm
-src/report/standard-reports/gnucash/report/standard-reports/transaction.scm
-src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm
-src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
-src/report/stylesheets/gnucash/report/stylesheet-footer.scm
-src/report/stylesheets/gnucash/report/stylesheet-head-or-tail.scm
-src/report/stylesheets/gnucash/report/stylesheet-plain.scm
-src/report/stylesheets/gnucash/report/stylesheets.scm
-src/report/utility-reports/gnucash/report/hello-world.scm
-src/report/utility-reports/gnucash/report/utility-reports.scm
-src/report/utility-reports/gnucash/report/view-column.scm
-src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
-src/scm/build-config.scm
-src/scm/build-config.scm.in
-src/scm/gnucash/main.scm
-src/scm/gnucash/price-quotes.scm
-src/scm/gnucash/printf.scm
-src/tax/us/gnucash/tax/de_DE.scm
-src/tax/us/gnucash/tax/us.scm
+libgnucash/app-utils/gnucash/app-utils.scm
+libgnucash/app-utils/gnucash/gettext.scm
+libgnucash/core-utils/gnucash/core-utils.scm
+libgnucash/engine/gnucash/business-core.scm
+libgnucash/engine/gnucash/engine.scm
+libgnucash/gnc-module/gnucash/gnc-module.scm
+gnucash/gnome-utils/gnucash/gnome-utils.scm
+gnucash/import-export/qif-imp/gnucash/import-export/qif-import.scm
+gnucash/import-export/qif-imp/qif-import/qif-dialog-utils.scm
+gnucash/import-export/qif-imp/qif-import/qif-file.scm
+gnucash/import-export/qif-imp/qif-import/qif-guess-map.scm
+gnucash/import-export/qif-imp/qif-import/qif-import.scm
+gnucash/import-export/qif-imp/qif-import/qif-merge-groups.scm
+gnucash/import-export/qif-imp/qif-import/qif-objects.scm
+gnucash/import-export/qif-imp/qif-import/qif-parse.scm
+gnucash/import-export/qif-imp/qif-import/qif-to-gnc.scm
+gnucash/import-export/qif-imp/qif-import/qif-utils.scm
+gnucash/report/business-reports/gnucash/report/aging.scm
+gnucash/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
+gnucash/report/business-reports/gnucash/report/balsheet-eg.scm
+gnucash/report/business-reports/gnucash/report/business-reports.scm
+gnucash/report/business-reports/gnucash/report/customer-summary.scm
+gnucash/report/business-reports/gnucash/report/easy-invoice.scm
+gnucash/report/business-reports/gnucash/report/fancy-invoice.scm
+gnucash/report/business-reports/gnucash/report/invoice.scm
+gnucash/report/business-reports/gnucash/report/job-report.scm
+gnucash/report/business-reports/gnucash/report/owner-report.scm
+gnucash/report/business-reports/gnucash/report/payables.scm
+gnucash/report/business-reports/gnucash/report/receipt.eguile.scm
+gnucash/report/business-reports/gnucash/report/receipt.scm
+gnucash/report/business-reports/gnucash/report/receivables.scm
+gnucash/report/business-reports/gnucash/report/taxinvoice.eguile.scm
+gnucash/report/business-reports/gnucash/report/taxinvoice.scm
+gnucash/report/locale-specific/us/gnucash/report/locale-specific/de_DE.scm
+gnucash/report/locale-specific/us/gnucash/report/locale-specific/us.scm
+gnucash/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+gnucash/report/locale-specific/us/gnucash/report/taxtxf.scm
+gnucash/report/report-gnome/gnucash/report/report-gnome.scm
+gnucash/report/report-system/gnucash/report/eguile-gnc.scm
+gnucash/report/report-system/gnucash/report/eguile-html-utilities.scm
+gnucash/report/report-system/gnucash/report/eguile-utilities.scm
+gnucash/report/report-system/gnucash/report/report-system.scm
+gnucash/report/report-system/gnucash/report/report-system/collectors.scm
+gnucash/report/report-system/gnucash/report/report-system/list-extras.scm
+gnucash/report/report-system/gnucash/report/report-system/report-collectors.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/average-balance.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/budget.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/general-journal.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/income-statement.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/portfolio.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/register.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/transaction.scm
+gnucash/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm
+gnucash/report/stylesheets/gnucash/report/stylesheet-easy.scm
+gnucash/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+gnucash/report/stylesheets/gnucash/report/stylesheet-footer.scm
+gnucash/report/stylesheets/gnucash/report/stylesheet-head-or-tail.scm
+gnucash/report/stylesheets/gnucash/report/stylesheet-plain.scm
+gnucash/report/stylesheets/gnucash/report/stylesheets.scm
+gnucash/report/utility-reports/gnucash/report/hello-world.scm
+gnucash/report/utility-reports/gnucash/report/utility-reports.scm
+gnucash/report/utility-reports/gnucash/report/view-column.scm
+gnucash/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
+libgnucash/scm/build-config.scm
+libgnucash/scm/build-config.scm.in
+libgnucash/scm/gnucash/main.scm
+libgnucash/scm/gnucash/price-quotes.scm
+libgnucash/scm/gnucash/printf.scm
+libgnucash/tax/us/gnucash/tax/de_DE.scm
+libgnucash/tax/us/gnucash/tax/us.scm
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index 312a7e6eff..0000000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# CMakeLists.txt for src/
-
-# The subdirectories
-ADD_SUBDIRECTORY (core-utils)
-ADD_SUBDIRECTORY (debug)
-ADD_SUBDIRECTORY (doc)
-ADD_SUBDIRECTORY (gnc-module)
-ADD_SUBDIRECTORY (engine)
-ADD_SUBDIRECTORY (backend)
-ADD_SUBDIRECTORY (app-utils)
-ADD_SUBDIRECTORY (pixmaps)
-ADD_SUBDIRECTORY (quotes)
-ADD_SUBDIRECTORY (scm)
-ADD_SUBDIRECTORY (tax)
-ADD_SUBDIRECTORY (test-core)
-
-IF (WITH_GNUCASH)
-  ADD_SUBDIRECTORY (bin)
-  ADD_SUBDIRECTORY (cmake_modules)
-  ADD_SUBDIRECTORY (gnome)
-  ADD_SUBDIRECTORY (gnome-utils)
-  ADD_SUBDIRECTORY (gnome-search)
-  ADD_SUBDIRECTORY (html)
-  ADD_SUBDIRECTORY (import-export)
-  ADD_SUBDIRECTORY (optional)
-  ADD_SUBDIRECTORY (plugins)
-  ADD_SUBDIRECTORY (python)
-  ADD_SUBDIRECTORY (register)
-  ADD_SUBDIRECTORY(report)
-ENDIF (WITH_GNUCASH)
-
-SET(src_EXTRA_DIST
-        base-typemaps.i
-        config.h.cmake.in
-        gnc-test-env.pl
-        guile-mappings.h
-        platform.h
-        README
-        README.modules)
-
-SET_LOCAL_DIST(src_DIST_local CMakeLists.txt Makefile.am ${src_EXTRA_DIST})
-
-SET(src_DIST ${src_DIST_local} ${app_utils_DIST} ${backend_DIST} ${bin_DIST} ${cmake_modules_DIST}
-             ${core_utils_DIST} ${debug_DIST} ${doc_DIST} ${engine_DIST} ${gnc_module_DIST} ${gnome_DIST} ${gnome_search_DIST}
-             ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${optional_DIST} ${plugins_DIST} ${pixmaps_DIST} ${python_DIST}
-             ${quotes_DIST} ${register_DIST} ${report_DIST} ${scm_DIST} ${tax_DIST} ${test_core_DIST} PARENT_SCOPE)
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 00fe7b6ec2..0000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-# These directories do not contain any gtk dependencies
-# Note the unusual ordering of some test directories. This is
-# because test-core depends on engine and the test directories
-# in turn depend on test-core.
-NONGUI_SUBDIRS = \
-  debug \
-  doc \
-  pixmaps \
-  core-utils \
-  gnc-module \
-  engine \
-  test-core \
-  core-utils/test \
-  gnc-module/test \
-  engine/test \
-  backend \
-  scm \
-  quotes \
-  app-utils \
-  tax
-
-if WITH_PYTHON
-   PYTHON_DIR = python
-endif
-
-# These directories should also not contain any gtk dependencies, but
-# currently there is a gtk based console in the python bindings
-# that should probably live elsewhere.
-ALMOST_NONGUI_SUBDIRS = \
-  ${PYTHON_DIR}
-
-# These directories contain the code with gtk dependency
-GUI_SUBDIRS = \
-  gnome-utils \
-  html \
-  gnome-search \
-  report \
-  register \
-  gnome \
-  import-export \
-  optional \
-  plugins \
-  bin
-
-# Need to include '.' in order to build swig-runtime.h
-if GNUCASH_ENABLE_GUI
-SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS) $(GUI_SUBDIRS)
-else
-# Note: In non-GUI build, "optional" needs to be added as well, but
-# cannot be added in the variable because in with-GUI mode it depends
-# on other parts.
-SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS) optional
-endif
-
-noinst_HEADERS = \
-  swig-runtime.h
-
-if BUILDING_FROM_VCS
-swig-runtime.h:
-	$(SWIG) -guile -external-runtime $@
-endif
-MAINTAINERCLEANFILES = swig-runtime.h
-
-EXTRA_DIST = \
-  base-typemaps.i \
-  cmake_modules/MacroAppendForeach.cmake \
-  cmake_modules/GncAddSwigCommand.cmake \
-  cmake_modules/GncAddTest.cmake \
-  cmake_modules/MakeDist.cmake \
-  cmake_modules/COPYING-CMAKE-SCRIPTS.txt \
-  cmake_modules/MakeDistFiles.cmake \
-  cmake_modules/MacroAddSourceFileCompileFlags.cmake \
-  cmake_modules/MakeDistCheck.cmake \
-  cmake_modules/GncConfigure.cmake \
-  cmake_modules/GncAddSchemeTargets.cmake \
-  cmake_modules/GncAddGSchemaTargets.cmake \
-  cmake_modules/GncFindPkgConfig.cmake \
-  cmake_modules/CMakeLists.txt \
-  config.h.cmake.in \
-  README.modules \
-  gnc-test-env.pl \
-  guile-mappings.h \
-  platform.h \
-  CMakeLists.txt
diff --git a/src/README b/src/README
deleted file mode 100644
index 375208eed4..0000000000
--- a/src/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This directory contains the source for GnuCash.
-See README.modules for the layout of the module subdirectories.
-The non-module directories are:
-
-  doc: various notes about design and the design documentation.
-  experimental: for experimental systems.
-  gnome: misc code for the gtk/gnome front end.
-  optional: bits supported via ./configure --enable-* or --with-* args.
-  pixmaps: various runtime images.
-  quotes: code for downloading stock quotes.
-  scm: misc scheme code.
diff --git a/src/README.modules b/src/README.modules
deleted file mode 100644
index 3bc005b664..0000000000
--- a/src/README.modules
+++ /dev/null
@@ -1,50 +0,0 @@
--*-text-*-
-
-'Modules' in Gnucash are relatively self-contained segments of code that
-can be dynamically loaded at runtime.  While this may have been a great
-design when gnucash was pure guile, it turns out this needlessly complicates
-the current mix of C, C++ and guile. So expect this gnc-module based 
-modularization to be greatly reduced in the future. All the core parts should
-be loadable straight away as dynamic libraries. This is currently not feasible
-so the gnc-module functionality will still be around for some time and perhaps
-forever as a way to extend gnucash with external code.
-
-We're not there yet :) 
-
-Here are the bits that are still using the module system so far (this list is probably
-outdated already, but can serve as a starting point to figure out which modules
-can already be de-modularized):.
-
-gnc-module                  The module system (actually not a module itself)
-
-engine                      The engine module, without any backends
-
-backend/xml                 Binary and XML (v1 and v2) backends
-
-backend/dbi                 SQL based backends: postgres, mysql, sqlite3 (all
-                            via the dbi interface)
-
-register/ledger-core        The xacc SplitLedger and MultiLedger parts formerly
-                            in src/
-register/register-core      Toolkit independent register code, formerly in 
-                            src/register/
-register/register-gnome     Gnome-specific register code, formerly in 
-                            src/register/gnome
-
-import-export/qif-import    the old qif importer with Gnome druid 
-import-export/qif-io-core   new qif import/export module.  unfinished.
-
-report/report-system        the report infrastructure and HTML handling 
-report/locale-specific-reports  reports that should only be loaded in 
-                                certain locales. subdir per locale. 
-report/stylesheets          predefined style sheet templates 
-report/report-gnome         Gnome gui for displaying reports.
-
-app-utils                   utils for the gnucash app framework (component 
-                            mgr, cmd line processing, gettext stuff, etc)
-
-gnome-utils                 Extensions and utilities for using Gnome/Gtk
-                            with GnuCash, including new widgets.
-
-tax/us                      US tax information
-
diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am
deleted file mode 100644
index af52d0c766..0000000000
--- a/src/app-utils/test/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-include $(top_srcdir)/test-templates/Makefile.decl
-
-check_PROGRAMS = \
-  test-link-module \
-  test-exp-parser \
-  test-scm-query-string \
-  test-print-parse-amount \
-  test-sx \
-  test-app-utils
-
-TESTS =  \
-  test-load-module \
-  ${check_PROGRAMS}
-
-test_scm_query_string_SOURCES = test-scm-query-string.cpp
-test_sx_SOURCES = test-sx.cpp
-test_print_parse_amount_SOURCES = test-print-parse-amount.cpp
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/app-utils
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  SRCDIR=${srcdir} \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-LDADD = \
-   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/gnc-module/libgnc-module.la \
-   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_builddir}/src/test-core/libtest-core.la \
-   ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-   ${GUILE_LIBS}
-
-EXTRA_DIST += \
-  test-load-module \
-  test-print-queries.cpp \
-  CMakeLists.txt
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/engine/test-core \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/core-utils \
-  ${GUILE_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  ${BOOST_CPPFLAGS}
-
-test_app_utils_SOURCES = \
-	test-app-utils.c \
-	test-option-util.cpp \
-	test-gnc-ui-util.c
-
-test_app_utils_CXXFLAGS = \
-	${DEFAULT_INCLUDES} \
-	-I${top_srcdir}/${MODULEPATH}/ \
-	-DTESTPROG=test_app_utils \
-	${GLIB_CFLAGS}
diff --git a/src/backend/sql/test/Makefile.am b/src/backend/sql/test/Makefile.am
deleted file mode 100644
index 8ec28adeb0..0000000000
--- a/src/backend/sql/test/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-SUBDIRS = .
-
-include $(top_srcdir)/test-templates/Makefile.decl
-MODULEPATH = src/backend/sql
-
-test_column_types_SOURCES = \
-  test-column-types.cpp
-
-check_PROGRAMS = \
-  test-column-types \
-  test-sqlbe
-
-TESTS = ${check_PROGRAMS}
-
-GNC_TEST_DEPS = \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/sql
-
-TESTS_ENVIRONMENT = \
-  GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
-  SRCDIR=${srcdir} \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-LDADD = ${top_builddir}/src/test-core/libtest-core.la \
-        ${top_builddir}/src/gnc-module/libgnc-module.la \
-        ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
-        ${top_builddir}/src/engine/libgncmod-engine.la \
-        ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-        ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-        ${top_builddir}/lib/libc/libc-missing.la
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/engine/test-core \
-  -I${top_srcdir}/src/backend/sql \
-  ${GLIB_CFLAGS} \
-  ${GUILE_CFLAGS}
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
-
-#test_sqlbedir = ${top_srcdir}/${MODULEPATH}/test
-
-test_sqlbe_SOURCES = \
-	test-sqlbe.cpp \
-	utest-gnc-backend-sql.cpp
-
-test_sqlbe_LDADD = \
-	$(top_builddir)/$(MODULEPATH)/libgnc-backend-sql.la \
-	$(top_builddir)/src/engine/libgncmod-engine.la \
-	$(top_builddir)/src/test-core/libtest-core.la \
-	$(top_builddir)/src/core-utils/libgnc-core-utils.la \
-	$(GLIB_LIBS)
-
-test_sqlbe_CFLAGS = \
-	-DTESTPROG=test_sqlbe \
-	$(DEFAULT_INCLUDES) \
-	-I$(top_srcdir)/$(MODULEPATH)/ \
-	-I$(top_srcdir)/src/backend/dbi/ \
-	-I$(top_srcdir)/src/engine/ \
-	-I$(top_srcdir)/src/test-core/ \
-	$(GLIB_CFLAGS)
-
-EXTRA_DIST += CMakeLists.txt
diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am
deleted file mode 100644
index 7bebc33eaf..0000000000
--- a/src/backend/xml/test/Makefile.am
+++ /dev/null
@@ -1,284 +0,0 @@
-#
-SUBDIRS = test-files
-
-test_date_converting_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-date-converting.cpp
-
-test_dom_converters1_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-dom-converters1.cpp
-
-test_kvp_frames_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-kvp-frames.cpp
-
-test_load_backend_SOURCES = \
-test-load-backend.cpp
-test_load_xml2_SOURCES = \
-test-load-xml2.cpp
-test_save_in_lang_SOURCES = \
-test-save-in-lang.cpp
-
-# the xml backend is now a GModule - this test does
-# not load it as a module and cannot link to it
-# and remain portable.
-
-test_load_example_account_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/io-example-account.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-gen.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-utils.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-load-example-account.cpp
-
-test_string_converters_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-string-converters.cpp
-
-test_xml_account_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-gen.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-utils.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-xml-account.cpp
-
-test_xml_commodity_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-gen.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-utils.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-xml-commodity.cpp
-
-test_xml_pricedb_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-gen.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-utils.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-xml-pricedb.cpp
-
-test_xml_transaction_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-gen.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-utils.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-xml-transaction.cpp
-
-test_xml2_is_file_SOURCES = \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-dom-generators.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-utils.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-stack.cpp \
-  ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-gen.cpp \
-  ${top_srcdir}/src/backend/xml/io-gncxml-v2.cpp \
-  ${top_srcdir}/src/backend/xml/io-utils.cpp \
-  ${top_srcdir}/src/backend/xml/gnc-xml-helper.cpp \
-  test-xml2-is-file.cpp
-
-TESTS = \
-  test-date-converting \
-  test-dom-converters1 \
-  test-kvp-frames \
-  test-load-example-account \
-  test-load-backend \
-  test-load-xml2 \
-  test-real-data.sh \
-  test-string-converters \
-  test-xml-account \
-  test-xml-commodity \
-  test-xml-pricedb \
-  test-xml-transaction \
-  test-xml2-is-file
-
-GNC_TEST_DEPS = \
-  --gnc-module-dir ${top_builddir}/src/gnc-module \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/sql  \
-  --library-dir    ${top_builddir}/src/backend/xml
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
-  GNC_TEST_FILES=test-files/xml2 \
-  SRCDIR=${srcdir} \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_LTLIBRARIES = libgnc-test-file-stuff.la
-
-libgnc_test_file_stuff_la_SOURCES = test-file-stuff.cpp
-libgnc_test_file_stuff_la_LIBADD = \
-  ${top_builddir}/src/engine/libgncmod-engine.la
-
-check_PROGRAMS = \
-  test-date-converting \
-  test-dom-converters1 \
-  test-kvp-frames \
-  test-load-backend \
-  test-load-example-account \
-  test-load-xml2 \
-  test-save-in-lang \
-  test-string-converters \
-  test-xml-account \
-  test-xml-commodity \
-  test-xml-pricedb \
-  test-xml-transaction \
-  test-xml2-is-file
-
-noinst_HEADERS = test-file-stuff.h
-
-LDADD = \
-        ${top_builddir}/src/test-core/libtest-core.la \
-        ${top_builddir}/src/gnc-module/libgnc-module.la \
-        ${top_builddir}/src/engine/libgncmod-engine.la \
-        ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-        ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-        ./libgnc-test-file-stuff.la \
-        ${LIBXML2_LIBS} \
-        ${ZLIB_LIBS} \
-        ${top_builddir}/lib/libc/libc-missing.la
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/engine/test-core \
-  -I${top_srcdir}/src/backend/xml \
-  -DU_SHOW_CPLUSPLUS_API=0 \
-  ${LIBXML2_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  ${GUILE_CFLAGS} \
-  ${BOOST_CPPFLAGS}
-
-EXTRA_DIST = \
-  grab-types.pl \
-  test-dom-parser1.cpp \
-  test-real-data.sh \
-  test-xml2-is-file.cpp \
-  CMakeLists.txt
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
diff --git a/src/bin/overrides/gnucash-build-env.in b/src/bin/overrides/gnucash-build-env.in
deleted file mode 100644
index ec2e5dfd9a..0000000000
--- a/src/bin/overrides/gnucash-build-env.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# Usage: gnucash-build-env
-
-# Usage: gnucash-build-env any-cmd [ args ... ]
-# runs any-cmd in gnucash's build environment.
-
-# As with all the other gnucash overrides scripts, expects PATH to be
-# set appropriately.
-
-top_srcdir="@-GNC_SRCDIR-@"
-top_builddir="@-GNC_BUILDDIR-@"
-
-if test "${GNC_CONFIG_PATH}"x = x
-then
-  GNC_CONFIG_PATH="(\"${top_srcdir}/src/scm\")"
-  export GNC_CONFIG_PATH
-fi
-
-if test "${GNC_SHARE_PATH}"x = x
-then
-  GNC_SHARE_PATH="(\"${top_srcdir}/src/scm\" \"${top_srcdir}/src/quotes\")"
-  export GNC_SHARE_PATH
-fi
-
-if test "${GNC_DOC_PATH}"x = x
-then
-  GNC_DOC_PATH="(\"${top_srcdir}/src/scm\")"
-  export GNC_DOC_PATH
-fi
-
-set +x
-eval `${top_srcdir}/src/gnc-test-env.pl \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/backend/xml \
-  --gnc-module-dir ${top_builddir}/src/network-utils \
-  --gnc-module-dir ${top_builddir}/src/calculation \
-  --gnc-module-dir ${top_builddir}/src/tax/us \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-search \
-  --gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
-  --gnc-module-dir ${top_builddir}/src/report/report-gnome \
-  --gnc-module-dir ${top_builddir}/src/report/stylesheets \
-  --gnc-module-dir ${top_builddir}/src/register/register-core \
-  --gnc-module-dir ${top_builddir}/src/register/register-gnome \
-  --gnc-module-dir ${top_builddir}/src/register/ledger-core \
-  --gnc-module-dir ${top_builddir}/src/import-export \
-  --gnc-module-dir ${top_builddir}/src/import-export/qif-import \
-  --gnc-module-dir ${top_builddir}/src/import-export/ofx \
-  --gnc-module-dir ${top_builddir}/src/import-export/hbci \
-  --gnc-module-dir ${top_builddir}/src/import-export/log-replay \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/tax/us \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/standard-reports \
-  --guile-load-dir ${top_builddir}/src/report/business-reports \
-  --guile-load-dir ${top_builddir}/src/report/utility-reports \
-  --guile-load-dir ${top_builddir}/src/report/locale-specific/us \
-  --guile-load-dir ${top_builddir}/src/report/report-gnome \
-  --guile-load-dir ${top_builddir}/src/report/stylesheets \
-  --guile-load-dir ${top_builddir}/src/import-export/qif-import \
-  --library-dir    ${top_builddir}/src/test-core \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/calculation \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql  \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome \
-  --library-dir    ${top_builddir}/src/gnome-search \
-  --library-dir    ${top_builddir}/src/import-export \
-  --library-dir    ${top_builddir}/src/register/register-gnome \
-  --library-dir    ${top_builddir}/src/register/register-core \
-  --library-dir    ${top_builddir}/src/register/ledger-core \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/report/report-gnome
-  `
-LD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}"
-
-exec "$@"
diff --git a/src/cmake_modules/MakeDistFiles.cmake b/src/cmake_modules/MakeDistFiles.cmake
deleted file mode 100644
index fbddb2ad7d..0000000000
--- a/src/cmake_modules/MakeDistFiles.cmake
+++ /dev/null
@@ -1,110 +0,0 @@
-
-IF (${CMAKE_VERSION} VERSION_LESS 3.3)
-    INCLUDE(CMakeParseArguments)
-ENDIF()
-
-
-FUNCTION(SET_LOCAL_DIST output)
-    SET(dist_files "")
-    FOREACH(file ${ARGN})
-        FILE(RELATIVE_PATH relative ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-        LIST(APPEND dist_files ${relative})
-    ENDFOREACH()
-    SET (${output} ${dist_files} PARENT_SCOPE)
-ENDFUNCTION()
-
-MACRO(SET_DIST_LIST output)
-    SET_LOCAL_DIST(${output}_TMP ${ARGN})
-    SET(${output} ${${output}_TMP} PARENT_SCOPE)
-ENDMACRO()
-
-FUNCTION(EXECUTE_PROCESS_AND_CHECK_RESULT)
-    cmake_parse_arguments(VARS "" "WORKING_DIRECTORY;ERROR_MSG" "COMMAND" ${ARGN})
-    EXECUTE_PROCESS(
-            COMMAND ${VARS_COMMAND}
-            WORKING_DIRECTORY ${VARS_WORKING_DIRECTORY}
-            RESULT_VARIABLE RESULT
-    )
-    IF (NOT "${RESULT}" STREQUAL "0")
-        MESSAGE(FATAL_ERROR ${VARS_ERROR_MSG})
-    ENDIF()
-ENDFUNCTION()
-
-
-# This is a list of files generated at build time that
-# should be copied into the dist tarball. An item in
-# this list should be a file, not a directory or glob.
-# File in this list become dependenices of the 'dist'
-# target.
-
-
-SET(COPY_FROM_BUILD
-  ChangeLog
-  src/app-utils/migratable-prefs.xml
-  src/app-utils/swig-app-utils-guile.c
-  src/app-utils/swig-app-utils-python.c
-  src/app-utils/test/test-load-module
-  src/backend/xml/test/test-real-data.sh
-  src/bin/gnucash.rc
-  src/bin/overrides/gnucash-make-guids
-  src/bin/test/test-version
-  src/core-utils/gnc-vcs-info.h
-  src/core-utils/swig-core-utils-guile.c
-  src/core-utils/swig-core-utils-python.c
-  src/doc/design/gnucash-design.info
-  src/engine/iso-4217-currencies.c
-  src/engine/swig-engine.c
-  src/engine/test/test-create-account
-  src/engine/test/test-scm-query-import
-  src/gnc-module/swig-gnc-module.c
-  src/gnc-module/test/mod-bar/swig-bar.c
-  src/gnc-module/test/mod-baz/swig-baz.c
-  src/gnc-module/test/mod-foo/swig-foo.c
-  src/gnc-module/test/test-gwrapped-c
-  src/gnc-module/test/test-load-deps
-  src/gnc-module/test/test-load-scm
-  src/gnc-module/test/test-scm-dynload
-  src/gnc-module/test/test-scm-init
-  src/gnc-module/test/test-scm-module
-  src/gnc-module/test/test-scm-multi
-  src/gnome/gnucash.desktop.in
-  src/gnome/swig-gnome.c
-  src/gnome-utils/gnc-warnings.c
-  src/gnome-utils/swig-gnome-utils.c
-  src/gnome-utils/test/test-load-module
-  src/html/swig-gnc-html.c
-  src/optional/python-bindings/gnucash_core.c
-  src/report/report-gnome/swig-report-gnome.c
-  src/report/report-gnome/test/test-load-module
-  src/report/report-system/swig-report-system.c
-  src/report/report-system/test/test-load-module
-  src/report/stylesheets/test/test-load-module
-  src/scm/build-config.scm
-  src/swig-runtime.h
-  src/test-core/swig-unittest-support-guile.c
-  src/test-core/swig-unittest-support-python.c
-)
-
-# This list is similiar to the COPY_FROM_BUILD list
-# above, except that we don't create an explicit
-# dependency on this for the 'dist' target. I need
-# to fix the creation of these files so that we
-# can add the as dependencies for 'dist'. These
-# file are not generated using CONFIGURE_FILE(),
-# so CMake does not realize these are generated files.
-
-# Items marked with GNC_CONFIGURE can be
-# properly generated when we drop autotools, because
-# then the source file can use the @XXX@ convention
-# instead of @-XXX-@
-
-SET(COPY_FROM_BUILD_2
-        doc/gnucash.1  # Uses GNC_CONFIGURE
-        packaging/gnucash.spec # Uses GNC_CONFIGURE
-        po/gnucash.pot
-        src/doc/design/stamp-vti
-        src/doc/design/version.texi
-        src/optional/python-bindings/gnucash_core_c.py
-        src/test-core/unittest_support.py
-
-        )
diff --git a/src/gnc-module/test/Makefile.am b/src/gnc-module/test/Makefile.am
deleted file mode 100644
index d8497626b0..0000000000
--- a/src/gnc-module/test/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-SUBDIRS = mod-foo mod-bar mod-baz misc-mods
-
-LDADD = \
-  ${top_builddir}/src/test-core/libtest-core.la \
-  ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS}
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  ${GUILE_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-TESTS = \
-  test-load-c \
-  test-load-scm \
-  test-gwrapped-c \
-  test-scm-module \
-  test-scm-multi \
-  test-load-deps \
-  test-modsysver \
-  test-incompatdep \
-  test-agedver \
-  test-dynload \
-  test-scm-dynload \
-  test-scm-init
-
-GNC_TEST_DEPS = \
-  --gnc-module-dir ${top_builddir}/src/gnc-module \
-  --gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-foo \
-  --gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-bar \
-  --gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-baz \
-  --gnc-module-dir ${top_builddir}/src/gnc-module/test/misc-mods \
-  --guile-load-dir ${top_builddir}/src/test-core \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
-  --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
-  --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/test-core \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnc-module/test/mod-foo \
-  --library-dir    ${top_builddir}/src/gnc-module/test/mod-bar \
-  --library-dir    ${top_builddir}/src/gnc-module/test/mod-baz
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS = \
-  test-load-c \
-  test-modsysver \
-  test-incompatdep \
-  test-agedver \
-  test-dynload
-
-test_dynload_LDFLAGS = ${GUILE_LIBS}
-
-EXTRA_DIST = \
-  test-gwrapped-c \
-  test-load-deps \
-  test-load-scm \
-  test-scm-dynload \
-  test-scm-init \
-  test-scm-module \
-  test-scm-multi \
-  CMakeLists.txt
-
-foo:
-	${TESTS_ENVIRONMENT} strace -f -o xxx ./test-load-c
diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am
deleted file mode 100644
index d7a34c3383..0000000000
--- a/src/gnome-utils/test/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-TESTS =  \
-  test-link-module test-load-module
-
-# The following tests are nice, but have absolutely no place in an
-# automated testing system.
-#
-TESTS_GUI = test-gnc-recurrence
-
-##lib_LTLIBRARIES = libgncgnome.la
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/app-utils
-
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  SRCDIR=${srcdir} \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS = \
-  test-link-module test-gnc-recurrence
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/engine/test-core \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/test-core \
-  ${GLIB_CFLAGS} \
-  ${GTK_CFLAGS} \
-  ${GUILE_CFLAGS}
-
-LDADD = \
-  ${GNOME_LIBS} \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-  ${top_builddir}/src/test-core/libtest-core.la
-
-test_gnc_recurrence_SOURCES=test-gnc-recurrence.c
-test_gnc_recurrence_LDADD = \
-  ${GTK_LIBS} \
-  ${LDADD}
-
-test_link_module_SOURCES=test-link-module.c
-test_link_module_LDADD = \
-  ${GUILE_LIBS} \
-  ${GLIB_LIBS} \
-  ${top_builddir}/src/gnc-module/libgnc-module.la
-
-EXTRA_DIST = \
-  test-load-module \
-  CMakeLists.txt
-
-testit:
-	libtool --mode execute gdb test-link-module
diff --git a/src/import-export/csv-imp/test/Makefile.am b/src/import-export/csv-imp/test/Makefile.am
deleted file mode 100644
index 8ae7d61507..0000000000
--- a/src/import-export/csv-imp/test/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-# A template Makefile.am for GLib g_test-based test directories.
-# Copyright 2011 John Ralls <jralls@ceridwen.us>
-
-include $(top_srcdir)/test-templates/Makefile.decl
-
-
-#You will only need one of these: It points to the module directory
-#after $(top_srcdir) or ${top_builddir}:
-MODULEPATH = src/import-export/csv-imp
-
-#The test program. You'll need to add to this if you have more than one module above.
-
-check_PROGRAMS = test-tokenizer \
-                 test-tx-import
-
-TESTS = ${check_PROGRAMS}
-
-#Program files for tests go here. It's probably best to have one for
-#each file in the parent directory. Include
-#test_foo_support.c if you have one and aren't building the
-#support library.
-test_tokenizer_SOURCES = \
-    test-tokenizer.cpp
-
-test_tx_import_SOURCES = \
-    test-tx-import.cpp
-
-if !GOOGLE_TEST_LIBS
-nodist_test_tokenizer_SOURCES = \
-        ${GTEST_SRC}/src/gtest_main.cc
-
-nodist_test_tx_import_SOURCES = \
-        ${GTEST_SRC}/src/gtest_main.cc
-endif
-
-IMP_TEST_CPPFLAGS =  \
-	${DEFAULT_INCLUDES} \
-	-I$(top_srcdir)/${MODULEPATH}/ \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/import-export \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/lib \
-  ${GTK_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  $(BOOST_CPPFLAGS)
-
-test_tokenizer_CPPFLAGS = \
-  -I$(GTEST_HEADERS) \
-  $(IMP_TEST_CPPFLAGS)
-
-test_tx_import_CPPFLAGS = \
-  -I$(GTEST_HEADERS) \
-  $(IMP_TEST_CPPFLAGS)
-
-#The tests might require more libraries, but try to keep them
-#as independent as possible.
-IMP_TEST_LDFLAGS = \
-  ${top_builddir}/${MODULEPATH}/libgncmod-csv-import.la \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
-  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${GLIB_LIBS} \
-  $(BOOST_LDFLAGS)
-
-test_tokenizer_LDADD = \
-  ${IMP_TEST_LDFLAGS} \
-  $(GTEST_LIBS)
-
-test_tx_import_LDADD = \
-  ${IMP_TEST_LDFLAGS} \
-  $(GTEST_LIBS)
-
-GNC_TEST_DEPS = \
---library-dir    ${top_builddir}/${MODULEPATH} \
---library-dir    ${top_builddir}/src/import-export \
---library-dir    ${top_builddir}/src/gnome \
---library-dir    ${top_builddir}/src/gnome-utils \
---library-dir    ${top_builddir}/src/gnome-search \
---library-dir    ${top_builddir}/src/register/ledger-core \
---library-dir    ${top_builddir}/src/register/register-core \
---library-dir    ${top_builddir}/src/register/register-gnome \
---library-dir    ${top_builddir}/src/report/report-system \
---library-dir    ${top_builddir}/src/report/report-gnome \
---library-dir    ${top_builddir}/src/html \
---library-dir    ${top_builddir}/src/app-utils \
---library-dir    ${top_builddir}/src/backend/xml \
---library-dir    ${top_builddir}/src/engine \
---library-dir    ${top_builddir}/src/core-utils \
---library-dir    ${top_builddir}/src/gnc-module
-
-TESTS_ENVIRONMENT = \
-  SRCDIR=${srcdir} \
-  G_DEBUG= \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-EXTRA_DIST += \
-  sample1.csv \
-  CMakeLists.txt
-
-
-AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.import.csv\"
diff --git a/src/import-export/log-replay/Makefile.am b/src/import-export/log-replay/Makefile.am
deleted file mode 100644
index 048b7ebfad..0000000000
--- a/src/import-export/log-replay/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-SUBDIRS = .
-
-pkglib_LTLIBRARIES=libgncmod-log-replay.la
-
-libgncmod_log_replay_la_SOURCES = \
-  gnc-log-replay.c \
-  gnc-plugin-log-replay.c \
-  gncmod-log-replay.c
-
-noinst_HEADERS = \
-  gnc-log-replay.h \
-  gnc-plugin-log-replay.h
-
-libgncmod_log_replay_la_LDFLAGS = -avoid-version
-
-libgncmod_log_replay_la_LIBADD = \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${GTK_LIBS} \
-  ${GLIB_LIBS}
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/import-export \
-  ${GTK_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-uidir = $(GNC_UI_DIR)
-dist_ui_DATA = \
-	gnc-plugin-log-replay-ui.xml
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.log-replay\"
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/ofx/Makefile.am b/src/import-export/ofx/Makefile.am
deleted file mode 100644
index 8a6533ed43..0000000000
--- a/src/import-export/ofx/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-SUBDIRS = . gschemas test
-
-pkglib_LTLIBRARIES=libgncmod-ofx.la
-
-libgncmod_ofx_la_SOURCES = \
-  gnc-ofx-import.c \
-  gnc-ofx-kvp.c \
-  gncmod-ofx-import.c \
-  gnc-plugin-ofx.c
-
-noinst_HEADERS = \
-  gnc-ofx-import.h \
-  gnc-ofx-kvp.h \
-  gnc-plugin-ofx.h
-
-libgncmod_ofx_la_LDFLAGS = -avoid-version
-
-libgncmod_ofx_la_LIBADD = \
-  ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${GLIB_LIBS} \
-  ${LIBOFX_LIBS}
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/import-export \
-  ${GTK_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  ${LIBOFX_CFLAGS} 
-
-uidir = $(GNC_UI_DIR)
-ui_DATA = \
-	gnc-plugin-ofx-ui.xml
-
-EXTRA_DIST = $(ui_DATA) migratable-prefs-ofx.xml CMakeLists.txt
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\"
diff --git a/src/import-export/ofx/test/Makefile.am b/src/import-export/ofx/test/Makefile.am
deleted file mode 100644
index 0306c97056..0000000000
--- a/src/import-export/ofx/test/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-TESTS=test-link
-
-AM_CPPFLAGS=${LIBOFX_CFLAGS}
-check_PROGRAMS=test-link
-
-test_link_SOURCES=test-link.c
-test_link_LDADD=\
-	$(top_builddir)/src/engine/libgncmod-engine.la \
-	$(top_builddir)/src/app-utils/libgncmod-app-utils.la \
-	${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-	../libgncmod-ofx.la
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/qif-imp/test/Makefile.am b/src/import-export/qif-imp/test/Makefile.am
deleted file mode 100644
index 202b6cb7af..0000000000
--- a/src/import-export/qif-imp/test/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-TESTS=test-link
-
-check_PROGRAMS=test-link
-
-test_link_SOURCES = \
-  test-link.c
-
-test_link_LDADD=../libgncmod-qif-import.la \
-  ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${LIBXML2_LIBS}
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/qif/test/Makefile.am b/src/import-export/qif/test/Makefile.am
deleted file mode 100644
index befbc4afca..0000000000
--- a/src/import-export/qif/test/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/import-export \
-  -I${top_srcdir}/src/import-export/qif \
-  ${GUILE_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-LDADD = \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/test-core/libtest-core.la \
-  ../../libgncmod-generic-import.la \
-  ../libgncmod-qif.la \
-  ${GLIB_LIBS}
-
-TESTS = \
-  test-link \
-  test-qif
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/core-utils \
-  --gnc-module-dir ${top_builddir}/src/gnc-module \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/import-export \
-  --gnc-module-dir ${top_builddir}/src/import-export/qif \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_srcdir}/src/gnc-module \
-  --gnc-module-dir ${top_srcdir}/src/engine \
-  --gnc-module-dir ${top_srcdir}/src/app-utils \
-  --gnc-module-dir ${top_srcdir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome \
-  --guile-load-dir ${top_srcdir}/src/scm \
-  --guile-load-dir ${top_srcdir}/src/import-export \
-  --guile-load-dir ${top_srcdir}/src/import-export/qif
-
-TESTS_ENVIRONMENT = \
-  GNC_TEST_FILES=${srcdir}/test-files \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS = \
-  test-link \
-  test-qif
-
-EXTRA_DIST = \
-  test-files/test-1-bank-txn.qif CMakeLists.txt
diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am
deleted file mode 100644
index 196731e547..0000000000
--- a/src/import-export/test/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-include $(top_srcdir)/test-templates/Makefile.decl
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/import-export \
-  -I${top_srcdir}/src/engine/test-core \
-  ${GTK_CFLAGS} \
-  ${GUILE_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-LDADD = \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/test-core/libtest-core.la \
-  ../libgncmod-generic-import.la \
-  $(top_builddir)/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${GLIB_LIBS} \
-  ${GUILE_LIBS}
-
-TESTS = \
-  test-link \
-  test-import-parse
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/import-export \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-\
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql  \
-  --library-dir    ${top_builddir}/src/gnc-module
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS = \
-  test-link \
-  test-import-parse
-
-TEST_PROGS += test-import-pending-matches
-
-noinst_PROGRAMS = $(TEST_PROGS) $(check_PROGRAMS)
-
-test_import_pending_matches_SOURCES = test-import-pending-matches.c
-
-test_import_pending_matches_LDADD = \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ../libgncmod-generic-import.la \
-  ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-  ${top_builddir}/src/test-core/libtest-core.la \
-  ${GLIB_LIBS}
-
-test_import_pending_matches_CFLAGS = $(AM_CPPFLAGS)
-
-clean-local:
-	rm -f translog.*
-
-distclean-local: clean-local
-
-EXTRA_DIST += CMakeLists.txt
diff --git a/src/optional/CMakeLists.txt b/src/optional/CMakeLists.txt
deleted file mode 100644
index 320b387f7a..0000000000
--- a/src/optional/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ADD_SUBDIRECTORY(python-bindings)
-
-SET_LOCAL_DIST(optional_DIST_local CMakeLists.txt Makefile.am)
-SET(optional_DIST ${optional_DIST_local} ${python_bindings_DIST} PARENT_SCOPE)
diff --git a/src/optional/Makefile.am b/src/optional/Makefile.am
deleted file mode 100644
index 73573b1323..0000000000
--- a/src/optional/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-if WITH_PYTHON
-    PYTHON_BINDINGS_DIR = python-bindings
-endif
-SUBDIRS = ${PYTHON_BINDINGS_DIR}
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/optional/python-bindings/tests/Makefile.am b/src/optional/python-bindings/tests/Makefile.am
deleted file mode 100644
index 6b638c5d43..0000000000
--- a/src/optional/python-bindings/tests/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/test-core
-  
-TESTS_ENVIRONMENT = \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  PYTHON=${PYTHON} \
-  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings \
-  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings/.libs \
-  PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/src/optional/python-bindings/tests \
-  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/test-core/ \
-  PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/src/test-core/ \
-  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/test-core/.libs \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-  
-## We borrow guile's convention and use @-...-@ as the substitution
-## brackets below, instead of the usual @...@.  This prevents autoconf
-## from substituting the values directly into the left-hand sides of
-## the sed substitutions.  *sigh*
-
-runTests.py: runTests.py.in ${top_builddir}/config.status Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's#@-PYTHON-@#${PYTHON}#'
-	mv $@.tmp $@
-	chmod u+x $@
-
-CLEANFILES = runTests.py
-
-TESTS = runTests.py
-
-clean-local:
-	rm -f translog.*
-
-EXTRA_DIST = \
-  runTests.py.in \
-  test_account.py \
-  test_book.py \
-  test_split.py \
-  test_transaction.py \
-  test_business.py \
-  CMakeLists.txt
diff --git a/src/plugins/bi_import/Makefile.am b/src/plugins/bi_import/Makefile.am
deleted file mode 100644
index b17da1acf3..0000000000
--- a/src/plugins/bi_import/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-SUBDIRS = ui gtkbuilder .
-
-pkglib_LTLIBRARIES = libgncmod-bi_import.la
-
-libgncmod_bi_import_la_SOURCES = \
-  gnc-plugin-bi-import.c \
-  gncmod-bi-import.c \
-  dialog-bi-import-gui.c \
-  dialog-bi-import-helper.c \
-  dialog-bi-import.c
-
-noinst_HEADERS = \
-  gnc-plugin-bi-import.h \
-  dialog-bi-import-gui.h \
-  dialog-bi-import-helper.h \
-  dialog-bi-import.h
-
-libgncmod_bi_import_la_LDFLAGS = -avoid-version
-
-libgncmod_bi_import_la_LIBADD = \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/lib/libc/libc-missing.la \
-  ${GLIB_LIBS}
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/report/report-gnome \
-  -I${top_srcdir}/src/gnome-search/ \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/ledger-business \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/business/dialog-tax-table \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/lib/libc \
-  ${GTK_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\"
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/plugins/customer_import/Makefile.am b/src/plugins/customer_import/Makefile.am
deleted file mode 100644
index 61311aa61c..0000000000
--- a/src/plugins/customer_import/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-SUBDIRS = ui gtkbuilder .
-
-pkglib_LTLIBRARIES = libgncmod-customer_import.la
-
-libgncmod_customer_import_la_SOURCES = \
-  gnc-plugin-customer_import.c \
-  libgncmod-customer_import.c \
-  dialog-customer-import-gui.c \
-  dialog-customer-import.c
-
-noinst_HEADERS = \
-  gnc-plugin-customer_import.h \
-  dialog-customer-import-gui.h \
-  dialog-customer-import.h
-
-libgncmod_customer_import_la_LDFLAGS = -avoid-version
-
-libgncmod_customer_import_la_LIBADD = \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/lib/libc/libc-missing.la \
-  ${GLIB_LIBS}
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/report/report-gnome \
-  -I${top_srcdir}/src/gnome-search/ \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/business/dialog-tax-table \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/lib/libc \
-  ${GTK_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\"
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/ledger-core/test/Makefile.am b/src/register/ledger-core/test/Makefile.am
deleted file mode 100644
index b9d57a42d1..0000000000
--- a/src/register/ledger-core/test/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-TESTS =  test-link-module
-
-check_PROGRAMS = test-link-module
-
-test_link_module_SOURCES=test-link-module.c
-test_link_module_LDADD=\
-	$(top_builddir)/src/engine/libgncmod-engine.la \
-        $(top_builddir)/src/app-utils/libgncmod-app-utils.la \
-	${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-	${top_builddir}/src/gnome/libgnc-gnome.la \
-    ../libgncmod-ledger-core.la
-
-AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/register-core/test/Makefile.am b/src/register/register-core/test/Makefile.am
deleted file mode 100644
index 785d760a4c..0000000000
--- a/src/register/register-core/test/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-TESTS =  \
-  test-link-module
-#  test-load-module
-
-#GNC_TEST_DEPS := \
-#
-
-#TESTS_ENVIRONMENT := \
-#  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS = \
-  test-link-module
-
-test_link_module_SOURCES=test-link-module.c
-test_link_module_LDADD=\
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ../libgncmod-register-core.la
-
-EXTRA_DIST = CMakeLists.txt
-#            test-load-module
-
-AM_CPPFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
diff --git a/src/register/register-gnome/test/Makefile.am b/src/register/register-gnome/test/Makefile.am
deleted file mode 100644
index df8c865208..0000000000
--- a/src/register/register-gnome/test/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-TESTS =  \
-  test-link-module
-#  test-load-module
-
-#GNC_TEST_DEPS := \
-#
-
-#TESTS_ENVIRONMENT := \
-#  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS = \
-  test-link-module
-
-test_link_module_SOURCES = test-link-module.c
-test_link_module_LDADD = \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ../libgncmod-register-gnome.la
-
-EXTRA_DIST = CMakeLists.txt
-#            test-load-module
-
-AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
diff --git a/src/report/locale-specific/us/test/Makefile.am b/src/report/locale-specific/us/test/Makefile.am
deleted file mode 100644
index ac71b66c12..0000000000
--- a/src/report/locale-specific/us/test/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-TESTS = test-link-module
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/tax/us \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/tax/us \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS = test-link-module
-
-testit:
-	${TESTS_ENVIRONMENT} gdb guile
-
-test_link_module_SOURCES = test-link-module.c
-test_link_module_LDADD= \
-  ${top_builddir}/src/report/locale-specific/us/libgncmod-locale-reports-us.la
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
deleted file mode 100644
index ea546f3c3d..0000000000
--- a/src/report/report-gnome/Makefile.am
+++ /dev/null
@@ -1,147 +0,0 @@
-SUBDIRS = . test
-
-pkglib_LTLIBRARIES = libgncmod-report-gnome.la
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/html \
-  -I${top_srcdir}/src/report/report-system \
-  ${GUILE_CFLAGS} \
-  ${GTK_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-libgncmod_report_gnome_la_SOURCES = \
-  swig-report-gnome.c \
-  dialog-report-column-view.c \
-  dialog-custom-report.c \
-  dialog-report-style-sheet.c \
-  gnc-plugin-page-report.c \
-  gncmod-report-gnome.c \
-  window-report.c
-
-gncincludedir = ${GNC_INCLUDE_DIR}
-gncinclude_HEADERS = \
-  dialog-report-column-view.h \
-  dialog-custom-report.h \
-  dialog-report-style-sheet.h \
-  gnc-plugin-page-report.h \
-  window-report.h
-
-libgncmod_report_gnome_la_LDFLAGS = -avoid-version
-
-libgncmod_report_gnome_la_LIBADD = \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/html/libgncmod-html.la \
-  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
-  ${GUILE_LIBS} \
-  ${GLIB_LIBS}
-
-if BUILDING_FROM_VCS
-swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
-	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<
-if ! OS_WIN32
-if ! SWIG_DIST_FAIL
-	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
-	fi
-endif
-endif
-endif
-
-gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
-gncscmmod_DATA = report-gnome.scm
-
-noinst_DATA = .scm-links
-
-gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
-gtkbuilder_DATA = \
-  dialog-report.glade \
-  dialog-custom-report.glade
-
-uidir = $(GNC_UI_DIR)
-
-ui_DATA = \
-	gnc-plugin-page-report-ui.xml
-
-EXTRA_DIST = \
-  report-gnome.i \
-  ${gtkbuilder_DATA} \
-  ${gncscmmod_DATA} \
-  ${ui_DATA} \
-  CMakeLists.txt
-
-if GNUCASH_SEPARATE_BUILDDIR
-#Only needed when srcdir and builddir are different
-# for running
-SCM_FILE_LINKS = ${gncscmmod_DATA}
-endif
-
-.scm-links: 
-	$(RM) -rf gnucash
-	mkdir -p  gnucash
-	mkdir -p  gnucash/report
-if GNUCASH_SEPARATE_BUILDDIR
-	for X in ${SCM_FILE_LINKS} ; do \
-	  $(LN_S) -f ${srcdir}/$$X . ; \
-	done
-endif
-	( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
-if ! OS_WIN32
-# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
-	touch .scm-links
-endif
-
-if GNC_HAVE_GUILE_2
-GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/utility-reports \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/report/report-gnome
-
-%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
-	GNC_UNINSTALLED=yes \
-	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
-	$(GUILD) compile -o $@ $<
-
-gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
-gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
-endif
-
-clean-local:
-	rm -rf gnucash
-
-CLEANFILES = report .scm-links ${SCM_FILE_LINKS} ${gncscmmodcache_DATA}
-MAINTAINERCLEANFILES = swig-report-gnome.c
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.gui\"
diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am
deleted file mode 100644
index a894a75911..0000000000
--- a/src/report/report-gnome/test/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-AM_CPPFLAGS = \
-  -I${top_srcdir} \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  ${GUILE_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-LDADD = \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
-  $(top_builddir)/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${GLIB_LIBS} \
-  ${GUILE_LIBS}
-
-TESTS = \
-  test-link-module \
-  test-load-module
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --gnc-module-dir ${top_builddir}/src/report/report-gnome \
-\
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/standard-reports \
-  --guile-load-dir ${top_builddir}/src/report/business-reports \
-  --guile-load-dir ${top_builddir}/src/report/utility-reports \
-  --guile-load-dir ${top_builddir}/src/report/report-gnome \
-\
-  --library-dir    ${top_builddir}/src/report/report-gnome \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/report/report-gnome
-
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-
-check_PROGRAMS = test-link-module
-
-EXTRA_DIST = test-load-module CMakeLists.txt
diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am
deleted file mode 100644
index b122c7bf43..0000000000
--- a/src/report/report-system/test/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-AM_CPPFLAGS = \
-  -I${top_srcdir} \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/test-core \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  ${GUILE_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-LDADD = \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${GLIB_LIBS} \
-  ${GUILE_LIBS}
-
-TESTS = \
-  test-link-module \
-  test-load-module \
-  $(SCM_TESTS)
-
-SCM_TESTS = \
-	test-collectors \
-	test-list-extras \
-	test-report-utilities
-
-SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --gnc-module-dir ${top_builddir}/src/report/report-system/test \
-  --gnc-module-dir ${top_builddir}/src/engine/test \
-  --gnc-module-dir ${top_builddir}/src/backend/xml \
-  --gnc-module-dir ${top_builddir}/src/backend/sql \
-  --gnc-module-dir ${top_builddir}/src/backend/dbi \
- \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/engine/test \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/report-system/test \
-\
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql  \
-  --library-dir    ${top_builddir}/src/backend/dbi  \
-  --library-dir    ${top_builddir}/src/gnc-module
-
-$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
-	echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
-	echo 'export GNC_UNINSTALLED=yes;' >> $@
-	echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
-	chmod a+x $@
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-
-check_PROGRAMS = test-link-module
-
-SCM_TEST_HELPERS = test-extras.scm
-
-EXTRA_DIST = \
-	test-load-module \
-	$(SCM_TEST_HELPERS) \
-	$(SCM_TEST_SRCS) \
-	CMakeLists.txt
-
-testit:
-	$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
-
-
-.scm-links:
-	$(RM) -rf gnucash
-	mkdir -p  gnucash/report/report-system/test
-	( cd gnucash/report/report-system/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done )
-if ! OS_WIN32
-# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
-	touch .scm-links
-endif
-
-clean-local:
-	$(RM) -rf gnucash
-	$(RM) *.log
-
-noinst_DATA = .scm-links
-CLEANFILES = .scm-links
-DISTCLEANFILES = $(SCM_TESTS)
diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am
deleted file mode 100644
index 06e8c6ab0e..0000000000
--- a/src/report/standard-reports/test/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-TESTS = $(SCM_TESTS)
-
-SCM_TESTS = \
-	test-cash-flow \
-	test-standard-category-report \
-	test-standard-net-barchart \
-	test-standard-net-linechart
-
-SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
-
-GNC_TEST_DEPS = \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/engine/test \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/app-utils \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --gnc-module-dir ${top_builddir}/src/report/report-system/test \
-\
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/engine/test \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/report-system/test \
-  --guile-load-dir ${top_builddir}/src/report/standard-reports \
-  --guile-load-dir ${top_builddir}/src/report/standard-reports/test \
-\
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/gnc-module
-
-$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
-	echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
-	echo 'export GNC_UNINSTALLED=yes;' >> $@
-	echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
-	chmod a+x $@
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-
-SCM_TEST_HELPERS = \
-	test-generic-category-report.scm \
-	test-generic-net-barchart.scm \
-	test-generic-net-linechart.scm
-
-EXTRA_DIST = \
-	$(SCM_TEST_HELPERS) \
-	$(SCM_TEST_SRCS) \
-	CMakeLists.txt
-
-.scm-links:
-	$(RM) -rf gnucash
-	mkdir -p  gnucash/report/standard-reports/test
-	( cd gnucash/report/standard-reports/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done )
-if ! OS_WIN32
-# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
-	touch .scm-links
-endif
-
-interp:
-	$(TESTS_ENVIRONMENT) ${GUILE} --debug
-
-debug:
-	$(TESTS_ENVIRONMENT) gdb --args $(shell cat $(TEST))
-
-clean-local:
-	$(RM) -rf gnucash
-
-noinst_DATA = .scm-links
-CLEANFILES = .scm-links *.log
-DISTCLEANFILES = $(SCM_TESTS)
-
diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am
deleted file mode 100644
index 6596b11958..0000000000
--- a/src/report/stylesheets/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-SUBDIRS = . test
-
-pkglib_LTLIBRARIES = libgncmod-stylesheets.la
-
-libgncmod_stylesheets_la_SOURCES = \
-  gnc-plugin-stylesheets.c \
-  gncmod-stylesheets.c 
-
-noinst_HEADERS = \
-  gnc-plugin-stylesheets.h
-
-libgncmod_stylesheets_la_LDFLAGS = -module -avoid-version
-
-libgncmod_stylesheets_la_LIBADD = \
-  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
-  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${GUILE_LIBS} \
-  ${GTK_LIBS} \
-  ${GLIB_LIBS}
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/report/report-gnome \
-  ${GUILE_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  ${GTK_CFLAGS}
-
-gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
-gncscmmod_DATA = \
-  stylesheets.scm \
-  stylesheet-plain.scm \
-  stylesheet-fancy.scm \
-  stylesheet-footer.scm \
-  stylesheet-easy.scm \
-  stylesheet-head-or-tail.scm
-
-if GNUCASH_SEPARATE_BUILDDIR
-#For executing test cases
-SCM_FILE_LINKS = ${gncscmmod_DATA}
-endif
-
-.scm-links:
-	$(RM) -rf gnucash
-	mkdir -p  gnucash
-	mkdir -p  gnucash/report
-if GNUCASH_SEPARATE_BUILDDIR
-	for X in ${SCM_FILE_LINKS} ; do \
-	  $(LN_S) -f ${srcdir}/$$X . ; \
-	done
-endif
-	( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
-if ! OS_WIN32
-# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
-	touch .scm-links
-endif
-
-if GNC_HAVE_GUILE_2
-GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --gnc-module-dir ${top_builddir}/src/report/stylesheets \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/stylesheets \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/report/stylesheets
-
-%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
-	GNC_UNINSTALLED=yes \
-	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
-	$(GUILD) compile -o $@ $<
-
-gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
-gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
-endif
-
-clean-local:
-	$(RM) -rf gnucash
-
-noinst_DATA = .scm-links
-
-uidir = $(GNC_UI_DIR)
-dist_ui_DATA = \
-	gnc-plugin-stylesheets-ui.xml
-
-EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt
-
-CLEANFILES = .scm-links ${gncscmmodcache_DATA}
-DISTCLEANFILES = ${SCM_FILE_LINKS}
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\"
diff --git a/src/report/stylesheets/test/Makefile.am b/src/report/stylesheets/test/Makefile.am
deleted file mode 100644
index 73b133aaec..0000000000
--- a/src/report/stylesheets/test/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-TESTS=test-load-module
-
-GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --gnc-module-dir ${top_builddir}/src/report/stylesheets \
-\
-  --guile-load-dir ${top_builddir}/src/test-core \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/stylesheets \
-\
-  --library-dir    ${top_builddir}/src/test-core \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system \
-  --library-dir    ${top_builddir}/src/report/report-gnome
-
-TESTS_ENVIRONMENT = \
-  GUILE_WARN_DEPRECATED=no \
-  GUILE="${GUILE}" \
-  GNC_BUILDDIR="${abs_top_builddir}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-EXTRA_DIST = test-load-module CMakeLists.txt
diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am
deleted file mode 100644
index 33a03b0224..0000000000
--- a/src/report/utility-reports/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
-gncscmmod_DATA = \
-  hello-world.scm \
-  utility-reports.scm \
-  view-column.scm \
-  welcome-to-gnucash.scm
-
-#  test-graphing.scm -- not intended for general public?!? Surely not translated at all.
-
-if GNUCASH_SEPARATE_BUILDDIR
-#For separate build directory
-SCM_FILE_LINKS = \
-  ${gncscmmod_DATA}
-endif
-
-.scm-links:
-	$(RM) -rf gnucash
-	mkdir -p  gnucash
-	mkdir -p  gnucash/report
-if GNUCASH_SEPARATE_BUILDDIR
-	for X in ${SCM_FILE_LINKS} ; do \
-	  $(LN_S) -f ${srcdir}/$$X . ; \
-	done
-endif
-	( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
-if ! OS_WIN32
-# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
-	touch .scm-links
-endif
-
-if GNC_HAVE_GUILE_2
-GUILE_COMPILE_ENV = \
-  --gnc-module-dir ${top_builddir}/src/app-utils \
-  --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/gnome-utils \
-  --gnc-module-dir ${top_builddir}/src/html \
-  --gnc-module-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/core-utils \
-  --guile-load-dir ${top_builddir}/src/engine \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --guile-load-dir ${top_builddir}/src/report/report-system \
-  --guile-load-dir ${top_builddir}/src/report/utility-reports \
-  --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/engine \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/backend/xml \
-  --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/html \
-  --library-dir    ${top_builddir}/src/report/report-system
-
-%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
-	GNC_UNINSTALLED=yes \
-	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
-	$(GUILD) compile -o $@ $<
-
-gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
-gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
-endif
-
-clean-local:
-	$(RM) -rf gnucash
-
-noinst_DATA = .scm-links
-
-EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt
-
-CLEANFILES = .scm-links ${gncscmmodcache_DATA}
-DISTCLEANFILES = ${SCM_FILE_LINKS}
-
-AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.report.util\"
diff --git a/src/tax/us/test/Makefile.am b/src/tax/us/test/Makefile.am
deleted file mode 100644
index c25bb4388a..0000000000
--- a/src/tax/us/test/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-TESTS = test-link-module
-
-# Some of these dirs may not be needed anymore.
-GNC_TEST_DEPS = \
-  --gnc-module-dir ${top_builddir}/src/tax/us \
-  --guile-load-dir ${top_builddir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/src/tax/us \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module
-
-TESTS_ENVIRONMENT = \
-  GUILE="${GUILE}" \
-  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-
-check_PROGRAMS=test-link-module
-test_link_module_SOURCES=test-link-module.c
-test_link_module_LDADD=../libgncmod-tax-us.la ${GUILE_LIBS} ${GLIB_LIBS}
-
-EXTRA_DIST = CMakeLists.txt