diff --git a/cmake/bornagain/modules/BornAgainCPack.cmake b/cmake/bornagain/modules/BornAgainCPack.cmake
index 4bd2056e4e2c75dc57ebf62b537e20858703367c..a0990aa32edb3e9b6f1b65f3f9cd27efccc1d0d1 100644
--- a/cmake/bornagain/modules/BornAgainCPack.cmake
+++ b/cmake/bornagain/modules/BornAgainCPack.cmake
@@ -50,10 +50,10 @@ set(CPACK_SOURCE_IGNORE_FILES
     ${CPACK_SOURCE_IGNORE_FILES} # first take the default parameters
     "/Doc/FFCatalog/"
     "/Doc/PhysicsManual/"
-    "/dev-tools/edit-scripts/"
-    "/dev-tools/packaging/"
-    "/dev-tools/tmp-examples/"
-    "/dev-tools/tmp-unsorted/"
+    "/devtools/edit-scripts/"
+    "/devtools/packaging/"
+    "/devtools/tmp-examples/"
+    "/devtools/tmp-unsorted/"
     "/XCode_BornAgain.xcodeproj/"
     "~$"
     "/.git/"
@@ -72,8 +72,8 @@ set(CPACK_SOURCE_IGNORE_FILES
     "\\\\.obj"
     "CMakeLists.txt.user"
     "/bin/release.sh.in" # user will not need it
-    "/dev-tools/git-utils/cl_lines_of_code.py"
-    "/dev-tools/git-utils/qqq.png" # remove this line when unneeded
+    "/devtools/git-utils/cl_lines_of_code.py"
+    "/devtools/git-utils/qqq.png" # remove this line when unneeded
     ".pro$"
     ".pro.user$"
     ".pri$"
diff --git a/cmake/bornagain/modules/CheckCode.cmake b/cmake/bornagain/modules/CheckCode.cmake
index 09e4da1d493d8127b09e705035ab835053dabf30..96502f1f9c994f84b7f63515a158dc43422f8d0f 100644
--- a/cmake/bornagain/modules/CheckCode.cmake
+++ b/cmake/bornagain/modules/CheckCode.cmake
@@ -11,6 +11,6 @@ if(NOT MSVC)
 
     add_test(NAME "CodeLineLength"
         COMMAND ${Python_EXECUTABLE}
-        ${CMAKE_SOURCE_DIR}/dev-tools/analyze/check-line-length.py ${SRC_LEN_LIM}
+        ${CMAKE_SOURCE_DIR}/devtools/analyze/check-line-length.py ${SRC_LEN_LIM}
         ${SRC1} ${SRC2})
 endif()
diff --git a/cmake/bornagain/modules/PyExamplesLineLength.cmake b/cmake/bornagain/modules/PyExamplesLineLength.cmake
index 7894d9fea16806a5fb7a466e8fb58a0677da9bb5..27259d3747a5071a58ca4206ddca98e49237fec8 100644
--- a/cmake/bornagain/modules/PyExamplesLineLength.cmake
+++ b/cmake/bornagain/modules/PyExamplesLineLength.cmake
@@ -7,7 +7,7 @@ if(NOT MSVC)
 file(GLOB PY_EXAMPLES "${PY_EXAMPLES_DIR}/*/ex*/*.py")
 
 add_test(NAME "PyExamplesLineLength" COMMAND ${Python_EXECUTABLE}
-    ${CMAKE_SOURCE_DIR}/dev-tools/analyze/check-line-length.py ${WEB_LEN_LIM}
+    ${CMAKE_SOURCE_DIR}/devtools/analyze/check-line-length.py ${WEB_LEN_LIM}
     ${PY_EXAMPLES})
 
 endif()
diff --git a/dev-tools/README b/devtools/README
similarity index 100%
rename from dev-tools/README
rename to devtools/README
diff --git a/dev-tools/ad-hoc/JWu/bornplot2.py b/devtools/ad-hoc/JWu/bornplot2.py
similarity index 100%
rename from dev-tools/ad-hoc/JWu/bornplot2.py
rename to devtools/ad-hoc/JWu/bornplot2.py
diff --git a/dev-tools/ad-hoc/JWu/par_changed.py b/devtools/ad-hoc/JWu/par_changed.py
similarity index 100%
rename from dev-tools/ad-hoc/JWu/par_changed.py
rename to devtools/ad-hoc/JWu/par_changed.py
diff --git a/dev-tools/ad-hoc/JWu/partial_history.txt b/devtools/ad-hoc/JWu/partial_history.txt
similarity index 100%
rename from dev-tools/ad-hoc/JWu/partial_history.txt
rename to devtools/ad-hoc/JWu/partial_history.txt
diff --git a/dev-tools/ad-hoc/JWu/perf-log-old2yaml.py b/devtools/ad-hoc/JWu/perf-log-old2yaml.py
similarity index 100%
rename from dev-tools/ad-hoc/JWu/perf-log-old2yaml.py
rename to devtools/ad-hoc/JWu/perf-log-old2yaml.py
diff --git a/dev-tools/analyze/baloc/__init__.py b/devtools/analyze/baloc/__init__.py
similarity index 100%
rename from dev-tools/analyze/baloc/__init__.py
rename to devtools/analyze/baloc/__init__.py
diff --git a/dev-tools/analyze/baloc/file_types.py b/devtools/analyze/baloc/file_types.py
similarity index 100%
rename from dev-tools/analyze/baloc/file_types.py
rename to devtools/analyze/baloc/file_types.py
diff --git a/dev-tools/analyze/baloc/history_collector.py b/devtools/analyze/baloc/history_collector.py
similarity index 100%
rename from dev-tools/analyze/baloc/history_collector.py
rename to devtools/analyze/baloc/history_collector.py
diff --git a/dev-tools/analyze/baloc/history_plot.py b/devtools/analyze/baloc/history_plot.py
similarity index 100%
rename from dev-tools/analyze/baloc/history_plot.py
rename to devtools/analyze/baloc/history_plot.py
diff --git a/dev-tools/analyze/check-line-length.py b/devtools/analyze/check-line-length.py
similarity index 100%
rename from dev-tools/analyze/check-line-length.py
rename to devtools/analyze/check-line-length.py
diff --git a/dev-tools/analyze/gitlog.tmp b/devtools/analyze/gitlog.tmp
similarity index 100%
rename from dev-tools/analyze/gitlog.tmp
rename to devtools/analyze/gitlog.tmp
diff --git a/dev-tools/analyze/lines_of_code.png b/devtools/analyze/lines_of_code.png
similarity index 100%
rename from dev-tools/analyze/lines_of_code.png
rename to devtools/analyze/lines_of_code.png
diff --git a/dev-tools/analyze/lines_of_code.py b/devtools/analyze/lines_of_code.py
similarity index 100%
rename from dev-tools/analyze/lines_of_code.py
rename to devtools/analyze/lines_of_code.py
diff --git a/dev-tools/code-tools/print-includes.py b/devtools/code-tools/print-includes.py
similarity index 100%
rename from dev-tools/code-tools/print-includes.py
rename to devtools/code-tools/print-includes.py
diff --git a/dev-tools/code-tools/update-filename.py b/devtools/code-tools/update-filename.py
similarity index 100%
rename from dev-tools/code-tools/update-filename.py
rename to devtools/code-tools/update-filename.py
diff --git a/dev-tools/code-tools/update-minimizers.py b/devtools/code-tools/update-minimizers.py
similarity index 100%
rename from dev-tools/code-tools/update-minimizers.py
rename to devtools/code-tools/update-minimizers.py
diff --git a/dev-tools/code-tools/update-sourcecode-header.py b/devtools/code-tools/update-sourcecode-header.py
similarity index 100%
rename from dev-tools/code-tools/update-sourcecode-header.py
rename to devtools/code-tools/update-sourcecode-header.py
diff --git a/dev-tools/code-tools/update-website.py b/devtools/code-tools/update-website.py
similarity index 100%
rename from dev-tools/code-tools/update-website.py
rename to devtools/code-tools/update-website.py
diff --git a/dev-tools/deploy/yosemite-dev/Vagrantfile b/devtools/deploy/yosemite-dev/Vagrantfile
similarity index 100%
rename from dev-tools/deploy/yosemite-dev/Vagrantfile
rename to devtools/deploy/yosemite-dev/Vagrantfile
diff --git a/dev-tools/deploy/yosemite-dev/build_bornagain.sh b/devtools/deploy/yosemite-dev/build_bornagain.sh
similarity index 100%
rename from dev-tools/deploy/yosemite-dev/build_bornagain.sh
rename to devtools/deploy/yosemite-dev/build_bornagain.sh
diff --git a/dev-tools/log/perf_history.txt b/devtools/log/perf_history.txt
similarity index 100%
rename from dev-tools/log/perf_history.txt
rename to devtools/log/perf_history.txt
diff --git a/dev-tools/math/fftest/Makefile b/devtools/math/fftest/Makefile
similarity index 100%
rename from dev-tools/math/fftest/Makefile
rename to devtools/math/fftest/Makefile
diff --git a/dev-tools/math/fftest/ff_diff.py b/devtools/math/fftest/ff_diff.py
similarity index 100%
rename from dev-tools/math/fftest/ff_diff.py
rename to devtools/math/fftest/ff_diff.py
diff --git a/dev-tools/math/fftest/limit-run b/devtools/math/fftest/limit-run
similarity index 100%
rename from dev-tools/math/fftest/limit-run
rename to devtools/math/fftest/limit-run
diff --git a/dev-tools/math/fftest/polyh_test.cpp b/devtools/math/fftest/polyh_test.cpp
similarity index 100%
rename from dev-tools/math/fftest/polyh_test.cpp
rename to devtools/math/fftest/polyh_test.cpp
diff --git a/dev-tools/math/fftest/runff.cpp b/devtools/math/fftest/runff.cpp
similarity index 100%
rename from dev-tools/math/fftest/runff.cpp
rename to devtools/math/fftest/runff.cpp
diff --git a/dev-tools/math/fftest/triangle_runs b/devtools/math/fftest/triangle_runs
similarity index 100%
rename from dev-tools/math/fftest/triangle_runs
rename to devtools/math/fftest/triangle_runs
diff --git a/dev-tools/math/polyhedron/setup_dodecahedron.py b/devtools/math/polyhedron/setup_dodecahedron.py
similarity index 100%
rename from dev-tools/math/polyhedron/setup_dodecahedron.py
rename to devtools/math/polyhedron/setup_dodecahedron.py
diff --git a/dev-tools/math/polyhedron/setup_icosahedron.py b/devtools/math/polyhedron/setup_icosahedron.py
similarity index 100%
rename from dev-tools/math/polyhedron/setup_icosahedron.py
rename to devtools/math/polyhedron/setup_icosahedron.py
diff --git a/dev-tools/mpi/pytests/mpi_cpp_test.py b/devtools/mpi/pytests/mpi_cpp_test.py
similarity index 100%
rename from dev-tools/mpi/pytests/mpi_cpp_test.py
rename to devtools/mpi/pytests/mpi_cpp_test.py
diff --git a/dev-tools/mpi/pytests/mpi_test.py b/devtools/mpi/pytests/mpi_test.py
similarity index 100%
rename from dev-tools/mpi/pytests/mpi_test.py
rename to devtools/mpi/pytests/mpi_test.py
diff --git a/dev-tools/mpi/pytests/version.py b/devtools/mpi/pytests/version.py
similarity index 100%
rename from dev-tools/mpi/pytests/version.py
rename to devtools/mpi/pytests/version.py
diff --git a/dev-tools/mpi/supermuc.sh b/devtools/mpi/supermuc.sh
similarity index 100%
rename from dev-tools/mpi/supermuc.sh
rename to devtools/mpi/supermuc.sh
diff --git a/dev-tools/plot-ff/plotff.py b/devtools/plot-ff/plotff.py
similarity index 100%
rename from dev-tools/plot-ff/plotff.py
rename to devtools/plot-ff/plotff.py
diff --git a/dev-tools/plot-ff/plotpardep.py b/devtools/plot-ff/plotpardep.py
similarity index 100%
rename from dev-tools/plot-ff/plotpardep.py
rename to devtools/plot-ff/plotpardep.py
diff --git a/dev-tools/plot-ff/plotpardeppyramid.py b/devtools/plot-ff/plotpardeppyramid.py
similarity index 100%
rename from dev-tools/plot-ff/plotpardeppyramid.py
rename to devtools/plot-ff/plotpardeppyramid.py
diff --git a/dev-tools/profiling/README b/devtools/profiling/README
similarity index 100%
rename from dev-tools/profiling/README
rename to devtools/profiling/README
diff --git a/dev-tools/profiling/run_gperftools.sh b/devtools/profiling/run_gperftools.sh
similarity index 100%
rename from dev-tools/profiling/run_gperftools.sh
rename to devtools/profiling/run_gperftools.sh
diff --git a/dev-tools/profiling/run_valgrind.sh b/devtools/profiling/run_valgrind.sh
similarity index 100%
rename from dev-tools/profiling/run_valgrind.sh
rename to devtools/profiling/run_valgrind.sh
diff --git a/dev-tools/release/make_release.py b/devtools/release/make_release.py
similarity index 100%
rename from dev-tools/release/make_release.py
rename to devtools/release/make_release.py
diff --git a/dev-tools/release/utils/__init__.py b/devtools/release/utils/__init__.py
similarity index 100%
rename from dev-tools/release/utils/__init__.py
rename to devtools/release/utils/__init__.py
diff --git a/dev-tools/release/utils/check_release.py b/devtools/release/utils/check_release.py
similarity index 100%
rename from dev-tools/release/utils/check_release.py
rename to devtools/release/utils/check_release.py
diff --git a/dev-tools/release/utils/common.py b/devtools/release/utils/common.py
similarity index 100%
rename from dev-tools/release/utils/common.py
rename to devtools/release/utils/common.py
diff --git a/dev-tools/release/utils/finalize_release.py b/devtools/release/utils/finalize_release.py
similarity index 100%
rename from dev-tools/release/utils/finalize_release.py
rename to devtools/release/utils/finalize_release.py
diff --git a/dev-tools/release/utils/prepare_release.py b/devtools/release/utils/prepare_release.py
similarity index 100%
rename from dev-tools/release/utils/prepare_release.py
rename to devtools/release/utils/prepare_release.py
diff --git a/dev-tools/sandboxes/realSpace/README.md b/devtools/sandboxes/realSpace/README.md
similarity index 100%
rename from dev-tools/sandboxes/realSpace/README.md
rename to devtools/sandboxes/realSpace/README.md
diff --git a/dev-tools/sandboxes/realSpace/demo1/CMakeLists.txt b/devtools/sandboxes/realSpace/demo1/CMakeLists.txt
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/CMakeLists.txt
rename to devtools/sandboxes/realSpace/demo1/CMakeLists.txt
diff --git a/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp b/devtools/sandboxes/realSpace/demo1/demo_model.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
rename to devtools/sandboxes/realSpace/demo1/demo_model.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo1/demo_model.h b/devtools/sandboxes/realSpace/demo1/demo_model.h
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/demo_model.h
rename to devtools/sandboxes/realSpace/demo1/demo_model.h
diff --git a/dev-tools/sandboxes/realSpace/demo1/lattice.cpp b/devtools/sandboxes/realSpace/demo1/lattice.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/lattice.cpp
rename to devtools/sandboxes/realSpace/demo1/lattice.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo1/lattice.h b/devtools/sandboxes/realSpace/demo1/lattice.h
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/lattice.h
rename to devtools/sandboxes/realSpace/demo1/lattice.h
diff --git a/dev-tools/sandboxes/realSpace/demo1/main.cpp b/devtools/sandboxes/realSpace/demo1/main.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/main.cpp
rename to devtools/sandboxes/realSpace/demo1/main.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo1/mainwindow.cpp b/devtools/sandboxes/realSpace/demo1/mainwindow.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/mainwindow.cpp
rename to devtools/sandboxes/realSpace/demo1/mainwindow.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo1/mainwindow.h b/devtools/sandboxes/realSpace/demo1/mainwindow.h
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo1/mainwindow.h
rename to devtools/sandboxes/realSpace/demo1/mainwindow.h
diff --git a/dev-tools/sandboxes/realSpace/demo2/CMakeLists.txt b/devtools/sandboxes/realSpace/demo2/CMakeLists.txt
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/CMakeLists.txt
rename to devtools/sandboxes/realSpace/demo2/CMakeLists.txt
diff --git a/dev-tools/sandboxes/realSpace/demo2/main.cpp b/devtools/sandboxes/realSpace/demo2/main.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/main.cpp
rename to devtools/sandboxes/realSpace/demo2/main.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo2/mainwindow.cpp b/devtools/sandboxes/realSpace/demo2/mainwindow.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/mainwindow.cpp
rename to devtools/sandboxes/realSpace/demo2/mainwindow.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo2/mainwindow.h b/devtools/sandboxes/realSpace/demo2/mainwindow.h
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/mainwindow.h
rename to devtools/sandboxes/realSpace/demo2/mainwindow.h
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp b/devtools/sandboxes/realSpace/demo2/modelLayers.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
rename to devtools/sandboxes/realSpace/demo2/modelLayers.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelLayers.h b/devtools/sandboxes/realSpace/demo2/modelLayers.h
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/modelLayers.h
rename to devtools/sandboxes/realSpace/demo2/modelLayers.h
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.cpp b/devtools/sandboxes/realSpace/demo2/modelShowcase.cpp
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/modelShowcase.cpp
rename to devtools/sandboxes/realSpace/demo2/modelShowcase.cpp
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h b/devtools/sandboxes/realSpace/demo2/modelShowcase.h
similarity index 100%
rename from dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
rename to devtools/sandboxes/realSpace/demo2/modelShowcase.h