diff --git a/contrib/art/tango/gnc-invoice-pay.svg b/contrib/art/tango/gnc-invoice-pay.svg
index ac40af7f1a..ec34fba9eb 100644
--- a/contrib/art/tango/gnc-invoice-pay.svg
+++ b/contrib/art/tango/gnc-invoice-pay.svg
@@ -16,7 +16,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.47pre3 r22311"
    sodipodi:docname="gnc-invoice-pay.svg"
-   inkscape:export-filename="/home/janssege/Development/EclipseWS/GnuCash-trunk/src/pixmaps/gnc-invoice-pay.png"
+   inkscape:export-filename="pixmaps/gnc-invoice-pay.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    version="1.0">
diff --git a/gnucash/bin/gnucash-valgrind.in b/gnucash/bin/gnucash-valgrind.in
index d9be7e9c27..a10a874f79 100644
--- a/gnucash/bin/gnucash-valgrind.in
+++ b/gnucash/bin/gnucash-valgrind.in
@@ -12,11 +12,11 @@ TOP_SRC_DIR="@-TOP_SRC_DIR-@"
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 exec valgrind -v \
-    --suppressions=${TOP_SRC_DIR}/src/debug/valgrind/valgrind-gnucash.supp \
-    --suppressions=${TOP_SRC_DIR}/src/debug/valgrind/valgrind-glib.supp \
-    --suppressions=${TOP_SRC_DIR}/src/debug/valgrind/valgrind-libfontconfig.supp \
-    --suppressions=${TOP_SRC_DIR}/src/debug/valgrind/valgrind-libgda.supp \
-    --suppressions=${TOP_SRC_DIR}/src/debug/valgrind/valgrind-libguile.supp \
+    --suppressions=${TOP_SRC_DIR}/common/debug/valgrind/valgrind-gnucash.supp \
+    --suppressions=${TOP_SRC_DIR}/common/debug/valgrind/valgrind-glib.supp \
+    --suppressions=${TOP_SRC_DIR}/common/debug/valgrind/valgrind-libfontconfig.supp \
+    --suppressions=${TOP_SRC_DIR}/common/debug/valgrind/valgrind-libgda.supp \
+    --suppressions=${TOP_SRC_DIR}/common/debug/valgrind/valgrind-libguile.supp \
     --num-callers=25 \
     --error-limit=no \
     --tool=memcheck \
diff --git a/libgnucash/backend/dbi/.splintrc b/libgnucash/backend/dbi/.splintrc
index 312005874e..5026cb77af 100644
--- a/libgnucash/backend/dbi/.splintrc
+++ b/libgnucash/backend/dbi/.splintrc
@@ -7,14 +7,12 @@
 -I..
 -I../..
 -I../../..
--I../../gnc-module
--I../../../src/backend
--I../../../src/backend/sql
--I../../../src/engine
--I../../../src/core-utils
+-I../../../libgnucash/gnc-module
+-I../../../libgnucash/backend
+-I../../../libgnucash/backend/sql
+-I../../../libgnucash/engine
+-I../../../libgnucash/core-utils
 -I../../../lib/libc
--I../../../lib/libqof/qof
--I../../../lib/libqof/qof
 -I/usr/include/glib-2.0
 -I/usr/lib/glib-2.0/include
 -I/usr/include/gconf/2
diff --git a/libgnucash/backend/xml/test/test-load-example-account.cpp b/libgnucash/backend/xml/test/test-load-example-account.cpp
index c098e814f3..796751659c 100644
--- a/libgnucash/backend/xml/test/test-load-example-account.cpp
+++ b/libgnucash/backend/xml/test/test-load-example-account.cpp
@@ -74,7 +74,7 @@ guile_main (void* closure, int argc, char** argv)
 
     if (!location)
     {
-        location = "../../../../accounts/C";
+        location = "../../../../data/accounts/C";
     }
 
     gnc_module_system_init ();
diff --git a/libgnucash/core-utils/gnc-path.c b/libgnucash/core-utils/gnc-path.c
index b9aa1623d8..56b95867d5 100644
--- a/libgnucash/core-utils/gnc-path.c
+++ b/libgnucash/core-utils/gnc-path.c
@@ -168,7 +168,7 @@ gchar *gnc_path_get_reportdir()
     const gchar *builddir = g_getenv ("GNC_BUILDDIR");
     if (g_getenv ("GNC_UNINSTALLED") && builddir)
     {
-        result = g_build_filename (builddir, "src", "report", NULL);
+        result = g_build_filename (builddir, "gnucash", "report", NULL);
     }
     else
     {
diff --git a/libgnucash/doc/doxygen.cfg.in b/libgnucash/doc/doxygen.cfg.in
index b2772a3e36..cde836cf6e 100644
--- a/libgnucash/doc/doxygen.cfg.in
+++ b/libgnucash/doc/doxygen.cfg.in
@@ -652,8 +652,8 @@ WARN_LOGFILE           = doxygen.log
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @-top_srcdir-@/src \
-                         @-top_srcdir-@/src/engine/
+INPUT                  = @-top_srcdir-@/libgnucash \
+                         @-top_srcdir-@/libgnucash/engine/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1548,7 +1548,7 @@ SEARCH_INCLUDES        = YES
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           = @-top_srcdir-@/src/engine/
+INCLUDE_PATH           = @-top_srcdir-@/libgnucash/engine/
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
diff --git a/libgnucash/gnc-module/test/test-gwrapped-c.in b/libgnucash/gnc-module/test/test-gwrapped-c.in
index 9c731cbb75..b3dacaf6d0 100755
--- a/libgnucash/gnc-module/test/test-gwrapped-c.in
+++ b/libgnucash/gnc-module/test/test-gwrapped-c.in
@@ -3,7 +3,7 @@ ${GUILE} -c "(use-modules (gnucash unittest-support))
           (define log-domain \"gnc.module\")
           (define check (new-TestErrorStruct))
           (define log-level (G-LOG-LEVEL-WARNING))
-          (define msg \"Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
+          (define msg \"Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
           (TestErrorStruct-log-domain-set check log-domain)
           (TestErrorStruct-log-level-set check log-level)
           (TestErrorStruct-msg-set check msg)
diff --git a/libgnucash/gnc-module/test/test-load-deps.in b/libgnucash/gnc-module/test/test-load-deps.in
index 5d71951d56..9af641041b 100755
--- a/libgnucash/gnc-module/test/test-load-deps.in
+++ b/libgnucash/gnc-module/test/test-load-deps.in
@@ -7,7 +7,7 @@ exec ${GUILE} -s $0 "$@"
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))
-(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(define msg "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
 (TestErrorStruct-log-domain-set check log-domain)
 (TestErrorStruct-log-level-set check log-level)
 (TestErrorStruct-msg-set check msg)
diff --git a/libgnucash/gnc-module/test/test-load-scm.in b/libgnucash/gnc-module/test/test-load-scm.in
index a411892b2a..61eddeb330 100755
--- a/libgnucash/gnc-module/test/test-load-scm.in
+++ b/libgnucash/gnc-module/test/test-load-scm.in
@@ -6,7 +6,7 @@ exec ${GUILE} -s $0 "$@"
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))
-(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(define msg "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
 (TestErrorStruct-log-domain-set check log-domain)
 (TestErrorStruct-log-level-set check log-level)
 (TestErrorStruct-msg-set check msg)
diff --git a/libgnucash/gnc-module/test/test-scm-init.in b/libgnucash/gnc-module/test/test-scm-init.in
index 86d30dc588..9825da71f5 100755
--- a/libgnucash/gnc-module/test/test-scm-init.in
+++ b/libgnucash/gnc-module/test/test-scm-init.in
@@ -7,7 +7,7 @@ exec ${GUILE} -s $0 "$@"
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))
-(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(define msg "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
 (TestErrorStruct-log-domain-set check log-domain)
 (TestErrorStruct-log-level-set check log-level)
 (TestErrorStruct-msg-set check msg)
diff --git a/libgnucash/gnc-module/test/test-scm-module.in b/libgnucash/gnc-module/test/test-scm-module.in
index 315621b8fb..efac2185bf 100755
--- a/libgnucash/gnc-module/test/test-scm-module.in
+++ b/libgnucash/gnc-module/test/test-scm-module.in
@@ -3,7 +3,7 @@ ${GUILE} -c "(use-modules (gnucash unittest-support))
           (define log-domain \"gnc.module\")
           (define check (new-TestErrorStruct))
           (define log-level (G-LOG-LEVEL-WARNING))
-          (define msg \"Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
+          (define msg \"Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
           (TestErrorStruct-log-domain-set check log-domain)
           (TestErrorStruct-log-level-set check log-level)
           (TestErrorStruct-msg-set check msg)
diff --git a/libgnucash/gnc-module/test/test-scm-multi.in b/libgnucash/gnc-module/test/test-scm-multi.in
index 16491164e0..c0600a2fd4 100755
--- a/libgnucash/gnc-module/test/test-scm-multi.in
+++ b/libgnucash/gnc-module/test/test-scm-multi.in
@@ -5,7 +5,7 @@ exec ${GUILE} -s $0 "$@"
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))
-(define msg "Module '../../../src/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
+(define msg "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n")
 (TestErrorStruct-log-domain-set check log-domain)
 (TestErrorStruct-log-level-set check log-level)
 (TestErrorStruct-msg-set check msg)