diff --git a/CMakeLists.txt b/CMakeLists.txt
index a21aa56432d9e06b0250334b334f9c210f295455..fc6eb8ab02855ba60daff0b7dc07473dd27153e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ IF(UNIX)
 ENDIF()
 
 # -- Sub directories
-ADD_SUBDIRECTORY( amfe )
+ADD_SUBDIRECTORY( modules )
 ADD_SUBDIRECTORY( blast )
 
 # -- FINAL
diff --git a/blast/_src/CMakeLists.txt b/blast/_src/CMakeLists.txt
index 0fdd32e1d2f31b2ff7151dab938b486794f8c493..b24d48dd4dee046078fdd5625e1a54d7729c0ba1 100644
--- a/blast/_src/CMakeLists.txt
+++ b/blast/_src/CMakeLists.txt
@@ -26,10 +26,11 @@ SET_PROPERTY(TARGET blastw PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
 MACRO_DebugPostfix(blastw)
 
 TARGET_INCLUDE_DIRECTORIES(blastw PRIVATE ${PROJECT_SOURCE_DIR}/blast/_src
-                                        ${PROJECT_SOURCE_DIR}/amfe/tbox/_src
-                                        ${PROJECT_SOURCE_DIR}/amfe/fwk/_src
+                                        ${PROJECT_SOURCE_DIR}/modules/dartflo/dart/_src
+                                        ${PROJECT_SOURCE_DIR}/modules/dartflo/ext/amfe/tbox/_src
+                                        ${PROJECT_SOURCE_DIR}/modules/dartflo/ext/amfe/fwk/_src
                                         ${PYTHON_INCLUDE_PATH})
-TARGET_LINK_LIBRARIES(blastw PRIVATE blast tbox fwk ${PYTHON_LIBRARIES})
+TARGET_LINK_LIBRARIES(blastw PRIVATE blast dart tbox fwk ${PYTHON_LIBRARIES})
 
 INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/blastw.py DESTINATION ${CMAKE_INSTALL_PREFIX})
 INSTALL(TARGETS blastw DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9a558a800ffc02b375b37f2772e250fe7e0995b3
--- /dev/null
+++ b/modules/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY( dartflo )
\ No newline at end of file
diff --git a/run.py b/run.py
index ab76a3c4eebeaab7d22832161cb7cc389119e96a..61cb32bdfc478d9bcd5c20366b9a1d402b28e088 100755
--- a/run.py
+++ b/run.py
@@ -22,9 +22,9 @@ def main():
     import os.path, sys
     # adds fwk/tbox to the python path
     thisdir = os.path.split(os.path.abspath(__file__))[0]
-    fwkdir = os.path.abspath(os.path.join(thisdir, 'amfe'))
+    fwkdir = os.path.abspath(os.path.join(thisdir, 'modules/dartflo/ext/amfe'))
     if not os.path.isdir(fwkdir):
-        raise Exception('blaster/amfe not found!\n')
+        raise Exception('blaster/modules/dartflo/amfe not found!\n')
     sys.path.append(fwkdir)
     # adds "." to the pythonpath
     sys.path.append(thisdir)