build: rename build-related dirs

Problem:
Dirs "config", "packaging", and "third-party" are all closely related
but this is not obvious from the layout. This adds friction for new
contributors.

Solution:
- rename config/ to cmake.config/
- rename test/config/ to test/cmakeconfig/ because it is used in Lua
  tests: require('test.cmakeconfig.paths').
- rename packaging/ to cmake.packaging/
- rename third-party/ to cmake.deps/ (parallel with .deps/)

55 files changed, 46 insertions, 44 deletions

diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 6263c436ae..60548f4f58 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -33,7 +33,7 @@ tasks:
     export AUTOMAKE_VERSION=1.16
     mkdir neovim/.deps
     cd neovim/.deps
-    cmake -G Ninja ../third-party/
+    cmake -G Ninja ../cmake.deps/
     cmake --build . --config RelWithDebInfo
 - build: |
     mkdir neovim/build
diff --git a/.github/labeler.yml b/.github/labeler.yml
index fb06b0b379..04e7b281d1 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -18,7 +18,7 @@
   - runtime/lua/vim/diagnostic.lua
 
 "dependencies":
-  - third-party/**/*
+  - cmake.deps/**/*
 
 "spell":
   - src/nvim/spell*
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef70fdfc3c..bdc487894e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,9 +98,9 @@ jobs:
           path: |
             ${{ env.CACHE_NVIM_DEPS_DIR }}
             ~/.ccache
-          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!third-party/**CMakeLists.txt') }}-${{ github.base_ref }}
+          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!cmake.deps/**CMakeLists.txt') }}-${{ github.base_ref }}
 
-      - name: Build third-party
+      - name: Build third-party deps
         run: ./ci/before_script.sh
 
       - name: Build nvim
@@ -236,9 +236,9 @@ jobs:
           path: |
             ${{ env.CACHE_NVIM_DEPS_DIR }}
             ~/.ccache
-          key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'third-party/**', '**/CMakeLists.txt') }}-${{ github.base_ref }}
+          key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'cmake.deps/**', '**/CMakeLists.txt') }}-${{ github.base_ref }}
 
-      - name: Build third-party
+      - name: Build third-party deps
         run: ./ci/before_script.sh
 
       - name: Build
@@ -276,7 +276,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ${{ env.DEPS_BUILD_DIR }}
-          key: ${{ hashFiles('third-party\**') }}
+          key: ${{ hashFiles('cmake.deps\**') }}
 
       - name: Run CI
         run: powershell ci\build.ps1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8434a8824c..5fd99b59f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ if(DEFINED ENV{DEPS_BUILD_DIR})
     # pkg-config 29.2 has a bug on OpenBSD which causes it to drop any paths that
     # *contain* system include paths. To avoid this, we prefix what would be
     # "/usr/include" as "/_usr/include".
-    # This check is also performed in the third-party/CMakeLists.txt and in the
+    # This check is also performed in the cmake.deps/CMakeLists.txt and in the
     # else clause following here.
     # https://github.com/neovim/neovim/pull/14745#issuecomment-860201794
     set(DEPS_PREFIX "$ENV{DEPS_BUILD_DIR}/_usr" CACHE PATH "Path prefix for finding dependencies")
@@ -62,7 +62,7 @@ else()
         -DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO}
         -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
         -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-        ${PROJECT_SOURCE_DIR}/third-party
+        ${PROJECT_SOURCE_DIR}/cmake.deps
       WORKING_DIRECTORY ${DEPS_BUILD_DIR})
     execute_process(
       COMMAND ${CMAKE_COMMAND} --build ${DEPS_BUILD_DIR}
@@ -400,7 +400,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT P
     "${CMAKE_MODULE_LINKER_FLAGS} -image_base 100000000")
 endif()
 
-include_directories("${PROJECT_BINARY_DIR}/config")
+include_directories("${PROJECT_BINARY_DIR}/cmake.config")
 include_directories("${PROJECT_SOURCE_DIR}/src")
 
 find_package(LibUV 1.28.0 REQUIRED)
@@ -651,7 +651,7 @@ install_helper(
 add_subdirectory(src/nvim)
 get_directory_property(NVIM_VERSION_CFLAGS DIRECTORY src/nvim DEFINITION NVIM_VERSION_CFLAGS)
 add_subdirectory(test/includes)
-add_subdirectory(config)
+add_subdirectory(cmake.config)
 add_subdirectory(test/functional/fixtures)  # compile test programs
 add_subdirectory(runtime)
 get_directory_property(GENERATED_HELP_TAGS DIRECTORY runtime DEFINITION GENERATED_HELP_TAGS)
@@ -702,11 +702,11 @@ if(BUSTED_PRG)
     set(TEST_LIBNVIM_PATH "")
   endif()
   configure_file(
-    ${CMAKE_SOURCE_DIR}/test/config/paths.lua.in
-    ${CMAKE_BINARY_DIR}/test/config/paths.lua.gen)
+    ${CMAKE_SOURCE_DIR}/test/cmakeconfig/paths.lua.in
+    ${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua.gen)
   file(GENERATE
-    OUTPUT ${CMAKE_BINARY_DIR}/test/config/paths.lua
-    INPUT ${CMAKE_BINARY_DIR}/test/config/paths.lua.gen)
+    OUTPUT ${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua
+    INPUT ${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua.gen)
 
   add_custom_target(functionaltest
     COMMAND ${CMAKE_COMMAND}
@@ -760,5 +760,5 @@ add_custom_target(uninstall
   COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/UninstallHelper.cmake)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-  add_subdirectory(packaging)
+  add_subdirectory(cmake.packaging)
 endif()
diff --git a/MAINTAIN.md b/MAINTAIN.md
index 3bf5ab3c85..9a8531fbd9 100644
--- a/MAINTAIN.md
+++ b/MAINTAIN.md
@@ -63,7 +63,7 @@ or the backport will fail.
 Third-party dependencies
 --------------
 
-These "bundled" dependencies can be updated by bumping their versions in `third-party/CMakeLists.txt`:
+These "bundled" dependencies can be updated by bumping their versions in `cmake.deps/CMakeLists.txt`:
   - [Lua](https://www.lua.org/download.html)
   - [LuaJIT](https://github.com/LuaJIT/LuaJIT)
   - [Luv](https://github.com/luvit/luv)
diff --git a/Makefile b/Makefile
index 5a5bd80763..417d631a77 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ build/.ran-cmake: | deps
 	cd build && $(CMAKE_PRG) -G '$(CMAKE_GENERATOR)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) $(MAKEFILE_DIR)
 	touch $@
 
-deps: | build/.ran-third-party-cmake
+deps: | build/.ran-deps-cmake
 ifeq ($(call filter-true,$(USE_BUNDLED)),)
 	+$(BUILD_TOOL) -C $(DEPS_BUILD_DIR)
 endif
@@ -104,12 +104,12 @@ endif
 ifeq ($(call filter-true,$(USE_BUNDLED)),)
 $(DEPS_BUILD_DIR):
 	mkdir -p "$@"
-build/.ran-third-party-cmake:: $(DEPS_BUILD_DIR)
+build/.ran-deps-cmake:: $(DEPS_BUILD_DIR)
 	cd $(DEPS_BUILD_DIR) && \
 		$(CMAKE_PRG) -G '$(CMAKE_GENERATOR)' $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) \
-		$(DEPS_CMAKE_FLAGS) $(MAKEFILE_DIR)/third-party
+		$(DEPS_CMAKE_FLAGS) $(MAKEFILE_DIR)/cmake.deps
 endif
-build/.ran-third-party-cmake::
+build/.ran-deps-cmake::
 	mkdir -p build
 	touch $@
 
diff --git a/README.md b/README.md
index 718b369012..e3c3c12104 100644
--- a/README.md
+++ b/README.md
@@ -81,8 +81,10 @@ Project layout
 --------------
 
     ├─ ci/              build automation
-    ├─ cmake/           build scripts
-    ├─ runtime/         user plugins/docs
+    ├─ cmake/           CMake utils
+    ├─ cmake.config/    CMake defines
+    ├─ cmake.deps/      subproject to fetch and build dependencies (optional)
+    ├─ runtime/         plugins and docs
     ├─ src/nvim/        application source code (see src/nvim/README.md)
     │  ├─ api/          API subsystem
     │  ├─ eval/         VimL subsystem
@@ -93,7 +95,6 @@ Project layout
     │  ├─ msgpack_rpc/  RPC subsystem
     │  ├─ os/           low-level platform code
     │  └─ tui/          built-in UI
-    ├─ third-party/     CMake subproject to build dependencies
     └─ test/            tests (see test/README.md)
 
 License
diff --git a/ci/build.ps1 b/ci/build.ps1
index 99f66f7de2..767f812091 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -71,9 +71,9 @@ function convertToCmakeArgs($vars) {
 
 cd $env:DEPS_BUILD_DIR
 if ($bits -eq 32) {
-  cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
+  cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/cmake.deps/" ; exitIfFailed
 } else {
-  cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
+  cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/cmake.deps/" ; exitIfFailed
 }
 cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
 cd $buildDir
diff --git a/ci/common/build.sh b/ci/common/build.sh
index b8bbff0b16..f083796a28 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -35,7 +35,7 @@ build_deps() {
   # update CMake configuration and update to newer deps versions.
   cd "${DEPS_BUILD_DIR}"
   echo "Configuring with '${DEPS_CMAKE_FLAGS}'."
-  CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/third-party/"
+  CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/cmake.deps/"
 
   if ! top_make; then
     exit 1
diff --git a/config/CMakeLists.txt b/cmake.config/CMakeLists.txt
index 1f5885758c..8c86b89e43 100644
--- a/config/CMakeLists.txt
+++ b/cmake.config/CMakeLists.txt
@@ -128,14 +128,14 @@ endif()
 
 # generate configuration header and update include directories
 configure_file (
-  "${PROJECT_SOURCE_DIR}/config/config.h.in"
-  "${PROJECT_BINARY_DIR}/config/auto/config.h"
+  "${PROJECT_SOURCE_DIR}/cmake.config/config.h.in"
+  "${PROJECT_BINARY_DIR}/cmake.config/auto/config.h"
   )
 
 # generate version definitions
 configure_file (
-  "${PROJECT_SOURCE_DIR}/config/versiondef.h.in"
-  "${PROJECT_BINARY_DIR}/config/auto/versiondef.h"
+  "${PROJECT_SOURCE_DIR}/cmake.config/versiondef.h.in"
+  "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef.h"
   )
 
 # generate pathdef.c
@@ -158,6 +158,6 @@ elseif (EXISTS ${HOSTNAME_PROG})
 endif()
 
 configure_file (
-  "${PROJECT_SOURCE_DIR}/config/pathdef.c.in"
-  "${PROJECT_BINARY_DIR}/config/auto/pathdef.c"
+  "${PROJECT_SOURCE_DIR}/cmake.config/pathdef.c.in"
+  "${PROJECT_BINARY_DIR}/cmake.config/auto/pathdef.c"
   ESCAPE_QUOTES)
diff --git a/config/config.h.in b/cmake.config/config.h.in
index 59be83fb5e..59be83fb5e 100644
--- a/config/config.h.in
+++ b/cmake.config/config.h.in
diff --git a/config/pathdef.c.in b/cmake.config/pathdef.c.in
index 6a8a2b205a..6a8a2b205a 100644
--- a/config/pathdef.c.in
+++ b/cmake.config/pathdef.c.in
diff --git a/config/versiondef.h.in b/cmake.config/versiondef.h.in
index 22cad87249..22cad87249 100644
--- a/config/versiondef.h.in
+++ b/cmake.config/versiondef.h.in
diff --git a/third-party/CMakeLists.txt b/cmake.deps/CMakeLists.txt
index 6fe5c2baf5..27374a2a9a 100644
--- a/third-party/CMakeLists.txt
+++ b/cmake.deps/CMakeLists.txt
@@ -286,6 +286,7 @@ else()
   set(ALL_DEPS clean-shared-libraries)
 endif()
 
+# TODO(justinmk): does anyone use this target?
 add_custom_target(third-party ALL
   COMMAND ${CMAKE_COMMAND} -E touch .third-party
   DEPENDS ${ALL_DEPS}
diff --git a/third-party/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index 6128ecfa69..6128ecfa69 100644
--- a/third-party/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
diff --git a/third-party/cmake/BuildLibiconv.cmake b/cmake.deps/cmake/BuildLibiconv.cmake
index 5ff33e0cd3..5ff33e0cd3 100644
--- a/third-party/cmake/BuildLibiconv.cmake
+++ b/cmake.deps/cmake/BuildLibiconv.cmake
diff --git a/third-party/cmake/BuildLibtermkey.cmake b/cmake.deps/cmake/BuildLibtermkey.cmake
index d44e09d734..d44e09d734 100644
--- a/third-party/cmake/BuildLibtermkey.cmake
+++ b/cmake.deps/cmake/BuildLibtermkey.cmake
diff --git a/third-party/cmake/BuildLibuv.cmake b/cmake.deps/cmake/BuildLibuv.cmake
index ba5de38714..ba5de38714 100644
--- a/third-party/cmake/BuildLibuv.cmake
+++ b/cmake.deps/cmake/BuildLibuv.cmake
diff --git a/third-party/cmake/BuildLibvterm.cmake b/cmake.deps/cmake/BuildLibvterm.cmake
index 2c300dda7c..2c300dda7c 100644
--- a/third-party/cmake/BuildLibvterm.cmake
+++ b/cmake.deps/cmake/BuildLibvterm.cmake
diff --git a/third-party/cmake/BuildLua.cmake b/cmake.deps/cmake/BuildLua.cmake
index a40cb7dcb2..a40cb7dcb2 100644
--- a/third-party/cmake/BuildLua.cmake
+++ b/cmake.deps/cmake/BuildLua.cmake
diff --git a/third-party/cmake/BuildLuajit.cmake b/cmake.deps/cmake/BuildLuajit.cmake
index c8d5b39398..c8d5b39398 100644
--- a/third-party/cmake/BuildLuajit.cmake
+++ b/cmake.deps/cmake/BuildLuajit.cmake
diff --git a/third-party/cmake/BuildLuarocks.cmake b/cmake.deps/cmake/BuildLuarocks.cmake
index 6933d263f2..6933d263f2 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/cmake.deps/cmake/BuildLuarocks.cmake
diff --git a/third-party/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake
index 6e9a333dc8..6e9a333dc8 100644
--- a/third-party/cmake/BuildLuv.cmake
+++ b/cmake.deps/cmake/BuildLuv.cmake
diff --git a/third-party/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake
index 10bf1c8e37..10bf1c8e37 100644
--- a/third-party/cmake/BuildMsgpack.cmake
+++ b/cmake.deps/cmake/BuildMsgpack.cmake
diff --git a/third-party/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake
index 01fdb837e2..01fdb837e2 100644
--- a/third-party/cmake/BuildTreesitter.cmake
+++ b/cmake.deps/cmake/BuildTreesitter.cmake
diff --git a/third-party/cmake/BuildTreesitterParsers.cmake b/cmake.deps/cmake/BuildTreesitterParsers.cmake
index 11ffb792de..11ffb792de 100644
--- a/third-party/cmake/BuildTreesitterParsers.cmake
+++ b/cmake.deps/cmake/BuildTreesitterParsers.cmake
diff --git a/third-party/cmake/BuildUnibilium.cmake b/cmake.deps/cmake/BuildUnibilium.cmake
index 2f940bdfd3..2f940bdfd3 100644
--- a/third-party/cmake/BuildUnibilium.cmake
+++ b/cmake.deps/cmake/BuildUnibilium.cmake
diff --git a/third-party/cmake/CopyFilesGlob.cmake b/cmake.deps/cmake/CopyFilesGlob.cmake
index 8950ead1e5..8950ead1e5 100644
--- a/third-party/cmake/CopyFilesGlob.cmake
+++ b/cmake.deps/cmake/CopyFilesGlob.cmake
diff --git a/third-party/cmake/DownloadAndExtractFile.cmake b/cmake.deps/cmake/DownloadAndExtractFile.cmake
index abb1ddc81a..abb1ddc81a 100644
--- a/third-party/cmake/DownloadAndExtractFile.cmake
+++ b/cmake.deps/cmake/DownloadAndExtractFile.cmake
diff --git a/third-party/cmake/GetBinaryDeps.cmake b/cmake.deps/cmake/GetBinaryDeps.cmake
index 04e3f95a29..04e3f95a29 100644
--- a/third-party/cmake/GetBinaryDeps.cmake
+++ b/cmake.deps/cmake/GetBinaryDeps.cmake
diff --git a/third-party/cmake/GettextCMakeLists.txt b/cmake.deps/cmake/GettextCMakeLists.txt
index c3f78716d0..c3f78716d0 100644
--- a/third-party/cmake/GettextCMakeLists.txt
+++ b/cmake.deps/cmake/GettextCMakeLists.txt
diff --git a/third-party/cmake/LibiconvCMakeLists.txt b/cmake.deps/cmake/LibiconvCMakeLists.txt
index 8ad3cc9352..8ad3cc9352 100644
--- a/third-party/cmake/LibiconvCMakeLists.txt
+++ b/cmake.deps/cmake/LibiconvCMakeLists.txt
diff --git a/third-party/cmake/LibuvCMakeLists.txt b/cmake.deps/cmake/LibuvCMakeLists.txt
index 0432319834..0432319834 100644
--- a/third-party/cmake/LibuvCMakeLists.txt
+++ b/cmake.deps/cmake/LibuvCMakeLists.txt
diff --git a/third-party/cmake/Libvterm-tbl2inc_c.cmake b/cmake.deps/cmake/Libvterm-tbl2inc_c.cmake
index 7a82f4248b..7a82f4248b 100644
--- a/third-party/cmake/Libvterm-tbl2inc_c.cmake
+++ b/cmake.deps/cmake/Libvterm-tbl2inc_c.cmake
diff --git a/third-party/cmake/LibvtermCMakeLists.txt b/cmake.deps/cmake/LibvtermCMakeLists.txt
index 16c4d542c4..16c4d542c4 100644
--- a/third-party/cmake/LibvtermCMakeLists.txt
+++ b/cmake.deps/cmake/LibvtermCMakeLists.txt
diff --git a/third-party/cmake/RemoveFiles.cmake b/cmake.deps/cmake/RemoveFiles.cmake
index 88e2bc70a6..88e2bc70a6 100644
--- a/third-party/cmake/RemoveFiles.cmake
+++ b/cmake.deps/cmake/RemoveFiles.cmake
diff --git a/third-party/cmake/TargetArch.cmake b/cmake.deps/cmake/TargetArch.cmake
index 71ea44ec59..71ea44ec59 100644
--- a/third-party/cmake/TargetArch.cmake
+++ b/cmake.deps/cmake/TargetArch.cmake
diff --git a/third-party/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt
index 9e3ba3eeda..9e3ba3eeda 100644
--- a/third-party/cmake/TreesitterCMakeLists.txt
+++ b/cmake.deps/cmake/TreesitterCMakeLists.txt
diff --git a/third-party/cmake/TreesitterParserCMakeLists.txt b/cmake.deps/cmake/TreesitterParserCMakeLists.txt
index 2808a9ee14..2808a9ee14 100644
--- a/third-party/cmake/TreesitterParserCMakeLists.txt
+++ b/cmake.deps/cmake/TreesitterParserCMakeLists.txt
diff --git a/third-party/cmake/UnibiliumCMakeLists.txt b/cmake.deps/cmake/UnibiliumCMakeLists.txt
index 08a8599352..08a8599352 100644
--- a/third-party/cmake/UnibiliumCMakeLists.txt
+++ b/cmake.deps/cmake/UnibiliumCMakeLists.txt
diff --git a/third-party/cmake/libtermkeyCMakeLists.txt b/cmake.deps/cmake/libtermkeyCMakeLists.txt
index af54c1daec..af54c1daec 100644
--- a/third-party/cmake/libtermkeyCMakeLists.txt
+++ b/cmake.deps/cmake/libtermkeyCMakeLists.txt
diff --git a/third-party/patches/libvterm-Remove-VLAs-for-MSVC.patch b/cmake.deps/patches/libvterm-Remove-VLAs-for-MSVC.patch
index e999c0fa9b..e999c0fa9b 100644
--- a/third-party/patches/libvterm-Remove-VLAs-for-MSVC.patch
+++ b/cmake.deps/patches/libvterm-Remove-VLAs-for-MSVC.patch
diff --git a/packaging/CMakeLists.txt b/cmake.packaging/CMakeLists.txt
index 8538075388..8538075388 100644
--- a/packaging/CMakeLists.txt
+++ b/cmake.packaging/CMakeLists.txt
diff --git a/packaging/WixPatch.xml b/cmake.packaging/WixPatch.xml
index 3cbbb04850..3cbbb04850 100644
--- a/packaging/WixPatch.xml
+++ b/cmake.packaging/WixPatch.xml
diff --git a/packaging/neovim.icns b/cmake.packaging/neovim.icns
index df0e982369..df0e982369 100644
--- a/packaging/neovim.icns
+++ b/cmake.packaging/neovim.icns
diff --git a/packaging/neovim.ico b/cmake.packaging/neovim.ico
index e0c151c966..e0c151c966 100644
--- a/packaging/neovim.ico
+++ b/cmake.packaging/neovim.ico
diff --git a/packaging/neovim.png b/cmake.packaging/neovim.png
index a3960b41bd..a3960b41bd 100644
--- a/packaging/neovim.png
+++ b/cmake.packaging/neovim.png
diff --git a/packaging/neovim.svg b/cmake.packaging/neovim.svg
index d82ad667c1..d82ad667c1 100644
--- a/packaging/neovim.svg
+++ b/cmake.packaging/neovim.svg
diff --git a/scripts/bump_deps.lua b/scripts/bump_deps.lua
index 2ecbb2e658..17e3fd35d6 100644
--- a/scripts/bump_deps.lua
+++ b/scripts/bump_deps.lua
@@ -132,7 +132,7 @@ end
 local function write_cmakelists_line(symbol, kind, value)
 	require_executable("sed")
 
-	local cmakelists_path = nvim_src_dir .. "/" .. "third-party/CMakeLists.txt"
+	local cmakelists_path = nvim_src_dir .. "/" .. "cmake.deps/CMakeLists.txt"
 	run_die({
 		"sed",
 		"-i",
@@ -169,7 +169,7 @@ local function update_cmakelists(dependency, archive, comment)
 
 	verify_branch(dependency.name)
 
-	local changed_file = nvim_src_dir .. "/" .. "third-party/CMakeLists.txt"
+	local changed_file = nvim_src_dir .. "/" .. "cmake.deps/CMakeLists.txt"
 
 	p("Updating " .. dependency.name .. " to " .. archive.url .. "\n")
 	write_cmakelists_line(dependency.symbol, "URL", archive.url:gsub("/", "\\/"))
@@ -183,7 +183,7 @@ end
 local function verify_cmakelists_committed()
 	require_executable("git")
 
-	local cmakelists_path = nvim_src_dir .. "/" .. "third-party/CMakeLists.txt"
+	local cmakelists_path = nvim_src_dir .. "/" .. "cmake.deps/CMakeLists.txt"
 	run_die({ "git", "diff", "--quiet", "HEAD", "--", cmakelists_path }, cmakelists_path .. " has uncommitted changes")
 end
 
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 0b29abaf5f..56c9fcab72 100755
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -244,12 +244,12 @@ if(use_git_version)
   file(RELATIVE_PATH relbuild "${PROJECT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
   add_custom_target(update_version_stamp ALL
     COMMAND ${LUA_PRG} scripts/update_version_stamp.lua
-      ${relbuild}/config/auto/versiondef_git.h
+      ${relbuild}/cmake.config/auto/versiondef_git.h
       "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}${NVIM_VERSION_PRERELEASE}"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-    BYPRODUCTS ${CMAKE_BINARY_DIR}/config/auto/versiondef_git.h)
+    BYPRODUCTS ${CMAKE_BINARY_DIR}/cmake.config/auto/versiondef_git.h)
 else()
-  file(WRITE ${CMAKE_BINARY_DIR}/config/auto/versiondef_git.h "")
+  file(WRITE ${CMAKE_BINARY_DIR}/cmake.config/auto/versiondef_git.h "")
 endif()
 
 # NVIM_GENERATED_FOR_HEADERS: generated headers to be included in headers
@@ -394,7 +394,7 @@ list(APPEND NVIM_GENERATED_FOR_SOURCES
 )
 
 list(APPEND NVIM_GENERATED_SOURCES
-  "${PROJECT_BINARY_DIR}/config/auto/pathdef.c"
+  "${PROJECT_BINARY_DIR}/cmake.config/auto/pathdef.c"
 )
 
 add_custom_command(OUTPUT ${GENERATED_EX_CMDS_ENUM} ${GENERATED_EX_CMDS_DEFS}
diff --git a/test/config/paths.lua.in b/test/cmakeconfig/paths.lua.in
index e3979981ba..e3979981ba 100644
--- a/test/config/paths.lua.in
+++ b/test/cmakeconfig/paths.lua.in
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index ff63aed235..d10a2facbb 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -7,7 +7,7 @@ local write_file, spawn, set_session, nvim_prog, exc_exec =
   helpers.exc_exec
 
 local lfs = require('lfs')
-local paths = require('test.config.paths')
+local paths = require('test.cmakeconfig.paths')
 
 local mpack = require('mpack')
 
diff --git a/test/helpers.lua b/test/helpers.lua
index a1c3dfacd2..9a77ca1956 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -4,7 +4,7 @@ local assert = require('luassert')
 local luv = require('luv')
 local lfs = require('lfs')
 local relpath = require('pl.path').relpath
-local Paths = require('test.config.paths')
+local Paths = require('test.cmakeconfig.paths')
 
 assert:set_parameter('TableFormatLevel', 100)
 
diff --git a/test/symbolic/klee/run.sh b/test/symbolic/klee/run.sh
index 0234a935b5..97ce42c31b 100755
--- a/test/symbolic/klee/run.sh
+++ b/test/symbolic/klee/run.sh
@@ -54,7 +54,7 @@ main() {
   includes="$includes -I$PROJECT_SOURCE_DIR/src"
   includes="$includes -I$PROJECT_BINARY_DIR/src/nvim/auto"
   includes="$includes -I$PROJECT_BINARY_DIR/include"
-  includes="$includes -I$PROJECT_BINARY_DIR/config"
+  includes="$includes -I$PROJECT_BINARY_DIR/cmake.config"
   includes="$includes -I/host-includes"
 
   local defines=
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 4dbcaa5347..29ea0235be 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -2,7 +2,7 @@ local ffi = require('ffi')
 local formatc = require('test.unit.formatc')
 local Set = require('test.unit.set')
 local Preprocess = require('test.unit.preprocess')
-local Paths = require('test.config.paths')
+local Paths = require('test.cmakeconfig.paths')
 local global_helpers = require('test.helpers')
 local assert = require('luassert')
 local say = require('say')