Index: configure
===================================================================
--- configure	(revision e614d73db9dfdf88b2a5090424bfb97112fa4605)
+++ configure	(revision bf71cfdb7285490eee552b461158846f626cc52f)
@@ -3381,5 +3381,5 @@
 
 # Create variables for commonly used targets
-DRIVER_DIR='$(top_builddir)/src/driver'
+DRIVER_DIR='$(top_builddir)/driver'
 CFACC=${DRIVER_DIR}/cfa
 CFACPP=${DRIVER_DIR}/cfa-cpp
@@ -3389,6 +3389,6 @@
 
 # Flag variables needed to build in tree
-LIBCFA_SRC='$(top_srcdir)/src/libcfa'
-LIBCFA_BUILD='$(top_builddir)/src/libcfa'
+LIBCFA_SRC='$(top_srcdir)/libcfa/src'
+LIBCFA_BUILD='$(top_builddir)/libcfa/src'
 BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
 BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
@@ -6283,11 +6283,11 @@
 
 
-ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/tests/Makefile src/tests/preempt_longrun/Makefile src/prelude/Makefile src/libcfa/Makefile tools/Makefile tools/prettyprinter/Makefile"
-
-
-ac_config_links="$ac_config_links src/tests/test.py:src/tests/test.py"
-
-
-ac_config_files="$ac_config_files src/tests/config.py"
+ac_config_files="$ac_config_files Makefile driver/Makefile src/Makefile benchmark/Makefile tests/Makefile tests/preempt_longrun/Makefile libcfa/prelude/Makefile libcfa/src/Makefile tools/Makefile tools/prettyprinter/Makefile"
+
+
+ac_config_links="$ac_config_links tests/test.py:tests/test.py"
+
+
+ac_config_files="$ac_config_files tests/config.py"
 
 cat >confcache <<\_ACEOF
@@ -7047,15 +7047,15 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/driver/Makefile" ;;
+    "driver/Makefile") CONFIG_FILES="$CONFIG_FILES driver/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/benchmark/Makefile") CONFIG_FILES="$CONFIG_FILES src/benchmark/Makefile" ;;
-    "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
-    "src/tests/preempt_longrun/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/preempt_longrun/Makefile" ;;
-    "src/prelude/Makefile") CONFIG_FILES="$CONFIG_FILES src/prelude/Makefile" ;;
-    "src/libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcfa/Makefile" ;;
+    "benchmark/Makefile") CONFIG_FILES="$CONFIG_FILES benchmark/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "tests/preempt_longrun/Makefile") CONFIG_FILES="$CONFIG_FILES tests/preempt_longrun/Makefile" ;;
+    "libcfa/prelude/Makefile") CONFIG_FILES="$CONFIG_FILES libcfa/prelude/Makefile" ;;
+    "libcfa/src/Makefile") CONFIG_FILES="$CONFIG_FILES libcfa/src/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/prettyprinter/Makefile") CONFIG_FILES="$CONFIG_FILES tools/prettyprinter/Makefile" ;;
-    "src/tests/test.py") CONFIG_LINKS="$CONFIG_LINKS src/tests/test.py:src/tests/test.py" ;;
-    "src/tests/config.py") CONFIG_FILES="$CONFIG_FILES src/tests/config.py" ;;
+    "tests/test.py") CONFIG_LINKS="$CONFIG_LINKS tests/test.py:tests/test.py" ;;
+    "tests/config.py") CONFIG_FILES="$CONFIG_FILES tests/config.py" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;