9 files changed, 15 insertions, 16 deletions
diff --git a/scripts/genmsgpack.lua b/scripts/genmsgpack.lua
index 2a7cb4bacf..c3b3f42618 100644
--- a/scripts/genmsgpack.lua
+++ b/scripts/genmsgpack.lua
@@ -377,7 +377,7 @@ output:write([[
 #include "nvim/func_attr.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
-#include "nvim/viml/executor/converter.h"
+#include "nvim/lua/converter.h"
 ]])
 include_headers(output, headers)
 output:write('\n')
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index cec9a09141..1401029cf5 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -33,8 +33,8 @@ set(OPTIONS_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genoptions.lua)
 set(UNICODE_TABLES_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genunicodetables.lua)
 set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/unicode)
 set(GENERATED_UNICODE_TABLES ${GENERATED_DIR}/unicode_tables.generated.h)
-set(VIM_MODULE_FILE ${GENERATED_DIR}/viml/executor/vim_module.generated.h)
-set(VIM_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/src/nvim/viml/executor/vim.lua)
+set(VIM_MODULE_FILE ${GENERATED_DIR}/lua/vim_module.generated.h)
+set(VIM_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/src/nvim/lua/vim.lua)
 set(CHAR_BLOB_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/gencharblob.lua)
 set(LINT_SUPPRESS_FILE ${PROJECT_BINARY_DIR}/errors.json)
 set(LINT_SUPPRESS_URL_BASE "https://raw.githubusercontent.com/neovim/doc/gh-pages/reports/clint")
@@ -72,8 +72,7 @@ foreach(subdir
         tui
         event
         eval
-        viml
-        viml/executor
+        lua
        )
   if(${subdir} MATCHES "tui" AND NOT FEAT_TUI)
     continue()
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 75cd100061..e60cc4e218 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -94,7 +94,7 @@
 #include "nvim/lib/kvec.h"
 #include "nvim/lib/khash.h"
 #include "nvim/lib/queue.h"
-#include "nvim/viml/executor/executor.h"
+#include "nvim/lua/executor.h"
 #include "nvim/eval/typval.h"
 #include "nvim/eval/executor.h"
 #include "nvim/eval/gc.h"
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index e44d759e04..b7bf6b4728 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -67,7 +67,7 @@
 #include "nvim/event/rstream.h"
 #include "nvim/event/wstream.h"
 #include "nvim/shada.h"
-#include "nvim/viml/executor/executor.h"
+#include "nvim/lua/executor.h"
 #include "nvim/globals.h"
 
 static int quitmore = 0;
diff --git a/src/nvim/viml/executor/converter.c b/src/nvim/lua/converter.c
index 425a38538d..348315124b 100644
--- a/src/nvim/viml/executor/converter.c
+++ b/src/nvim/lua/converter.c
@@ -22,8 +22,8 @@
 #include "nvim/lib/kvec.h"
 #include "nvim/eval/decode.h"
 
-#include "nvim/viml/executor/converter.h"
-#include "nvim/viml/executor/executor.h"
+#include "nvim/lua/converter.h"
+#include "nvim/lua/executor.h"
 
 /// Determine, which keys lua table contains
 typedef struct {
@@ -38,7 +38,7 @@ typedef struct {
 } LuaTableProps;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "viml/executor/converter.c.generated.h"
+# include "lua/converter.c.generated.h"
 #endif
 
 #define TYPE_IDX_VALUE true
diff --git a/src/nvim/viml/executor/converter.h b/src/nvim/lua/converter.h
index dbbaaebf6b..49f6ac4016 100644
--- a/src/nvim/viml/executor/converter.h
+++ b/src/nvim/lua/converter.h
@@ -10,6 +10,6 @@
 #include "nvim/eval.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "viml/executor/converter.h.generated.h"
+# include "lua/converter.h.generated.h"
 #endif
 #endif  // NVIM_VIML_EXECUTOR_CONVERTER_H
diff --git a/src/nvim/viml/executor/executor.c b/src/nvim/lua/executor.c
index 826460772e..7cf326aef5 100644
--- a/src/nvim/viml/executor/executor.c
+++ b/src/nvim/lua/executor.c
@@ -20,8 +20,8 @@
 #include "nvim/undo.h"
 #include "nvim/ascii.h"
 
-#include "nvim/viml/executor/executor.h"
-#include "nvim/viml/executor/converter.h"
+#include "nvim/lua/executor.h"
+#include "nvim/lua/converter.h"
 
 typedef struct {
   Error err;
@@ -29,8 +29,8 @@ typedef struct {
 } LuaError;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "viml/executor/vim_module.generated.h"
-# include "viml/executor/executor.c.generated.h"
+# include "lua/vim_module.generated.h"
+# include "lua/executor.c.generated.h"
 #endif
 
 /// Name of the run code for use in messages
diff --git a/src/nvim/viml/executor/executor.h b/src/nvim/lua/executor.h
index 648bb73785..22e55a56d3 100644
--- a/src/nvim/viml/executor/executor.h
+++ b/src/nvim/lua/executor.h
@@ -20,6 +20,6 @@ void nlua_add_api_functions(lua_State *lstate) REAL_FATTR_NONNULL_ALL;
     } while (0)
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "viml/executor/executor.h.generated.h"
+# include "lua/executor.h.generated.h"
 #endif
 #endif  // NVIM_VIML_EXECUTOR_EXECUTOR_H
diff --git a/src/nvim/viml/executor/vim.lua b/src/nvim/lua/vim.lua
index 8d1c5bdf4f..8d1c5bdf4f 100644
--- a/src/nvim/viml/executor/vim.lua
+++ b/src/nvim/lua/vim.lua