diff --git a/cmake/bornagain/modules/CheckCode.cmake b/cmake/bornagain/modules/CheckCode.cmake
index 1d7e513da118aa7282d5b179d10947aa68132e7e..e2e0fefb444e2fac68de366775aea44d273deec8 100644
--- a/cmake/bornagain/modules/CheckCode.cmake
+++ b/cmake/bornagain/modules/CheckCode.cmake
@@ -5,5 +5,5 @@ file(GLOB_RECURSE SRC2 "Core/*.h")
 
 add_test(NAME "CodeLineLength"
     COMMAND  ${PYTHON_EXECUTABLE}
-    ${CMAKE_SOURCE_DIR}/dev-tools/code-tools/count-line-length.py ${SRC_LEN_LIM}
+    ${CMAKE_SOURCE_DIR}/dev-tools/analyze/count-line-length.py ${SRC_LEN_LIM}
     ${SRC1} ${SRC2})
diff --git a/cmake/bornagain/modules/CheckExamples.cmake b/cmake/bornagain/modules/CheckExamples.cmake
index a2c7ece39454b46a51d69846363923efebb3a971..50fe78dfea583039729666b8f46978a4aea05690 100644
--- a/cmake/bornagain/modules/CheckExamples.cmake
+++ b/cmake/bornagain/modules/CheckExamples.cmake
@@ -6,5 +6,5 @@ file(GLOB PY_EXAMPLES "Examples/python/*/ex*/*.py")
 
 add_test(NAME "PyExampleLineLength"
     COMMAND ${PYTHON_EXECUTABLE}
-    ${CMAKE_SOURCE_DIR}/dev-tools/code-tools/count-line-length.py ${WEB_LEN_LIM}
+    ${CMAKE_SOURCE_DIR}/dev-tools/analyze/count-line-length.py ${WEB_LEN_LIM}
     ${PY_EXAMPLES})
diff --git a/dev-tools/git-utils/cl_lines_of_code.py b/dev-tools/analyze/cl_lines_of_code.py
similarity index 100%
rename from dev-tools/git-utils/cl_lines_of_code.py
rename to dev-tools/analyze/cl_lines_of_code.py
diff --git a/dev-tools/code-tools/count-line-length.py b/dev-tools/analyze/count-line-length.py
similarity index 100%
rename from dev-tools/code-tools/count-line-length.py
rename to dev-tools/analyze/count-line-length.py
diff --git a/dev-tools/git-utils/lines_of_code.png b/dev-tools/analyze/lines_of_code.png
similarity index 100%
rename from dev-tools/git-utils/lines_of_code.png
rename to dev-tools/analyze/lines_of_code.png
diff --git a/dev-tools/git-utils/lines_of_code.py b/dev-tools/analyze/lines_of_code.py
similarity index 100%
rename from dev-tools/git-utils/lines_of_code.py
rename to dev-tools/analyze/lines_of_code.py
diff --git a/dev-tools/deployment/mavericks-dev/Vagrantfile b/dev-tools/deploy/mavericks-dev/Vagrantfile
similarity index 100%
rename from dev-tools/deployment/mavericks-dev/Vagrantfile
rename to dev-tools/deploy/mavericks-dev/Vagrantfile
diff --git a/dev-tools/deployment/mavericks-dev/build_bornagain.sh b/dev-tools/deploy/mavericks-dev/build_bornagain.sh
similarity index 100%
rename from dev-tools/deployment/mavericks-dev/build_bornagain.sh
rename to dev-tools/deploy/mavericks-dev/build_bornagain.sh
diff --git a/dev-tools/deployment/ubuntu-dev/Vagrantfile b/dev-tools/deploy/ubuntu-dev/Vagrantfile
similarity index 100%
rename from dev-tools/deployment/ubuntu-dev/Vagrantfile
rename to dev-tools/deploy/ubuntu-dev/Vagrantfile
diff --git a/dev-tools/deployment/ubuntu-dev/build_bornagain.sh b/dev-tools/deploy/ubuntu-dev/build_bornagain.sh
similarity index 100%
rename from dev-tools/deployment/ubuntu-dev/build_bornagain.sh
rename to dev-tools/deploy/ubuntu-dev/build_bornagain.sh
diff --git a/dev-tools/deployment/ubuntu-dev/ubuntu_provision.sh b/dev-tools/deploy/ubuntu-dev/ubuntu_provision.sh
similarity index 100%
rename from dev-tools/deployment/ubuntu-dev/ubuntu_provision.sh
rename to dev-tools/deploy/ubuntu-dev/ubuntu_provision.sh
diff --git a/dev-tools/code-tools/ed-files-vanilla.py b/dev-tools/edit/ed-files-vanilla.py
similarity index 100%
rename from dev-tools/code-tools/ed-files-vanilla.py
rename to dev-tools/edit/ed-files-vanilla.py
diff --git a/dev-tools/code-tools/update-filename.py b/dev-tools/edit/update-filename.py
similarity index 100%
rename from dev-tools/code-tools/update-filename.py
rename to dev-tools/edit/update-filename.py
diff --git a/dev-tools/code-tools/update_minimizers.py b/dev-tools/edit/update_minimizers.py
similarity index 100%
rename from dev-tools/code-tools/update_minimizers.py
rename to dev-tools/edit/update_minimizers.py
diff --git a/dev-tools/code-tools/update_sourcecode_header.py b/dev-tools/edit/update_sourcecode_header.py
similarity index 100%
rename from dev-tools/code-tools/update_sourcecode_header.py
rename to dev-tools/edit/update_sourcecode_header.py