diff --git a/src/CMakeLists.txt b/src/nvim/CMakeLists.txt
similarity index 100%
rename from src/CMakeLists.txt
rename to src/nvim/CMakeLists.txt
diff --git a/src/api/buffer.c b/src/nvim/api/buffer.c
similarity index 100%
rename from src/api/buffer.c
rename to src/nvim/api/buffer.c
diff --git a/src/api/buffer.h b/src/nvim/api/buffer.h
similarity index 100%
rename from src/api/buffer.h
rename to src/nvim/api/buffer.h
diff --git a/src/api/defs.h b/src/nvim/api/defs.h
similarity index 100%
rename from src/api/defs.h
rename to src/nvim/api/defs.h
diff --git a/src/api/helpers.c b/src/nvim/api/helpers.c
similarity index 100%
rename from src/api/helpers.c
rename to src/nvim/api/helpers.c
diff --git a/src/api/helpers.h b/src/nvim/api/helpers.h
similarity index 100%
rename from src/api/helpers.h
rename to src/nvim/api/helpers.h
diff --git a/src/api/tabpage.c b/src/nvim/api/tabpage.c
similarity index 100%
rename from src/api/tabpage.c
rename to src/nvim/api/tabpage.c
diff --git a/src/api/tabpage.h b/src/nvim/api/tabpage.h
similarity index 100%
rename from src/api/tabpage.h
rename to src/nvim/api/tabpage.h
diff --git a/src/api/vim.c b/src/nvim/api/vim.c
similarity index 100%
rename from src/api/vim.c
rename to src/nvim/api/vim.c
diff --git a/src/api/vim.h b/src/nvim/api/vim.h
similarity index 100%
rename from src/api/vim.h
rename to src/nvim/api/vim.h
diff --git a/src/api/window.c b/src/nvim/api/window.c
similarity index 100%
rename from src/api/window.c
rename to src/nvim/api/window.c
diff --git a/src/api/window.h b/src/nvim/api/window.h
similarity index 100%
rename from src/api/window.h
rename to src/nvim/api/window.h
diff --git a/src/arabic.c b/src/nvim/arabic.c
similarity index 100%
rename from src/arabic.c
rename to src/nvim/arabic.c
diff --git a/src/arabic.h b/src/nvim/arabic.h
similarity index 100%
rename from src/arabic.h
rename to src/nvim/arabic.h
diff --git a/src/ascii.h b/src/nvim/ascii.h
similarity index 100%
rename from src/ascii.h
rename to src/nvim/ascii.h
diff --git a/src/blowfish.c b/src/nvim/blowfish.c
similarity index 100%
rename from src/blowfish.c
rename to src/nvim/blowfish.c
diff --git a/src/blowfish.h b/src/nvim/blowfish.h
similarity index 100%
rename from src/blowfish.h
rename to src/nvim/blowfish.h
diff --git a/src/buffer.c b/src/nvim/buffer.c
similarity index 100%
rename from src/buffer.c
rename to src/nvim/buffer.c
diff --git a/src/buffer.h b/src/nvim/buffer.h
similarity index 100%
rename from src/buffer.h
rename to src/nvim/buffer.h
diff --git a/src/buffer_defs.h b/src/nvim/buffer_defs.h
similarity index 100%
rename from src/buffer_defs.h
rename to src/nvim/buffer_defs.h
diff --git a/src/charset.c b/src/nvim/charset.c
similarity index 100%
rename from src/charset.c
rename to src/nvim/charset.c
diff --git a/src/charset.h b/src/nvim/charset.h
similarity index 100%
rename from src/charset.h
rename to src/nvim/charset.h
diff --git a/src/crypt.c b/src/nvim/crypt.c
similarity index 100%
rename from src/crypt.c
rename to src/nvim/crypt.c
diff --git a/src/crypt.h b/src/nvim/crypt.h
similarity index 100%
rename from src/crypt.h
rename to src/nvim/crypt.h
diff --git a/src/cursor_shape.c b/src/nvim/cursor_shape.c
similarity index 100%
rename from src/cursor_shape.c
rename to src/nvim/cursor_shape.c
diff --git a/src/cursor_shape.h b/src/nvim/cursor_shape.h
similarity index 100%
rename from src/cursor_shape.h
rename to src/nvim/cursor_shape.h
diff --git a/src/diff.c b/src/nvim/diff.c
similarity index 100%
rename from src/diff.c
rename to src/nvim/diff.c
diff --git a/src/diff.h b/src/nvim/diff.h
similarity index 100%
rename from src/diff.h
rename to src/nvim/diff.h
diff --git a/src/digraph.c b/src/nvim/digraph.c
similarity index 100%
rename from src/digraph.c
rename to src/nvim/digraph.c
diff --git a/src/digraph.h b/src/nvim/digraph.h
similarity index 100%
rename from src/digraph.h
rename to src/nvim/digraph.h
diff --git a/src/edit.c b/src/nvim/edit.c
similarity index 100%
rename from src/edit.c
rename to src/nvim/edit.c
diff --git a/src/edit.h b/src/nvim/edit.h
similarity index 100%
rename from src/edit.h
rename to src/nvim/edit.h
diff --git a/src/eval.c b/src/nvim/eval.c
similarity index 100%
rename from src/eval.c
rename to src/nvim/eval.c
diff --git a/src/eval.h b/src/nvim/eval.h
similarity index 100%
rename from src/eval.h
rename to src/nvim/eval.h
diff --git a/src/eval_defs.h b/src/nvim/eval_defs.h
similarity index 100%
rename from src/eval_defs.h
rename to src/nvim/eval_defs.h
diff --git a/src/ex_cmds.c b/src/nvim/ex_cmds.c
similarity index 100%
rename from src/ex_cmds.c
rename to src/nvim/ex_cmds.c
diff --git a/src/ex_cmds.h b/src/nvim/ex_cmds.h
similarity index 100%
rename from src/ex_cmds.h
rename to src/nvim/ex_cmds.h
diff --git a/src/ex_cmds2.c b/src/nvim/ex_cmds2.c
similarity index 100%
rename from src/ex_cmds2.c
rename to src/nvim/ex_cmds2.c
diff --git a/src/ex_cmds2.h b/src/nvim/ex_cmds2.h
similarity index 100%
rename from src/ex_cmds2.h
rename to src/nvim/ex_cmds2.h
diff --git a/src/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
similarity index 100%
rename from src/ex_cmds_defs.h
rename to src/nvim/ex_cmds_defs.h
diff --git a/src/ex_docmd.c b/src/nvim/ex_docmd.c
similarity index 100%
rename from src/ex_docmd.c
rename to src/nvim/ex_docmd.c
diff --git a/src/ex_docmd.h b/src/nvim/ex_docmd.h
similarity index 100%
rename from src/ex_docmd.h
rename to src/nvim/ex_docmd.h
diff --git a/src/ex_eval.c b/src/nvim/ex_eval.c
similarity index 100%
rename from src/ex_eval.c
rename to src/nvim/ex_eval.c
diff --git a/src/ex_eval.h b/src/nvim/ex_eval.h
similarity index 100%
rename from src/ex_eval.h
rename to src/nvim/ex_eval.h
diff --git a/src/ex_getln.c b/src/nvim/ex_getln.c
similarity index 100%
rename from src/ex_getln.c
rename to src/nvim/ex_getln.c
diff --git a/src/ex_getln.h b/src/nvim/ex_getln.h
similarity index 100%
rename from src/ex_getln.h
rename to src/nvim/ex_getln.h
diff --git a/src/farsi.c b/src/nvim/farsi.c
similarity index 100%
rename from src/farsi.c
rename to src/nvim/farsi.c
diff --git a/src/farsi.h b/src/nvim/farsi.h
similarity index 100%
rename from src/farsi.h
rename to src/nvim/farsi.h
diff --git a/src/file_search.c b/src/nvim/file_search.c
similarity index 100%
rename from src/file_search.c
rename to src/nvim/file_search.c
diff --git a/src/file_search.h b/src/nvim/file_search.h
similarity index 100%
rename from src/file_search.h
rename to src/nvim/file_search.h
diff --git a/src/fileio.c b/src/nvim/fileio.c
similarity index 100%
rename from src/fileio.c
rename to src/nvim/fileio.c
diff --git a/src/fileio.h b/src/nvim/fileio.h
similarity index 100%
rename from src/fileio.h
rename to src/nvim/fileio.h
diff --git a/src/fold.c b/src/nvim/fold.c
similarity index 100%
rename from src/fold.c
rename to src/nvim/fold.c
diff --git a/src/fold.h b/src/nvim/fold.h
similarity index 100%
rename from src/fold.h
rename to src/nvim/fold.h
diff --git a/src/func_attr.h b/src/nvim/func_attr.h
similarity index 100%
rename from src/func_attr.h
rename to src/nvim/func_attr.h
diff --git a/src/garray.c b/src/nvim/garray.c
similarity index 100%
rename from src/garray.c
rename to src/nvim/garray.c
diff --git a/src/garray.h b/src/nvim/garray.h
similarity index 100%
rename from src/garray.h
rename to src/nvim/garray.h
diff --git a/src/getchar.c b/src/nvim/getchar.c
similarity index 100%
rename from src/getchar.c
rename to src/nvim/getchar.c
diff --git a/src/getchar.h b/src/nvim/getchar.h
similarity index 100%
rename from src/getchar.h
rename to src/nvim/getchar.h
diff --git a/src/globals.h b/src/nvim/globals.h
similarity index 100%
rename from src/globals.h
rename to src/nvim/globals.h
diff --git a/src/hardcopy.c b/src/nvim/hardcopy.c
similarity index 100%
rename from src/hardcopy.c
rename to src/nvim/hardcopy.c
diff --git a/src/hardcopy.h b/src/nvim/hardcopy.h
similarity index 100%
rename from src/hardcopy.h
rename to src/nvim/hardcopy.h
diff --git a/src/hashtab.c b/src/nvim/hashtab.c
similarity index 100%
rename from src/hashtab.c
rename to src/nvim/hashtab.c
diff --git a/src/hashtab.h b/src/nvim/hashtab.h
similarity index 100%
rename from src/hashtab.h
rename to src/nvim/hashtab.h
diff --git a/src/if_cscope.c b/src/nvim/if_cscope.c
similarity index 100%
rename from src/if_cscope.c
rename to src/nvim/if_cscope.c
diff --git a/src/if_cscope.h b/src/nvim/if_cscope.h
similarity index 100%
rename from src/if_cscope.h
rename to src/nvim/if_cscope.h
diff --git a/src/if_cscope_defs.h b/src/nvim/if_cscope_defs.h
similarity index 100%
rename from src/if_cscope_defs.h
rename to src/nvim/if_cscope_defs.h
diff --git a/src/indent.c b/src/nvim/indent.c
similarity index 100%
rename from src/indent.c
rename to src/nvim/indent.c
diff --git a/src/indent.h b/src/nvim/indent.h
similarity index 100%
rename from src/indent.h
rename to src/nvim/indent.h
diff --git a/src/indent_c.c b/src/nvim/indent_c.c
similarity index 100%
rename from src/indent_c.c
rename to src/nvim/indent_c.c
diff --git a/src/indent_c.h b/src/nvim/indent_c.h
similarity index 100%
rename from src/indent_c.h
rename to src/nvim/indent_c.h
diff --git a/src/keymap.c b/src/nvim/keymap.c
similarity index 100%
rename from src/keymap.c
rename to src/nvim/keymap.c
diff --git a/src/keymap.h b/src/nvim/keymap.h
similarity index 100%
rename from src/keymap.h
rename to src/nvim/keymap.h
diff --git a/src/lib/khash.h b/src/nvim/lib/khash.h
similarity index 100%
rename from src/lib/khash.h
rename to src/nvim/lib/khash.h
diff --git a/src/lib/klist.h b/src/nvim/lib/klist.h
similarity index 100%
rename from src/lib/klist.h
rename to src/nvim/lib/klist.h
diff --git a/src/log.c b/src/nvim/log.c
similarity index 100%
rename from src/log.c
rename to src/nvim/log.c
diff --git a/src/log.h b/src/nvim/log.h
similarity index 100%
rename from src/log.h
rename to src/nvim/log.h
diff --git a/src/macros.h b/src/nvim/macros.h
similarity index 100%
rename from src/macros.h
rename to src/nvim/macros.h
diff --git a/src/main.c b/src/nvim/main.c
similarity index 100%
rename from src/main.c
rename to src/nvim/main.c
diff --git a/src/main.h b/src/nvim/main.h
similarity index 100%
rename from src/main.h
rename to src/nvim/main.h
diff --git a/src/map.c b/src/nvim/map.c
similarity index 100%
rename from src/map.c
rename to src/nvim/map.c
diff --git a/src/map.h b/src/nvim/map.h
similarity index 100%
rename from src/map.h
rename to src/nvim/map.h
diff --git a/src/map_defs.h b/src/nvim/map_defs.h
similarity index 100%
rename from src/map_defs.h
rename to src/nvim/map_defs.h
diff --git a/src/mark.c b/src/nvim/mark.c
similarity index 100%
rename from src/mark.c
rename to src/nvim/mark.c
diff --git a/src/mark.h b/src/nvim/mark.h
similarity index 100%
rename from src/mark.h
rename to src/nvim/mark.h
diff --git a/src/mark_defs.h b/src/nvim/mark_defs.h
similarity index 100%
rename from src/mark_defs.h
rename to src/nvim/mark_defs.h
diff --git a/src/mbyte.c b/src/nvim/mbyte.c
similarity index 100%
rename from src/mbyte.c
rename to src/nvim/mbyte.c
diff --git a/src/mbyte.h b/src/nvim/mbyte.h
similarity index 100%
rename from src/mbyte.h
rename to src/nvim/mbyte.h
diff --git a/src/memfile.c b/src/nvim/memfile.c
similarity index 100%
rename from src/memfile.c
rename to src/nvim/memfile.c
diff --git a/src/memfile.h b/src/nvim/memfile.h
similarity index 100%
rename from src/memfile.h
rename to src/nvim/memfile.h
diff --git a/src/memfile_defs.h b/src/nvim/memfile_defs.h
similarity index 100%
rename from src/memfile_defs.h
rename to src/nvim/memfile_defs.h
diff --git a/src/memline.c b/src/nvim/memline.c
similarity index 100%
rename from src/memline.c
rename to src/nvim/memline.c
diff --git a/src/memline.h b/src/nvim/memline.h
similarity index 100%
rename from src/memline.h
rename to src/nvim/memline.h
diff --git a/src/memline_defs.h b/src/nvim/memline_defs.h
similarity index 100%
rename from src/memline_defs.h
rename to src/nvim/memline_defs.h
diff --git a/src/memory.c b/src/nvim/memory.c
similarity index 100%
rename from src/memory.c
rename to src/nvim/memory.c
diff --git a/src/memory.h b/src/nvim/memory.h
similarity index 100%
rename from src/memory.h
rename to src/nvim/memory.h
diff --git a/src/menu.c b/src/nvim/menu.c
similarity index 100%
rename from src/menu.c
rename to src/nvim/menu.c
diff --git a/src/menu.h b/src/nvim/menu.h
similarity index 100%
rename from src/menu.h
rename to src/nvim/menu.h
diff --git a/src/message.c b/src/nvim/message.c
similarity index 100%
rename from src/message.c
rename to src/nvim/message.c
diff --git a/src/message.h b/src/nvim/message.h
similarity index 100%
rename from src/message.h
rename to src/nvim/message.h
diff --git a/src/misc1.c b/src/nvim/misc1.c
similarity index 100%
rename from src/misc1.c
rename to src/nvim/misc1.c
diff --git a/src/misc1.h b/src/nvim/misc1.h
similarity index 100%
rename from src/misc1.h
rename to src/nvim/misc1.h
diff --git a/src/misc2.c b/src/nvim/misc2.c
similarity index 100%
rename from src/misc2.c
rename to src/nvim/misc2.c
diff --git a/src/misc2.h b/src/nvim/misc2.h
similarity index 100%
rename from src/misc2.h
rename to src/nvim/misc2.h
diff --git a/src/move.c b/src/nvim/move.c
similarity index 100%
rename from src/move.c
rename to src/nvim/move.c
diff --git a/src/move.h b/src/nvim/move.h
similarity index 100%
rename from src/move.h
rename to src/nvim/move.h
diff --git a/src/normal.c b/src/nvim/normal.c
similarity index 100%
rename from src/normal.c
rename to src/nvim/normal.c
diff --git a/src/normal.h b/src/nvim/normal.h
similarity index 100%
rename from src/normal.h
rename to src/nvim/normal.h
diff --git a/src/ops.c b/src/nvim/ops.c
similarity index 100%
rename from src/ops.c
rename to src/nvim/ops.c
diff --git a/src/ops.h b/src/nvim/ops.h
similarity index 100%
rename from src/ops.h
rename to src/nvim/ops.h
diff --git a/src/option.c b/src/nvim/option.c
similarity index 100%
rename from src/option.c
rename to src/nvim/option.c
diff --git a/src/option.h b/src/nvim/option.h
similarity index 100%
rename from src/option.h
rename to src/nvim/option.h
diff --git a/src/option_defs.h b/src/nvim/option_defs.h
similarity index 100%
rename from src/option_defs.h
rename to src/nvim/option_defs.h
diff --git a/src/os/channel.c b/src/nvim/os/channel.c
similarity index 100%
rename from src/os/channel.c
rename to src/nvim/os/channel.c
diff --git a/src/os/channel.h b/src/nvim/os/channel.h
similarity index 100%
rename from src/os/channel.h
rename to src/nvim/os/channel.h
diff --git a/src/os/channel_defs.h b/src/nvim/os/channel_defs.h
similarity index 100%
rename from src/os/channel_defs.h
rename to src/nvim/os/channel_defs.h
diff --git a/src/os/env.c b/src/nvim/os/env.c
similarity index 100%
rename from src/os/env.c
rename to src/nvim/os/env.c
diff --git a/src/os/event.c b/src/nvim/os/event.c
similarity index 100%
rename from src/os/event.c
rename to src/nvim/os/event.c
diff --git a/src/os/event.h b/src/nvim/os/event.h
similarity index 100%
rename from src/os/event.h
rename to src/nvim/os/event.h
diff --git a/src/os/event_defs.h b/src/nvim/os/event_defs.h
similarity index 100%
rename from src/os/event_defs.h
rename to src/nvim/os/event_defs.h
diff --git a/src/os/fs.c b/src/nvim/os/fs.c
similarity index 100%
rename from src/os/fs.c
rename to src/nvim/os/fs.c
diff --git a/src/os/input.c b/src/nvim/os/input.c
similarity index 100%
rename from src/os/input.c
rename to src/nvim/os/input.c
diff --git a/src/os/input.h b/src/nvim/os/input.h
similarity index 100%
rename from src/os/input.h
rename to src/nvim/os/input.h
diff --git a/src/os/job.c b/src/nvim/os/job.c
similarity index 100%
rename from src/os/job.c
rename to src/nvim/os/job.c
diff --git a/src/os/job.h b/src/nvim/os/job.h
similarity index 100%
rename from src/os/job.h
rename to src/nvim/os/job.h
diff --git a/src/os/job_defs.h b/src/nvim/os/job_defs.h
similarity index 100%
rename from src/os/job_defs.h
rename to src/nvim/os/job_defs.h
diff --git a/src/os/mem.c b/src/nvim/os/mem.c
similarity index 100%
rename from src/os/mem.c
rename to src/nvim/os/mem.c
diff --git a/src/os/msgpack_rpc.c b/src/nvim/os/msgpack_rpc.c
similarity index 100%
rename from src/os/msgpack_rpc.c
rename to src/nvim/os/msgpack_rpc.c
diff --git a/src/os/msgpack_rpc.h b/src/nvim/os/msgpack_rpc.h
similarity index 100%
rename from src/os/msgpack_rpc.h
rename to src/nvim/os/msgpack_rpc.h
diff --git a/src/os/os.h b/src/nvim/os/os.h
similarity index 100%
rename from src/os/os.h
rename to src/nvim/os/os.h
diff --git a/src/os/rstream.c b/src/nvim/os/rstream.c
similarity index 100%
rename from src/os/rstream.c
rename to src/nvim/os/rstream.c
diff --git a/src/os/rstream.h b/src/nvim/os/rstream.h
similarity index 100%
rename from src/os/rstream.h
rename to src/nvim/os/rstream.h
diff --git a/src/os/rstream_defs.h b/src/nvim/os/rstream_defs.h
similarity index 100%
rename from src/os/rstream_defs.h
rename to src/nvim/os/rstream_defs.h
diff --git a/src/os/server.c b/src/nvim/os/server.c
similarity index 100%
rename from src/os/server.c
rename to src/nvim/os/server.c
diff --git a/src/os/server.h b/src/nvim/os/server.h
similarity index 100%
rename from src/os/server.h
rename to src/nvim/os/server.h
diff --git a/src/os/server_defs.h b/src/nvim/os/server_defs.h
similarity index 100%
rename from src/os/server_defs.h
rename to src/nvim/os/server_defs.h
diff --git a/src/os/shell.c b/src/nvim/os/shell.c
similarity index 100%
rename from src/os/shell.c
rename to src/nvim/os/shell.c
diff --git a/src/os/shell.h b/src/nvim/os/shell.h
similarity index 100%
rename from src/os/shell.h
rename to src/nvim/os/shell.h
diff --git a/src/os/signal.c b/src/nvim/os/signal.c
similarity index 100%
rename from src/os/signal.c
rename to src/nvim/os/signal.c
diff --git a/src/os/signal.h b/src/nvim/os/signal.h
similarity index 100%
rename from src/os/signal.h
rename to src/nvim/os/signal.h
diff --git a/src/os/time.c b/src/nvim/os/time.c
similarity index 100%
rename from src/os/time.c
rename to src/nvim/os/time.c
diff --git a/src/os/time.h b/src/nvim/os/time.h
similarity index 100%
rename from src/os/time.h
rename to src/nvim/os/time.h
diff --git a/src/os/users.c b/src/nvim/os/users.c
similarity index 100%
rename from src/os/users.c
rename to src/nvim/os/users.c
diff --git a/src/os/uv_helpers.c b/src/nvim/os/uv_helpers.c
similarity index 100%
rename from src/os/uv_helpers.c
rename to src/nvim/os/uv_helpers.c
diff --git a/src/os/uv_helpers.h b/src/nvim/os/uv_helpers.h
similarity index 100%
rename from src/os/uv_helpers.h
rename to src/nvim/os/uv_helpers.h
diff --git a/src/os/wstream.c b/src/nvim/os/wstream.c
similarity index 100%
rename from src/os/wstream.c
rename to src/nvim/os/wstream.c
diff --git a/src/os/wstream.h b/src/nvim/os/wstream.h
similarity index 100%
rename from src/os/wstream.h
rename to src/nvim/os/wstream.h
diff --git a/src/os/wstream_defs.h b/src/nvim/os/wstream_defs.h
similarity index 100%
rename from src/os/wstream_defs.h
rename to src/nvim/os/wstream_defs.h
diff --git a/src/os_unix.c b/src/nvim/os_unix.c
similarity index 100%
rename from src/os_unix.c
rename to src/nvim/os_unix.c
diff --git a/src/os_unix.h b/src/nvim/os_unix.h
similarity index 100%
rename from src/os_unix.h
rename to src/nvim/os_unix.h
diff --git a/src/os_unix_defs.h b/src/nvim/os_unix_defs.h
similarity index 100%
rename from src/os_unix_defs.h
rename to src/nvim/os_unix_defs.h
diff --git a/src/path.c b/src/nvim/path.c
similarity index 100%
rename from src/path.c
rename to src/nvim/path.c
diff --git a/src/path.h b/src/nvim/path.h
similarity index 100%
rename from src/path.h
rename to src/nvim/path.h
diff --git a/src/po/Makefile b/src/nvim/po/Makefile
similarity index 100%
rename from src/po/Makefile
rename to src/nvim/po/Makefile
diff --git a/src/po/af.po b/src/nvim/po/af.po
similarity index 100%
rename from src/po/af.po
rename to src/nvim/po/af.po
diff --git a/src/po/ca.po b/src/nvim/po/ca.po
similarity index 100%
rename from src/po/ca.po
rename to src/nvim/po/ca.po
diff --git a/src/po/check.vim b/src/nvim/po/check.vim
similarity index 100%
rename from src/po/check.vim
rename to src/nvim/po/check.vim
diff --git a/src/po/cleanup.vim b/src/nvim/po/cleanup.vim
similarity index 100%
rename from src/po/cleanup.vim
rename to src/nvim/po/cleanup.vim
diff --git a/src/po/cs.cp1250.po b/src/nvim/po/cs.cp1250.po
similarity index 100%
rename from src/po/cs.cp1250.po
rename to src/nvim/po/cs.cp1250.po
diff --git a/src/po/cs.po b/src/nvim/po/cs.po
similarity index 100%
rename from src/po/cs.po
rename to src/nvim/po/cs.po
diff --git a/src/po/de.po b/src/nvim/po/de.po
similarity index 100%
rename from src/po/de.po
rename to src/nvim/po/de.po
diff --git a/src/po/en_GB.po b/src/nvim/po/en_GB.po
similarity index 100%
rename from src/po/en_GB.po
rename to src/nvim/po/en_GB.po
diff --git a/src/po/eo.po b/src/nvim/po/eo.po
similarity index 100%
rename from src/po/eo.po
rename to src/nvim/po/eo.po
diff --git a/src/po/es.po b/src/nvim/po/es.po
similarity index 100%
rename from src/po/es.po
rename to src/nvim/po/es.po
diff --git a/src/po/fi.po b/src/nvim/po/fi.po
similarity index 100%
rename from src/po/fi.po
rename to src/nvim/po/fi.po
diff --git a/src/po/fr.po b/src/nvim/po/fr.po
similarity index 100%
rename from src/po/fr.po
rename to src/nvim/po/fr.po
diff --git a/src/po/ga.po b/src/nvim/po/ga.po
similarity index 100%
rename from src/po/ga.po
rename to src/nvim/po/ga.po
diff --git a/src/po/it.po b/src/nvim/po/it.po
similarity index 100%
rename from src/po/it.po
rename to src/nvim/po/it.po
diff --git a/src/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
similarity index 100%
rename from src/po/ja.euc-jp.po
rename to src/nvim/po/ja.euc-jp.po
diff --git a/src/po/ja.po b/src/nvim/po/ja.po
similarity index 100%
rename from src/po/ja.po
rename to src/nvim/po/ja.po
diff --git a/src/po/ja.sjis.po b/src/nvim/po/ja.sjis.po
similarity index 100%
rename from src/po/ja.sjis.po
rename to src/nvim/po/ja.sjis.po
diff --git a/src/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po
similarity index 100%
rename from src/po/ko.UTF-8.po
rename to src/nvim/po/ko.UTF-8.po
diff --git a/src/po/ko.po b/src/nvim/po/ko.po
similarity index 100%
rename from src/po/ko.po
rename to src/nvim/po/ko.po
diff --git a/src/po/nb.po b/src/nvim/po/nb.po
similarity index 100%
rename from src/po/nb.po
rename to src/nvim/po/nb.po
diff --git a/src/po/nl.po b/src/nvim/po/nl.po
similarity index 100%
rename from src/po/nl.po
rename to src/nvim/po/nl.po
diff --git a/src/po/no.po b/src/nvim/po/no.po
similarity index 100%
rename from src/po/no.po
rename to src/nvim/po/no.po
diff --git a/src/po/pl.UTF-8.po b/src/nvim/po/pl.UTF-8.po
similarity index 100%
rename from src/po/pl.UTF-8.po
rename to src/nvim/po/pl.UTF-8.po
diff --git a/src/po/pl.cp1250.po b/src/nvim/po/pl.cp1250.po
similarity index 100%
rename from src/po/pl.cp1250.po
rename to src/nvim/po/pl.cp1250.po
diff --git a/src/po/pl.po b/src/nvim/po/pl.po
similarity index 100%
rename from src/po/pl.po
rename to src/nvim/po/pl.po
diff --git a/src/po/pt_BR.po b/src/nvim/po/pt_BR.po
similarity index 100%
rename from src/po/pt_BR.po
rename to src/nvim/po/pt_BR.po
diff --git a/src/po/ru.cp1251.po b/src/nvim/po/ru.cp1251.po
similarity index 100%
rename from src/po/ru.cp1251.po
rename to src/nvim/po/ru.cp1251.po
diff --git a/src/po/ru.po b/src/nvim/po/ru.po
similarity index 100%
rename from src/po/ru.po
rename to src/nvim/po/ru.po
diff --git a/src/po/sjiscorr.c b/src/nvim/po/sjiscorr.c
similarity index 100%
rename from src/po/sjiscorr.c
rename to src/nvim/po/sjiscorr.c
diff --git a/src/po/sk.cp1250.po b/src/nvim/po/sk.cp1250.po
similarity index 100%
rename from src/po/sk.cp1250.po
rename to src/nvim/po/sk.cp1250.po
diff --git a/src/po/sk.po b/src/nvim/po/sk.po
similarity index 100%
rename from src/po/sk.po
rename to src/nvim/po/sk.po
diff --git a/src/po/sv.po b/src/nvim/po/sv.po
similarity index 100%
rename from src/po/sv.po
rename to src/nvim/po/sv.po
diff --git a/src/po/uk.cp1251.po b/src/nvim/po/uk.cp1251.po
similarity index 100%
rename from src/po/uk.cp1251.po
rename to src/nvim/po/uk.cp1251.po
diff --git a/src/po/uk.po b/src/nvim/po/uk.po
similarity index 100%
rename from src/po/uk.po
rename to src/nvim/po/uk.po
diff --git a/src/po/vi.po b/src/nvim/po/vi.po
similarity index 100%
rename from src/po/vi.po
rename to src/nvim/po/vi.po
diff --git a/src/po/zh_CN.UTF-8.po b/src/nvim/po/zh_CN.UTF-8.po
similarity index 100%
rename from src/po/zh_CN.UTF-8.po
rename to src/nvim/po/zh_CN.UTF-8.po
diff --git a/src/po/zh_CN.cp936.po b/src/nvim/po/zh_CN.cp936.po
similarity index 100%
rename from src/po/zh_CN.cp936.po
rename to src/nvim/po/zh_CN.cp936.po
diff --git a/src/po/zh_CN.po b/src/nvim/po/zh_CN.po
similarity index 100%
rename from src/po/zh_CN.po
rename to src/nvim/po/zh_CN.po
diff --git a/src/po/zh_TW.UTF-8.po b/src/nvim/po/zh_TW.UTF-8.po
similarity index 100%
rename from src/po/zh_TW.UTF-8.po
rename to src/nvim/po/zh_TW.UTF-8.po
diff --git a/src/po/zh_TW.po b/src/nvim/po/zh_TW.po
similarity index 100%
rename from src/po/zh_TW.po
rename to src/nvim/po/zh_TW.po
diff --git a/src/popupmnu.c b/src/nvim/popupmnu.c
similarity index 100%
rename from src/popupmnu.c
rename to src/nvim/popupmnu.c
diff --git a/src/popupmnu.h b/src/nvim/popupmnu.h
similarity index 100%
rename from src/popupmnu.h
rename to src/nvim/popupmnu.h
diff --git a/src/pos.h b/src/nvim/pos.h
similarity index 100%
rename from src/pos.h
rename to src/nvim/pos.h
diff --git a/src/proto.h b/src/nvim/proto.h
similarity index 100%
rename from src/proto.h
rename to src/nvim/proto.h
diff --git a/src/quickfix.c b/src/nvim/quickfix.c
similarity index 100%
rename from src/quickfix.c
rename to src/nvim/quickfix.c
diff --git a/src/quickfix.h b/src/nvim/quickfix.h
similarity index 100%
rename from src/quickfix.h
rename to src/nvim/quickfix.h
diff --git a/src/regexp.c b/src/nvim/regexp.c
similarity index 100%
rename from src/regexp.c
rename to src/nvim/regexp.c
diff --git a/src/regexp.h b/src/nvim/regexp.h
similarity index 100%
rename from src/regexp.h
rename to src/nvim/regexp.h
diff --git a/src/regexp_defs.h b/src/nvim/regexp_defs.h
similarity index 100%
rename from src/regexp_defs.h
rename to src/nvim/regexp_defs.h
diff --git a/src/regexp_nfa.c b/src/nvim/regexp_nfa.c
similarity index 100%
rename from src/regexp_nfa.c
rename to src/nvim/regexp_nfa.c
diff --git a/src/screen.c b/src/nvim/screen.c
similarity index 100%
rename from src/screen.c
rename to src/nvim/screen.c
diff --git a/src/screen.h b/src/nvim/screen.h
similarity index 100%
rename from src/screen.h
rename to src/nvim/screen.h
diff --git a/src/search.c b/src/nvim/search.c
similarity index 100%
rename from src/search.c
rename to src/nvim/search.c
diff --git a/src/search.h b/src/nvim/search.h
similarity index 100%
rename from src/search.h
rename to src/nvim/search.h
diff --git a/src/sha256.c b/src/nvim/sha256.c
similarity index 100%
rename from src/sha256.c
rename to src/nvim/sha256.c
diff --git a/src/sha256.h b/src/nvim/sha256.h
similarity index 100%
rename from src/sha256.h
rename to src/nvim/sha256.h
diff --git a/src/sign_defs.h b/src/nvim/sign_defs.h
similarity index 100%
rename from src/sign_defs.h
rename to src/nvim/sign_defs.h
diff --git a/src/spell.c b/src/nvim/spell.c
similarity index 100%
rename from src/spell.c
rename to src/nvim/spell.c
diff --git a/src/spell.h b/src/nvim/spell.h
similarity index 100%
rename from src/spell.h
rename to src/nvim/spell.h
diff --git a/src/strings.c b/src/nvim/strings.c
similarity index 100%
rename from src/strings.c
rename to src/nvim/strings.c
diff --git a/src/strings.h b/src/nvim/strings.h
similarity index 100%
rename from src/strings.h
rename to src/nvim/strings.h
diff --git a/src/syntax.c b/src/nvim/syntax.c
similarity index 100%
rename from src/syntax.c
rename to src/nvim/syntax.c
diff --git a/src/syntax.h b/src/nvim/syntax.h
similarity index 100%
rename from src/syntax.h
rename to src/nvim/syntax.h
diff --git a/src/syntax_defs.h b/src/nvim/syntax_defs.h
similarity index 100%
rename from src/syntax_defs.h
rename to src/nvim/syntax_defs.h
diff --git a/src/tag.c b/src/nvim/tag.c
similarity index 100%
rename from src/tag.c
rename to src/nvim/tag.c
diff --git a/src/tag.h b/src/nvim/tag.h
similarity index 100%
rename from src/tag.h
rename to src/nvim/tag.h
diff --git a/src/term.c b/src/nvim/term.c
similarity index 100%
rename from src/term.c
rename to src/nvim/term.c
diff --git a/src/term.h b/src/nvim/term.h
similarity index 100%
rename from src/term.h
rename to src/nvim/term.h
diff --git a/src/term_defs.h b/src/nvim/term_defs.h
similarity index 100%
rename from src/term_defs.h
rename to src/nvim/term_defs.h
diff --git a/src/testdir/Makefile b/src/nvim/testdir/Makefile
similarity index 100%
rename from src/testdir/Makefile
rename to src/nvim/testdir/Makefile
diff --git a/src/testdir/dotest.in b/src/nvim/testdir/dotest.in
similarity index 100%
rename from src/testdir/dotest.in
rename to src/nvim/testdir/dotest.in
diff --git a/src/testdir/sautest/autoload/Test104.vim b/src/nvim/testdir/sautest/autoload/Test104.vim
similarity index 100%
rename from src/testdir/sautest/autoload/Test104.vim
rename to src/nvim/testdir/sautest/autoload/Test104.vim
diff --git a/src/testdir/sautest/autoload/footest.vim b/src/nvim/testdir/sautest/autoload/footest.vim
similarity index 100%
rename from src/testdir/sautest/autoload/footest.vim
rename to src/nvim/testdir/sautest/autoload/footest.vim
diff --git a/src/testdir/test1.in b/src/nvim/testdir/test1.in
similarity index 100%
rename from src/testdir/test1.in
rename to src/nvim/testdir/test1.in
diff --git a/src/testdir/test1.ok b/src/nvim/testdir/test1.ok
similarity index 100%
rename from src/testdir/test1.ok
rename to src/nvim/testdir/test1.ok
diff --git a/src/testdir/test10.in b/src/nvim/testdir/test10.in
similarity index 100%
rename from src/testdir/test10.in
rename to src/nvim/testdir/test10.in
diff --git a/src/testdir/test10.ok b/src/nvim/testdir/test10.ok
similarity index 100%
rename from src/testdir/test10.ok
rename to src/nvim/testdir/test10.ok
diff --git a/src/testdir/test100.in b/src/nvim/testdir/test100.in
similarity index 100%
rename from src/testdir/test100.in
rename to src/nvim/testdir/test100.in
diff --git a/src/testdir/test100.ok b/src/nvim/testdir/test100.ok
similarity index 100%
rename from src/testdir/test100.ok
rename to src/nvim/testdir/test100.ok
diff --git a/src/testdir/test101.in b/src/nvim/testdir/test101.in
similarity index 100%
rename from src/testdir/test101.in
rename to src/nvim/testdir/test101.in
diff --git a/src/testdir/test101.ok b/src/nvim/testdir/test101.ok
similarity index 100%
rename from src/testdir/test101.ok
rename to src/nvim/testdir/test101.ok
diff --git a/src/testdir/test102.in b/src/nvim/testdir/test102.in
similarity index 100%
rename from src/testdir/test102.in
rename to src/nvim/testdir/test102.in
diff --git a/src/testdir/test102.ok b/src/nvim/testdir/test102.ok
similarity index 100%
rename from src/testdir/test102.ok
rename to src/nvim/testdir/test102.ok
diff --git a/src/testdir/test103.in b/src/nvim/testdir/test103.in
similarity index 100%
rename from src/testdir/test103.in
rename to src/nvim/testdir/test103.in
diff --git a/src/testdir/test103.ok b/src/nvim/testdir/test103.ok
similarity index 100%
rename from src/testdir/test103.ok
rename to src/nvim/testdir/test103.ok
diff --git a/src/testdir/test104.in b/src/nvim/testdir/test104.in
similarity index 100%
rename from src/testdir/test104.in
rename to src/nvim/testdir/test104.in
diff --git a/src/testdir/test104.ok b/src/nvim/testdir/test104.ok
similarity index 100%
rename from src/testdir/test104.ok
rename to src/nvim/testdir/test104.ok
diff --git a/src/testdir/test105.in b/src/nvim/testdir/test105.in
similarity index 100%
rename from src/testdir/test105.in
rename to src/nvim/testdir/test105.in
diff --git a/src/testdir/test105.ok b/src/nvim/testdir/test105.ok
similarity index 100%
rename from src/testdir/test105.ok
rename to src/nvim/testdir/test105.ok
diff --git a/src/testdir/test106.in b/src/nvim/testdir/test106.in
similarity index 100%
rename from src/testdir/test106.in
rename to src/nvim/testdir/test106.in
diff --git a/src/testdir/test106.ok b/src/nvim/testdir/test106.ok
similarity index 100%
rename from src/testdir/test106.ok
rename to src/nvim/testdir/test106.ok
diff --git a/src/testdir/test10a.in b/src/nvim/testdir/test10a.in
similarity index 100%
rename from src/testdir/test10a.in
rename to src/nvim/testdir/test10a.in
diff --git a/src/testdir/test10a.ok b/src/nvim/testdir/test10a.ok
similarity index 100%
rename from src/testdir/test10a.ok
rename to src/nvim/testdir/test10a.ok
diff --git a/src/testdir/test11.in b/src/nvim/testdir/test11.in
similarity index 100%
rename from src/testdir/test11.in
rename to src/nvim/testdir/test11.in
diff --git a/src/testdir/test11.ok b/src/nvim/testdir/test11.ok
similarity index 100%
rename from src/testdir/test11.ok
rename to src/nvim/testdir/test11.ok
diff --git a/src/testdir/test12.in b/src/nvim/testdir/test12.in
similarity index 100%
rename from src/testdir/test12.in
rename to src/nvim/testdir/test12.in
diff --git a/src/testdir/test12.ok b/src/nvim/testdir/test12.ok
similarity index 100%
rename from src/testdir/test12.ok
rename to src/nvim/testdir/test12.ok
diff --git a/src/testdir/test13.in b/src/nvim/testdir/test13.in
similarity index 100%
rename from src/testdir/test13.in
rename to src/nvim/testdir/test13.in
diff --git a/src/testdir/test13.ok b/src/nvim/testdir/test13.ok
similarity index 100%
rename from src/testdir/test13.ok
rename to src/nvim/testdir/test13.ok
diff --git a/src/testdir/test14.in b/src/nvim/testdir/test14.in
similarity index 100%
rename from src/testdir/test14.in
rename to src/nvim/testdir/test14.in
diff --git a/src/testdir/test14.ok b/src/nvim/testdir/test14.ok
similarity index 100%
rename from src/testdir/test14.ok
rename to src/nvim/testdir/test14.ok
diff --git a/src/testdir/test15.in b/src/nvim/testdir/test15.in
similarity index 100%
rename from src/testdir/test15.in
rename to src/nvim/testdir/test15.in
diff --git a/src/testdir/test15.ok b/src/nvim/testdir/test15.ok
similarity index 100%
rename from src/testdir/test15.ok
rename to src/nvim/testdir/test15.ok
diff --git a/src/testdir/test16.in b/src/nvim/testdir/test16.in
similarity index 100%
rename from src/testdir/test16.in
rename to src/nvim/testdir/test16.in
diff --git a/src/testdir/test16.ok b/src/nvim/testdir/test16.ok
similarity index 100%
rename from src/testdir/test16.ok
rename to src/nvim/testdir/test16.ok
diff --git a/src/testdir/test17.in b/src/nvim/testdir/test17.in
similarity index 100%
rename from src/testdir/test17.in
rename to src/nvim/testdir/test17.in
diff --git a/src/testdir/test17.ok b/src/nvim/testdir/test17.ok
similarity index 100%
rename from src/testdir/test17.ok
rename to src/nvim/testdir/test17.ok
diff --git a/src/testdir/test17a.in b/src/nvim/testdir/test17a.in
similarity index 100%
rename from src/testdir/test17a.in
rename to src/nvim/testdir/test17a.in
diff --git a/src/testdir/test18.in b/src/nvim/testdir/test18.in
similarity index 100%
rename from src/testdir/test18.in
rename to src/nvim/testdir/test18.in
diff --git a/src/testdir/test18.ok b/src/nvim/testdir/test18.ok
similarity index 100%
rename from src/testdir/test18.ok
rename to src/nvim/testdir/test18.ok
diff --git a/src/testdir/test19.in b/src/nvim/testdir/test19.in
similarity index 100%
rename from src/testdir/test19.in
rename to src/nvim/testdir/test19.in
diff --git a/src/testdir/test19.ok b/src/nvim/testdir/test19.ok
similarity index 100%
rename from src/testdir/test19.ok
rename to src/nvim/testdir/test19.ok
diff --git a/src/testdir/test2.in b/src/nvim/testdir/test2.in
similarity index 100%
rename from src/testdir/test2.in
rename to src/nvim/testdir/test2.in
diff --git a/src/testdir/test2.ok b/src/nvim/testdir/test2.ok
similarity index 100%
rename from src/testdir/test2.ok
rename to src/nvim/testdir/test2.ok
diff --git a/src/testdir/test20.in b/src/nvim/testdir/test20.in
similarity index 100%
rename from src/testdir/test20.in
rename to src/nvim/testdir/test20.in
diff --git a/src/testdir/test20.ok b/src/nvim/testdir/test20.ok
similarity index 100%
rename from src/testdir/test20.ok
rename to src/nvim/testdir/test20.ok
diff --git a/src/testdir/test21.in b/src/nvim/testdir/test21.in
similarity index 100%
rename from src/testdir/test21.in
rename to src/nvim/testdir/test21.in
diff --git a/src/testdir/test21.ok b/src/nvim/testdir/test21.ok
similarity index 100%
rename from src/testdir/test21.ok
rename to src/nvim/testdir/test21.ok
diff --git a/src/testdir/test22.in b/src/nvim/testdir/test22.in
similarity index 100%
rename from src/testdir/test22.in
rename to src/nvim/testdir/test22.in
diff --git a/src/testdir/test22.ok b/src/nvim/testdir/test22.ok
similarity index 100%
rename from src/testdir/test22.ok
rename to src/nvim/testdir/test22.ok
diff --git a/src/testdir/test23.in b/src/nvim/testdir/test23.in
similarity index 100%
rename from src/testdir/test23.in
rename to src/nvim/testdir/test23.in
diff --git a/src/testdir/test23.ok b/src/nvim/testdir/test23.ok
similarity index 100%
rename from src/testdir/test23.ok
rename to src/nvim/testdir/test23.ok
diff --git a/src/testdir/test24.in b/src/nvim/testdir/test24.in
similarity index 100%
rename from src/testdir/test24.in
rename to src/nvim/testdir/test24.in
diff --git a/src/testdir/test24.ok b/src/nvim/testdir/test24.ok
similarity index 100%
rename from src/testdir/test24.ok
rename to src/nvim/testdir/test24.ok
diff --git a/src/testdir/test25.in b/src/nvim/testdir/test25.in
similarity index 100%
rename from src/testdir/test25.in
rename to src/nvim/testdir/test25.in
diff --git a/src/testdir/test25.ok b/src/nvim/testdir/test25.ok
similarity index 100%
rename from src/testdir/test25.ok
rename to src/nvim/testdir/test25.ok
diff --git a/src/testdir/test26.in b/src/nvim/testdir/test26.in
similarity index 100%
rename from src/testdir/test26.in
rename to src/nvim/testdir/test26.in
diff --git a/src/testdir/test26.ok b/src/nvim/testdir/test26.ok
similarity index 100%
rename from src/testdir/test26.ok
rename to src/nvim/testdir/test26.ok
diff --git a/src/testdir/test27.in b/src/nvim/testdir/test27.in
similarity index 100%
rename from src/testdir/test27.in
rename to src/nvim/testdir/test27.in
diff --git a/src/testdir/test27.ok b/src/nvim/testdir/test27.ok
similarity index 100%
rename from src/testdir/test27.ok
rename to src/nvim/testdir/test27.ok
diff --git a/src/testdir/test28.in b/src/nvim/testdir/test28.in
similarity index 100%
rename from src/testdir/test28.in
rename to src/nvim/testdir/test28.in
diff --git a/src/testdir/test28.ok b/src/nvim/testdir/test28.ok
similarity index 100%
rename from src/testdir/test28.ok
rename to src/nvim/testdir/test28.ok
diff --git a/src/testdir/test29.in b/src/nvim/testdir/test29.in
similarity index 100%
rename from src/testdir/test29.in
rename to src/nvim/testdir/test29.in
diff --git a/src/testdir/test29.ok b/src/nvim/testdir/test29.ok
similarity index 100%
rename from src/testdir/test29.ok
rename to src/nvim/testdir/test29.ok
diff --git a/src/testdir/test3.in b/src/nvim/testdir/test3.in
similarity index 100%
rename from src/testdir/test3.in
rename to src/nvim/testdir/test3.in
diff --git a/src/testdir/test3.ok b/src/nvim/testdir/test3.ok
similarity index 100%
rename from src/testdir/test3.ok
rename to src/nvim/testdir/test3.ok
diff --git a/src/testdir/test30.in b/src/nvim/testdir/test30.in
similarity index 100%
rename from src/testdir/test30.in
rename to src/nvim/testdir/test30.in
diff --git a/src/testdir/test30.ok b/src/nvim/testdir/test30.ok
similarity index 100%
rename from src/testdir/test30.ok
rename to src/nvim/testdir/test30.ok
diff --git a/src/testdir/test31.in b/src/nvim/testdir/test31.in
similarity index 100%
rename from src/testdir/test31.in
rename to src/nvim/testdir/test31.in
diff --git a/src/testdir/test31.ok b/src/nvim/testdir/test31.ok
similarity index 100%
rename from src/testdir/test31.ok
rename to src/nvim/testdir/test31.ok
diff --git a/src/testdir/test32.in b/src/nvim/testdir/test32.in
similarity index 100%
rename from src/testdir/test32.in
rename to src/nvim/testdir/test32.in
diff --git a/src/testdir/test32.ok b/src/nvim/testdir/test32.ok
similarity index 100%
rename from src/testdir/test32.ok
rename to src/nvim/testdir/test32.ok
diff --git a/src/testdir/test33.in b/src/nvim/testdir/test33.in
similarity index 100%
rename from src/testdir/test33.in
rename to src/nvim/testdir/test33.in
diff --git a/src/testdir/test33.ok b/src/nvim/testdir/test33.ok
similarity index 100%
rename from src/testdir/test33.ok
rename to src/nvim/testdir/test33.ok
diff --git a/src/testdir/test34.in b/src/nvim/testdir/test34.in
similarity index 100%
rename from src/testdir/test34.in
rename to src/nvim/testdir/test34.in
diff --git a/src/testdir/test34.ok b/src/nvim/testdir/test34.ok
similarity index 100%
rename from src/testdir/test34.ok
rename to src/nvim/testdir/test34.ok
diff --git a/src/testdir/test35.in b/src/nvim/testdir/test35.in
similarity index 100%
rename from src/testdir/test35.in
rename to src/nvim/testdir/test35.in
diff --git a/src/testdir/test35.ok b/src/nvim/testdir/test35.ok
similarity index 100%
rename from src/testdir/test35.ok
rename to src/nvim/testdir/test35.ok
diff --git a/src/testdir/test36.in b/src/nvim/testdir/test36.in
similarity index 100%
rename from src/testdir/test36.in
rename to src/nvim/testdir/test36.in
diff --git a/src/testdir/test36.ok b/src/nvim/testdir/test36.ok
similarity index 100%
rename from src/testdir/test36.ok
rename to src/nvim/testdir/test36.ok
diff --git a/src/testdir/test37.in b/src/nvim/testdir/test37.in
similarity index 100%
rename from src/testdir/test37.in
rename to src/nvim/testdir/test37.in
diff --git a/src/testdir/test37.ok b/src/nvim/testdir/test37.ok
similarity index 100%
rename from src/testdir/test37.ok
rename to src/nvim/testdir/test37.ok
diff --git a/src/testdir/test38.in b/src/nvim/testdir/test38.in
similarity index 100%
rename from src/testdir/test38.in
rename to src/nvim/testdir/test38.in
diff --git a/src/testdir/test38.ok b/src/nvim/testdir/test38.ok
similarity index 100%
rename from src/testdir/test38.ok
rename to src/nvim/testdir/test38.ok
diff --git a/src/testdir/test39.in b/src/nvim/testdir/test39.in
similarity index 100%
rename from src/testdir/test39.in
rename to src/nvim/testdir/test39.in
diff --git a/src/testdir/test39.ok b/src/nvim/testdir/test39.ok
similarity index 100%
rename from src/testdir/test39.ok
rename to src/nvim/testdir/test39.ok
diff --git a/src/testdir/test4.in b/src/nvim/testdir/test4.in
similarity index 100%
rename from src/testdir/test4.in
rename to src/nvim/testdir/test4.in
diff --git a/src/testdir/test4.ok b/src/nvim/testdir/test4.ok
similarity index 100%
rename from src/testdir/test4.ok
rename to src/nvim/testdir/test4.ok
diff --git a/src/testdir/test40.in b/src/nvim/testdir/test40.in
similarity index 100%
rename from src/testdir/test40.in
rename to src/nvim/testdir/test40.in
diff --git a/src/testdir/test40.ok b/src/nvim/testdir/test40.ok
similarity index 100%
rename from src/testdir/test40.ok
rename to src/nvim/testdir/test40.ok
diff --git a/src/testdir/test41.in b/src/nvim/testdir/test41.in
similarity index 100%
rename from src/testdir/test41.in
rename to src/nvim/testdir/test41.in
diff --git a/src/testdir/test41.ok b/src/nvim/testdir/test41.ok
similarity index 100%
rename from src/testdir/test41.ok
rename to src/nvim/testdir/test41.ok
diff --git a/src/testdir/test42.in b/src/nvim/testdir/test42.in
similarity index 100%
rename from src/testdir/test42.in
rename to src/nvim/testdir/test42.in
diff --git a/src/testdir/test42.ok b/src/nvim/testdir/test42.ok
similarity index 100%
rename from src/testdir/test42.ok
rename to src/nvim/testdir/test42.ok
diff --git a/src/testdir/test43.in b/src/nvim/testdir/test43.in
similarity index 100%
rename from src/testdir/test43.in
rename to src/nvim/testdir/test43.in
diff --git a/src/testdir/test43.ok b/src/nvim/testdir/test43.ok
similarity index 100%
rename from src/testdir/test43.ok
rename to src/nvim/testdir/test43.ok
diff --git a/src/testdir/test44.in b/src/nvim/testdir/test44.in
similarity index 100%
rename from src/testdir/test44.in
rename to src/nvim/testdir/test44.in
diff --git a/src/testdir/test44.ok b/src/nvim/testdir/test44.ok
similarity index 100%
rename from src/testdir/test44.ok
rename to src/nvim/testdir/test44.ok
diff --git a/src/testdir/test45.in b/src/nvim/testdir/test45.in
similarity index 100%
rename from src/testdir/test45.in
rename to src/nvim/testdir/test45.in
diff --git a/src/testdir/test45.ok b/src/nvim/testdir/test45.ok
similarity index 100%
rename from src/testdir/test45.ok
rename to src/nvim/testdir/test45.ok
diff --git a/src/testdir/test46.in b/src/nvim/testdir/test46.in
similarity index 100%
rename from src/testdir/test46.in
rename to src/nvim/testdir/test46.in
diff --git a/src/testdir/test46.ok b/src/nvim/testdir/test46.ok
similarity index 100%
rename from src/testdir/test46.ok
rename to src/nvim/testdir/test46.ok
diff --git a/src/testdir/test47.in b/src/nvim/testdir/test47.in
similarity index 100%
rename from src/testdir/test47.in
rename to src/nvim/testdir/test47.in
diff --git a/src/testdir/test47.ok b/src/nvim/testdir/test47.ok
similarity index 100%
rename from src/testdir/test47.ok
rename to src/nvim/testdir/test47.ok
diff --git a/src/testdir/test48.in b/src/nvim/testdir/test48.in
similarity index 100%
rename from src/testdir/test48.in
rename to src/nvim/testdir/test48.in
diff --git a/src/testdir/test48.ok b/src/nvim/testdir/test48.ok
similarity index 100%
rename from src/testdir/test48.ok
rename to src/nvim/testdir/test48.ok
diff --git a/src/testdir/test49.in b/src/nvim/testdir/test49.in
similarity index 100%
rename from src/testdir/test49.in
rename to src/nvim/testdir/test49.in
diff --git a/src/testdir/test49.ok b/src/nvim/testdir/test49.ok
similarity index 100%
rename from src/testdir/test49.ok
rename to src/nvim/testdir/test49.ok
diff --git a/src/testdir/test49.vim b/src/nvim/testdir/test49.vim
similarity index 100%
rename from src/testdir/test49.vim
rename to src/nvim/testdir/test49.vim
diff --git a/src/testdir/test5.in b/src/nvim/testdir/test5.in
similarity index 100%
rename from src/testdir/test5.in
rename to src/nvim/testdir/test5.in
diff --git a/src/testdir/test5.ok b/src/nvim/testdir/test5.ok
similarity index 100%
rename from src/testdir/test5.ok
rename to src/nvim/testdir/test5.ok
diff --git a/src/testdir/test50.in b/src/nvim/testdir/test50.in
similarity index 100%
rename from src/testdir/test50.in
rename to src/nvim/testdir/test50.in
diff --git a/src/testdir/test50.ok b/src/nvim/testdir/test50.ok
similarity index 100%
rename from src/testdir/test50.ok
rename to src/nvim/testdir/test50.ok
diff --git a/src/testdir/test51.in b/src/nvim/testdir/test51.in
similarity index 100%
rename from src/testdir/test51.in
rename to src/nvim/testdir/test51.in
diff --git a/src/testdir/test51.ok b/src/nvim/testdir/test51.ok
similarity index 100%
rename from src/testdir/test51.ok
rename to src/nvim/testdir/test51.ok
diff --git a/src/testdir/test52.in b/src/nvim/testdir/test52.in
similarity index 100%
rename from src/testdir/test52.in
rename to src/nvim/testdir/test52.in
diff --git a/src/testdir/test52.ok b/src/nvim/testdir/test52.ok
similarity index 100%
rename from src/testdir/test52.ok
rename to src/nvim/testdir/test52.ok
diff --git a/src/testdir/test53.in b/src/nvim/testdir/test53.in
similarity index 100%
rename from src/testdir/test53.in
rename to src/nvim/testdir/test53.in
diff --git a/src/testdir/test53.ok b/src/nvim/testdir/test53.ok
similarity index 100%
rename from src/testdir/test53.ok
rename to src/nvim/testdir/test53.ok
diff --git a/src/testdir/test54.in b/src/nvim/testdir/test54.in
similarity index 100%
rename from src/testdir/test54.in
rename to src/nvim/testdir/test54.in
diff --git a/src/testdir/test54.ok b/src/nvim/testdir/test54.ok
similarity index 100%
rename from src/testdir/test54.ok
rename to src/nvim/testdir/test54.ok
diff --git a/src/testdir/test55.in b/src/nvim/testdir/test55.in
similarity index 100%
rename from src/testdir/test55.in
rename to src/nvim/testdir/test55.in
diff --git a/src/testdir/test55.ok b/src/nvim/testdir/test55.ok
similarity index 100%
rename from src/testdir/test55.ok
rename to src/nvim/testdir/test55.ok
diff --git a/src/testdir/test56.in b/src/nvim/testdir/test56.in
similarity index 100%
rename from src/testdir/test56.in
rename to src/nvim/testdir/test56.in
diff --git a/src/testdir/test56.ok b/src/nvim/testdir/test56.ok
similarity index 100%
rename from src/testdir/test56.ok
rename to src/nvim/testdir/test56.ok
diff --git a/src/testdir/test57.in b/src/nvim/testdir/test57.in
similarity index 100%
rename from src/testdir/test57.in
rename to src/nvim/testdir/test57.in
diff --git a/src/testdir/test57.ok b/src/nvim/testdir/test57.ok
similarity index 100%
rename from src/testdir/test57.ok
rename to src/nvim/testdir/test57.ok
diff --git a/src/testdir/test58.in b/src/nvim/testdir/test58.in
similarity index 100%
rename from src/testdir/test58.in
rename to src/nvim/testdir/test58.in
diff --git a/src/testdir/test58.ok b/src/nvim/testdir/test58.ok
similarity index 100%
rename from src/testdir/test58.ok
rename to src/nvim/testdir/test58.ok
diff --git a/src/testdir/test59.in b/src/nvim/testdir/test59.in
similarity index 100%
rename from src/testdir/test59.in
rename to src/nvim/testdir/test59.in
diff --git a/src/testdir/test59.ok b/src/nvim/testdir/test59.ok
similarity index 100%
rename from src/testdir/test59.ok
rename to src/nvim/testdir/test59.ok
diff --git a/src/testdir/test6.in b/src/nvim/testdir/test6.in
similarity index 100%
rename from src/testdir/test6.in
rename to src/nvim/testdir/test6.in
diff --git a/src/testdir/test6.ok b/src/nvim/testdir/test6.ok
similarity index 100%
rename from src/testdir/test6.ok
rename to src/nvim/testdir/test6.ok
diff --git a/src/testdir/test60.in b/src/nvim/testdir/test60.in
similarity index 100%
rename from src/testdir/test60.in
rename to src/nvim/testdir/test60.in
diff --git a/src/testdir/test60.ok b/src/nvim/testdir/test60.ok
similarity index 100%
rename from src/testdir/test60.ok
rename to src/nvim/testdir/test60.ok
diff --git a/src/testdir/test60.vim b/src/nvim/testdir/test60.vim
similarity index 100%
rename from src/testdir/test60.vim
rename to src/nvim/testdir/test60.vim
diff --git a/src/testdir/test61.in b/src/nvim/testdir/test61.in
similarity index 100%
rename from src/testdir/test61.in
rename to src/nvim/testdir/test61.in
diff --git a/src/testdir/test61.ok b/src/nvim/testdir/test61.ok
similarity index 100%
rename from src/testdir/test61.ok
rename to src/nvim/testdir/test61.ok
diff --git a/src/testdir/test62.in b/src/nvim/testdir/test62.in
similarity index 100%
rename from src/testdir/test62.in
rename to src/nvim/testdir/test62.in
diff --git a/src/testdir/test62.ok b/src/nvim/testdir/test62.ok
similarity index 100%
rename from src/testdir/test62.ok
rename to src/nvim/testdir/test62.ok
diff --git a/src/testdir/test63.in b/src/nvim/testdir/test63.in
similarity index 100%
rename from src/testdir/test63.in
rename to src/nvim/testdir/test63.in
diff --git a/src/testdir/test63.ok b/src/nvim/testdir/test63.ok
similarity index 100%
rename from src/testdir/test63.ok
rename to src/nvim/testdir/test63.ok
diff --git a/src/testdir/test64.in b/src/nvim/testdir/test64.in
similarity index 100%
rename from src/testdir/test64.in
rename to src/nvim/testdir/test64.in
diff --git a/src/testdir/test64.ok b/src/nvim/testdir/test64.ok
similarity index 100%
rename from src/testdir/test64.ok
rename to src/nvim/testdir/test64.ok
diff --git a/src/testdir/test65.in b/src/nvim/testdir/test65.in
similarity index 100%
rename from src/testdir/test65.in
rename to src/nvim/testdir/test65.in
diff --git a/src/testdir/test65.ok b/src/nvim/testdir/test65.ok
similarity index 100%
rename from src/testdir/test65.ok
rename to src/nvim/testdir/test65.ok
diff --git a/src/testdir/test66.in b/src/nvim/testdir/test66.in
similarity index 100%
rename from src/testdir/test66.in
rename to src/nvim/testdir/test66.in
diff --git a/src/testdir/test66.ok b/src/nvim/testdir/test66.ok
similarity index 100%
rename from src/testdir/test66.ok
rename to src/nvim/testdir/test66.ok
diff --git a/src/testdir/test67.in b/src/nvim/testdir/test67.in
similarity index 100%
rename from src/testdir/test67.in
rename to src/nvim/testdir/test67.in
diff --git a/src/testdir/test67.ok b/src/nvim/testdir/test67.ok
similarity index 100%
rename from src/testdir/test67.ok
rename to src/nvim/testdir/test67.ok
diff --git a/src/testdir/test68.in b/src/nvim/testdir/test68.in
similarity index 100%
rename from src/testdir/test68.in
rename to src/nvim/testdir/test68.in
diff --git a/src/testdir/test68.ok b/src/nvim/testdir/test68.ok
similarity index 100%
rename from src/testdir/test68.ok
rename to src/nvim/testdir/test68.ok
diff --git a/src/testdir/test69.in b/src/nvim/testdir/test69.in
similarity index 100%
rename from src/testdir/test69.in
rename to src/nvim/testdir/test69.in
diff --git a/src/testdir/test69.ok b/src/nvim/testdir/test69.ok
similarity index 100%
rename from src/testdir/test69.ok
rename to src/nvim/testdir/test69.ok
diff --git a/src/testdir/test7.in b/src/nvim/testdir/test7.in
similarity index 100%
rename from src/testdir/test7.in
rename to src/nvim/testdir/test7.in
diff --git a/src/testdir/test7.ok b/src/nvim/testdir/test7.ok
similarity index 100%
rename from src/testdir/test7.ok
rename to src/nvim/testdir/test7.ok
diff --git a/src/testdir/test70.in b/src/nvim/testdir/test70.in
similarity index 100%
rename from src/testdir/test70.in
rename to src/nvim/testdir/test70.in
diff --git a/src/testdir/test70.ok b/src/nvim/testdir/test70.ok
similarity index 100%
rename from src/testdir/test70.ok
rename to src/nvim/testdir/test70.ok
diff --git a/src/testdir/test71.in b/src/nvim/testdir/test71.in
similarity index 100%
rename from src/testdir/test71.in
rename to src/nvim/testdir/test71.in
diff --git a/src/testdir/test71.ok b/src/nvim/testdir/test71.ok
similarity index 100%
rename from src/testdir/test71.ok
rename to src/nvim/testdir/test71.ok
diff --git a/src/testdir/test71a.in b/src/nvim/testdir/test71a.in
similarity index 100%
rename from src/testdir/test71a.in
rename to src/nvim/testdir/test71a.in
diff --git a/src/testdir/test72.in b/src/nvim/testdir/test72.in
similarity index 100%
rename from src/testdir/test72.in
rename to src/nvim/testdir/test72.in
diff --git a/src/testdir/test72.ok b/src/nvim/testdir/test72.ok
similarity index 100%
rename from src/testdir/test72.ok
rename to src/nvim/testdir/test72.ok
diff --git a/src/testdir/test73.in b/src/nvim/testdir/test73.in
similarity index 100%
rename from src/testdir/test73.in
rename to src/nvim/testdir/test73.in
diff --git a/src/testdir/test73.ok b/src/nvim/testdir/test73.ok
similarity index 100%
rename from src/testdir/test73.ok
rename to src/nvim/testdir/test73.ok
diff --git a/src/testdir/test74.in b/src/nvim/testdir/test74.in
similarity index 100%
rename from src/testdir/test74.in
rename to src/nvim/testdir/test74.in
diff --git a/src/testdir/test74.ok b/src/nvim/testdir/test74.ok
similarity index 100%
rename from src/testdir/test74.ok
rename to src/nvim/testdir/test74.ok
diff --git a/src/testdir/test75.in b/src/nvim/testdir/test75.in
similarity index 100%
rename from src/testdir/test75.in
rename to src/nvim/testdir/test75.in
diff --git a/src/testdir/test75.ok b/src/nvim/testdir/test75.ok
similarity index 100%
rename from src/testdir/test75.ok
rename to src/nvim/testdir/test75.ok
diff --git a/src/testdir/test76.in b/src/nvim/testdir/test76.in
similarity index 100%
rename from src/testdir/test76.in
rename to src/nvim/testdir/test76.in
diff --git a/src/testdir/test76.ok b/src/nvim/testdir/test76.ok
similarity index 100%
rename from src/testdir/test76.ok
rename to src/nvim/testdir/test76.ok
diff --git a/src/testdir/test77.in b/src/nvim/testdir/test77.in
similarity index 100%
rename from src/testdir/test77.in
rename to src/nvim/testdir/test77.in
diff --git a/src/testdir/test77.ok b/src/nvim/testdir/test77.ok
similarity index 100%
rename from src/testdir/test77.ok
rename to src/nvim/testdir/test77.ok
diff --git a/src/testdir/test78.in b/src/nvim/testdir/test78.in
similarity index 100%
rename from src/testdir/test78.in
rename to src/nvim/testdir/test78.in
diff --git a/src/testdir/test78.ok b/src/nvim/testdir/test78.ok
similarity index 100%
rename from src/testdir/test78.ok
rename to src/nvim/testdir/test78.ok
diff --git a/src/testdir/test79.in b/src/nvim/testdir/test79.in
similarity index 100%
rename from src/testdir/test79.in
rename to src/nvim/testdir/test79.in
diff --git a/src/testdir/test79.ok b/src/nvim/testdir/test79.ok
similarity index 100%
rename from src/testdir/test79.ok
rename to src/nvim/testdir/test79.ok
diff --git a/src/testdir/test8.in b/src/nvim/testdir/test8.in
similarity index 100%
rename from src/testdir/test8.in
rename to src/nvim/testdir/test8.in
diff --git a/src/testdir/test8.ok b/src/nvim/testdir/test8.ok
similarity index 100%
rename from src/testdir/test8.ok
rename to src/nvim/testdir/test8.ok
diff --git a/src/testdir/test80.in b/src/nvim/testdir/test80.in
similarity index 100%
rename from src/testdir/test80.in
rename to src/nvim/testdir/test80.in
diff --git a/src/testdir/test80.ok b/src/nvim/testdir/test80.ok
similarity index 100%
rename from src/testdir/test80.ok
rename to src/nvim/testdir/test80.ok
diff --git a/src/testdir/test81.in b/src/nvim/testdir/test81.in
similarity index 100%
rename from src/testdir/test81.in
rename to src/nvim/testdir/test81.in
diff --git a/src/testdir/test81.ok b/src/nvim/testdir/test81.ok
similarity index 100%
rename from src/testdir/test81.ok
rename to src/nvim/testdir/test81.ok
diff --git a/src/testdir/test82.in b/src/nvim/testdir/test82.in
similarity index 100%
rename from src/testdir/test82.in
rename to src/nvim/testdir/test82.in
diff --git a/src/testdir/test82.ok b/src/nvim/testdir/test82.ok
similarity index 100%
rename from src/testdir/test82.ok
rename to src/nvim/testdir/test82.ok
diff --git a/src/testdir/test83-tags2 b/src/nvim/testdir/test83-tags2
similarity index 100%
rename from src/testdir/test83-tags2
rename to src/nvim/testdir/test83-tags2
diff --git a/src/testdir/test83-tags3 b/src/nvim/testdir/test83-tags3
similarity index 100%
rename from src/testdir/test83-tags3
rename to src/nvim/testdir/test83-tags3
diff --git a/src/testdir/test83.in b/src/nvim/testdir/test83.in
similarity index 100%
rename from src/testdir/test83.in
rename to src/nvim/testdir/test83.in
diff --git a/src/testdir/test83.ok b/src/nvim/testdir/test83.ok
similarity index 100%
rename from src/testdir/test83.ok
rename to src/nvim/testdir/test83.ok
diff --git a/src/testdir/test84.in b/src/nvim/testdir/test84.in
similarity index 100%
rename from src/testdir/test84.in
rename to src/nvim/testdir/test84.in
diff --git a/src/testdir/test84.ok b/src/nvim/testdir/test84.ok
similarity index 100%
rename from src/testdir/test84.ok
rename to src/nvim/testdir/test84.ok
diff --git a/src/testdir/test85.in b/src/nvim/testdir/test85.in
similarity index 100%
rename from src/testdir/test85.in
rename to src/nvim/testdir/test85.in
diff --git a/src/testdir/test85.ok b/src/nvim/testdir/test85.ok
similarity index 100%
rename from src/testdir/test85.ok
rename to src/nvim/testdir/test85.ok
diff --git a/src/testdir/test86.in b/src/nvim/testdir/test86.in
similarity index 100%
rename from src/testdir/test86.in
rename to src/nvim/testdir/test86.in
diff --git a/src/testdir/test86.ok b/src/nvim/testdir/test86.ok
similarity index 100%
rename from src/testdir/test86.ok
rename to src/nvim/testdir/test86.ok
diff --git a/src/testdir/test87.in b/src/nvim/testdir/test87.in
similarity index 100%
rename from src/testdir/test87.in
rename to src/nvim/testdir/test87.in
diff --git a/src/testdir/test87.ok b/src/nvim/testdir/test87.ok
similarity index 100%
rename from src/testdir/test87.ok
rename to src/nvim/testdir/test87.ok
diff --git a/src/testdir/test88.in b/src/nvim/testdir/test88.in
similarity index 100%
rename from src/testdir/test88.in
rename to src/nvim/testdir/test88.in
diff --git a/src/testdir/test88.ok b/src/nvim/testdir/test88.ok
similarity index 100%
rename from src/testdir/test88.ok
rename to src/nvim/testdir/test88.ok
diff --git a/src/testdir/test89.in b/src/nvim/testdir/test89.in
similarity index 100%
rename from src/testdir/test89.in
rename to src/nvim/testdir/test89.in
diff --git a/src/testdir/test89.ok b/src/nvim/testdir/test89.ok
similarity index 100%
rename from src/testdir/test89.ok
rename to src/nvim/testdir/test89.ok
diff --git a/src/testdir/test9.in b/src/nvim/testdir/test9.in
similarity index 100%
rename from src/testdir/test9.in
rename to src/nvim/testdir/test9.in
diff --git a/src/testdir/test9.ok b/src/nvim/testdir/test9.ok
similarity index 100%
rename from src/testdir/test9.ok
rename to src/nvim/testdir/test9.ok
diff --git a/src/testdir/test90.in b/src/nvim/testdir/test90.in
similarity index 100%
rename from src/testdir/test90.in
rename to src/nvim/testdir/test90.in
diff --git a/src/testdir/test90.ok b/src/nvim/testdir/test90.ok
similarity index 100%
rename from src/testdir/test90.ok
rename to src/nvim/testdir/test90.ok
diff --git a/src/testdir/test91.in b/src/nvim/testdir/test91.in
similarity index 100%
rename from src/testdir/test91.in
rename to src/nvim/testdir/test91.in
diff --git a/src/testdir/test91.ok b/src/nvim/testdir/test91.ok
similarity index 100%
rename from src/testdir/test91.ok
rename to src/nvim/testdir/test91.ok
diff --git a/src/testdir/test92.in b/src/nvim/testdir/test92.in
similarity index 100%
rename from src/testdir/test92.in
rename to src/nvim/testdir/test92.in
diff --git a/src/testdir/test92.ok b/src/nvim/testdir/test92.ok
similarity index 100%
rename from src/testdir/test92.ok
rename to src/nvim/testdir/test92.ok
diff --git a/src/testdir/test93.in b/src/nvim/testdir/test93.in
similarity index 100%
rename from src/testdir/test93.in
rename to src/nvim/testdir/test93.in
diff --git a/src/testdir/test93.ok b/src/nvim/testdir/test93.ok
similarity index 100%
rename from src/testdir/test93.ok
rename to src/nvim/testdir/test93.ok
diff --git a/src/testdir/test94.in b/src/nvim/testdir/test94.in
similarity index 100%
rename from src/testdir/test94.in
rename to src/nvim/testdir/test94.in
diff --git a/src/testdir/test94.ok b/src/nvim/testdir/test94.ok
similarity index 100%
rename from src/testdir/test94.ok
rename to src/nvim/testdir/test94.ok
diff --git a/src/testdir/test95.in b/src/nvim/testdir/test95.in
similarity index 100%
rename from src/testdir/test95.in
rename to src/nvim/testdir/test95.in
diff --git a/src/testdir/test95.ok b/src/nvim/testdir/test95.ok
similarity index 100%
rename from src/testdir/test95.ok
rename to src/nvim/testdir/test95.ok
diff --git a/src/testdir/test96.in b/src/nvim/testdir/test96.in
similarity index 100%
rename from src/testdir/test96.in
rename to src/nvim/testdir/test96.in
diff --git a/src/testdir/test96.ok b/src/nvim/testdir/test96.ok
similarity index 100%
rename from src/testdir/test96.ok
rename to src/nvim/testdir/test96.ok
diff --git a/src/testdir/test97.in b/src/nvim/testdir/test97.in
similarity index 100%
rename from src/testdir/test97.in
rename to src/nvim/testdir/test97.in
diff --git a/src/testdir/test97.ok b/src/nvim/testdir/test97.ok
similarity index 100%
rename from src/testdir/test97.ok
rename to src/nvim/testdir/test97.ok
diff --git a/src/testdir/test98.in b/src/nvim/testdir/test98.in
similarity index 100%
rename from src/testdir/test98.in
rename to src/nvim/testdir/test98.in
diff --git a/src/testdir/test98.ok b/src/nvim/testdir/test98.ok
similarity index 100%
rename from src/testdir/test98.ok
rename to src/nvim/testdir/test98.ok
diff --git a/src/testdir/test99.in b/src/nvim/testdir/test99.in
similarity index 100%
rename from src/testdir/test99.in
rename to src/nvim/testdir/test99.in
diff --git a/src/testdir/test99.ok b/src/nvim/testdir/test99.ok
similarity index 100%
rename from src/testdir/test99.ok
rename to src/nvim/testdir/test99.ok
diff --git a/src/testdir/test_eval.in b/src/nvim/testdir/test_eval.in
similarity index 100%
rename from src/testdir/test_eval.in
rename to src/nvim/testdir/test_eval.in
diff --git a/src/testdir/test_eval.ok b/src/nvim/testdir/test_eval.ok
similarity index 100%
rename from src/testdir/test_eval.ok
rename to src/nvim/testdir/test_eval.ok
diff --git a/src/testdir/test_eval_func.vim b/src/nvim/testdir/test_eval_func.vim
similarity index 100%
rename from src/testdir/test_eval_func.vim
rename to src/nvim/testdir/test_eval_func.vim
diff --git a/src/testdir/unix.vim b/src/nvim/testdir/unix.vim
similarity index 100%
rename from src/testdir/unix.vim
rename to src/nvim/testdir/unix.vim
diff --git a/src/types.h b/src/nvim/types.h
similarity index 100%
rename from src/types.h
rename to src/nvim/types.h
diff --git a/src/ui.c b/src/nvim/ui.c
similarity index 100%
rename from src/ui.c
rename to src/nvim/ui.c
diff --git a/src/ui.h b/src/nvim/ui.h
similarity index 100%
rename from src/ui.h
rename to src/nvim/ui.h
diff --git a/src/undo.c b/src/nvim/undo.c
similarity index 100%
rename from src/undo.c
rename to src/nvim/undo.c
diff --git a/src/undo.h b/src/nvim/undo.h
similarity index 100%
rename from src/undo.h
rename to src/nvim/undo.h
diff --git a/src/undo_defs.h b/src/nvim/undo_defs.h
similarity index 100%
rename from src/undo_defs.h
rename to src/nvim/undo_defs.h
diff --git a/src/version.c b/src/nvim/version.c
similarity index 100%
rename from src/version.c
rename to src/nvim/version.c
diff --git a/src/version.h b/src/nvim/version.h
similarity index 100%
rename from src/version.h
rename to src/nvim/version.h
diff --git a/src/version_defs.h b/src/nvim/version_defs.h
similarity index 100%
rename from src/version_defs.h
rename to src/nvim/version_defs.h
diff --git a/src/vim.h b/src/nvim/vim.h
similarity index 100%
rename from src/vim.h
rename to src/nvim/vim.h
diff --git a/src/window.c b/src/nvim/window.c
similarity index 100%
rename from src/window.c
rename to src/nvim/window.c
diff --git a/src/window.h b/src/nvim/window.h
similarity index 100%
rename from src/window.h
rename to src/nvim/window.h