diff --git a/scripts/download-unicode-files.sh b/scripts/download-unicode-files.sh
index 12474d3c1e..4482cefa34 100755
--- a/scripts/download-unicode-files.sh
+++ b/scripts/download-unicode-files.sh
@@ -4,7 +4,7 @@ set -e
 data_files="UnicodeData.txt CaseFolding.txt EastAsianWidth.txt"
 emoji_files="emoji-data.txt"
 
-UNIDIR_DEFAULT=unicode
+UNIDIR_DEFAULT=src/unicode
 DOWNLOAD_URL_BASE_DEFAULT='http://unicode.org/Public'
 
 if test x$1 = 'x--help' ; then
@@ -39,5 +39,5 @@ done
 
 (
   cd "$UNIDIR"
-  git commit -m "Update unicode files" -- $files
+  git commit -m "feat: update unicode tables" -- $files
 )
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 56c9fcab72..507b8b77f3 100755
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -59,7 +59,7 @@ set(EVENTS_GENERATOR ${GENERATOR_DIR}/gen_events.lua)
 set(KEYSETS_GENERATOR ${GENERATOR_DIR}/gen_keysets.lua)
 set(OPTIONS_GENERATOR ${GENERATOR_DIR}/gen_options.lua)
 set(UNICODE_TABLES_GENERATOR ${GENERATOR_DIR}/gen_unicode_tables.lua)
-set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/unicode)
+set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/src/unicode)
 set(GENERATED_UNICODE_TABLES ${GENERATED_DIR}/unicode_tables.generated.h)
 set(VIM_MODULE_FILE ${GENERATED_DIR}/lua/vim_module.generated.h)
 set(LUA_EDITOR_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/_editor.lua)
diff --git a/unicode/CaseFolding.txt b/src/unicode/CaseFolding.txt
similarity index 100%
rename from unicode/CaseFolding.txt
rename to src/unicode/CaseFolding.txt
diff --git a/unicode/Copyright.txt b/src/unicode/Copyright.txt
similarity index 100%
rename from unicode/Copyright.txt
rename to src/unicode/Copyright.txt
diff --git a/unicode/EastAsianWidth.txt b/src/unicode/EastAsianWidth.txt
similarity index 100%
rename from unicode/EastAsianWidth.txt
rename to src/unicode/EastAsianWidth.txt
diff --git a/unicode/UnicodeData.txt b/src/unicode/UnicodeData.txt
similarity index 100%
rename from unicode/UnicodeData.txt
rename to src/unicode/UnicodeData.txt
diff --git a/unicode/emoji-data.txt b/src/unicode/emoji-data.txt
similarity index 100%
rename from unicode/emoji-data.txt
rename to src/unicode/emoji-data.txt