diff --git a/.gitignore b/.gitignore
index 8b2cc40aee..3e26b9155d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 .downloads-by-cmake
 .gdb_history
 boost_root
-Build/
-build/
+/Build
+/build
 common/fp_lib_table_keywords.cpp
 common/drc_rules_keywords.cpp
 common/drc_rules_lexer.h
diff --git a/CMakeModules/Findngspice.cmake b/CMakeModules/Findngspice.cmake
index e4f328cce1..62a9a184eb 100644
--- a/CMakeModules/Findngspice.cmake
+++ b/CMakeModules/Findngspice.cmake
@@ -138,7 +138,7 @@ if( ${NGSPICE_INCLUDE_DIR} STREQUAL "NGSPICE_INCLUDE_DIR-NOTFOUND" OR ${NGSPICE_
     message( "Most of ngspice packages do not provide the required libngspice library." )
     message( "You can either compile ngspice configured with --with-ngshared parameter" )
     message( "or run a script that does the job for you:" )
-    message( "  cd ./scripting/build_tools" )
+    message( "  cd ./tools/build" )
     message( "  chmod +x get_libngspice_so.sh" )
     message( "  ./get_libngspice_so.sh" )
     message( "  sudo ./get_libngspice_so.sh install" )
diff --git a/README.md b/README.md
index d321737d77..50a241e225 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ GitLab CI pipeline status can be viewed for Linux and Windows builds of the late
 * [common](common)            - Sourcecode of the common library
 * [cvpcb](cvpcb)             - Sourcecode of the CvPCB tool
 * [demos](demos)             - Some demo examples
-* [Documentation](Documentation)     - Developer documentation (deprecated; moved to [https://dev-docs.kicad.org](https://dev-docs.kicad.org))
+* [doxygen](doxygen)     - Configuration for generating pretty doxygen manual of the codebase
 * [eeschema](eeschema)          - Sourcecode of the schematic editor
 * [gerbview](gerbview)          - Sourcecode of the gerber viewer
 * [helpers](helpers)           - Helper tools and utilities for development
@@ -52,10 +52,9 @@ GitLab CI pipeline status can be viewed for Linux and Windows builds of the late
 * [plugins](plugins)           - Sourcecode for the 3D viewer plugins
 * [qa](qa)                - Unit testing framework for KiCad
 * [resources](resources)         - Packaging resources for various operating systems
-* [scripting](scripting)         - SWIG Python scripting definitions and build scripts
-* [scripts](scripts)           - Example scripts for distribution with KiCad
+* [scripting](scripting)         - Python integration for KiCad
 * [template](template)          - Project template
 * [thirdparty](thirdparty)           - Sourcecode of external libraries used in KiCad but not written by the KiCad team
-* [tools](tools)             - Other miscellaneous helpers for testing
+* [tools](tools)             - Other miscellaneous helpers for testing and building
 * [translation](translation) - Translation data files (managed through [Weblate](https://hosted.weblate.org/projects/kicad/master-source/) for most languages)
 * [utils](utils)             - Small utils for KiCad, e.g. IDF, STEP, and OGL tools and converters
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index f55439f09a..1577929550 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -509,7 +509,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx
         ${SWIG_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx ${CMAKE_SOURCE_DIR}/pcbnew/python/swig/pcbnew.i
 
     COMMAND ${PYTHON_EXECUTABLE}
-        ${CMAKE_SOURCE_DIR}/scripting/build_tools/fix_swig_imports.py
+        ${CMAKE_SOURCE_DIR}/tools/build/fix_swig_imports.py
         ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py
 
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -538,7 +538,7 @@ if( DOXYGEN_FOUND )
     add_custom_target( xml-to-docstrings
         COMMAND ${CMAKE_COMMAND} -E remove_directory docstrings
         COMMAND ${CMAKE_COMMAND} -E make_directory docstrings
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/build_tools/extract_docstrings.py pcbnew.py doxygen-xml/xml docstrings
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/extract_docstrings.py pcbnew.py doxygen-xml/xml docstrings
         COMMAND ${CMAKE_COMMAND} -E remove pcbnew.py # force removal so it will be recreated later with the new docstrings
         COMMENT "building docstring files"
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/scripting/build_tools/extract_docstrings.py b/tools/build/extract_docstrings.py
similarity index 100%
rename from scripting/build_tools/extract_docstrings.py
rename to tools/build/extract_docstrings.py
diff --git a/scripting/build_tools/fix_swig_imports.py b/tools/build/fix_swig_imports.py
similarity index 100%
rename from scripting/build_tools/fix_swig_imports.py
rename to tools/build/fix_swig_imports.py
diff --git a/scripting/build_tools/get_libngspice_so.sh b/tools/build/get_libngspice_so.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripting/build_tools/get_libngspice_so.sh
rename to tools/build/get_libngspice_so.sh
diff --git a/scripting/build_tools/mk_macos_icons.py b/tools/build/mk_macos_icons.py
old mode 100755
new mode 100644
similarity index 100%
rename from scripting/build_tools/mk_macos_icons.py
rename to tools/build/mk_macos_icons.py
diff --git a/scripting/build_tools/mk_mime_icons.py b/tools/build/mk_mime_icons.py
old mode 100755
new mode 100644
similarity index 100%
rename from scripting/build_tools/mk_mime_icons.py
rename to tools/build/mk_mime_icons.py
diff --git a/scripts/lib_convert.py b/tools/lib_convert.py
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/lib_convert.py
rename to tools/lib_convert.py
diff --git a/scripts/test_kicad_plugin.py b/tools/tests/test_kicad_plugin.py
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/test_kicad_plugin.py
rename to tools/tests/test_kicad_plugin.py
diff --git a/scripts/test_plugin.py b/tools/tests/test_plugin.py
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/test_plugin.py
rename to tools/tests/test_plugin.py