Add categories in rc/

Closes #2783
mawww · Mar 21, 2019 · c0dccdd · c0dccdd
1 parent f87e844
commit c0dccdd
Show file tree

Hide file tree

Showing 139 changed files with 47 additions and 47 deletions.
diff --git a/rc/extra/editorconfig.kak → rc/detection/editorconfig.kak b/rc/extra/editorconfig.kak → rc/detection/editorconfig.kak
diff --git a/rc/base/file.kak → rc/detection/file.kak b/rc/base/file.kak → rc/detection/file.kak
diff --git a/rc/extra/modeline.kak → rc/detection/modeline.kak b/rc/extra/modeline.kak → rc/detection/modeline.kak
diff --git a/rc/extra/arch-linux.kak → rc/filetype/arch-linux.kak b/rc/extra/arch-linux.kak → rc/filetype/arch-linux.kak
diff --git a/rc/core/asciidoc.kak → rc/filetype/asciidoc.kak b/rc/core/asciidoc.kak → rc/filetype/asciidoc.kak
diff --git a/rc/core/c-family.kak → rc/filetype/c-family.kak b/rc/core/c-family.kak → rc/filetype/c-family.kak
diff --git a/rc/extra/cabal.kak → rc/filetype/cabal.kak b/rc/extra/cabal.kak → rc/filetype/cabal.kak
diff --git a/rc/base/clojure.kak → rc/filetype/clojure.kak b/rc/base/clojure.kak → rc/filetype/clojure.kak
diff --git a/rc/extra/cmake.kak → rc/filetype/cmake.kak b/rc/extra/cmake.kak → rc/filetype/cmake.kak
diff --git a/rc/extra/coffee.kak → rc/filetype/coffee.kak b/rc/extra/coffee.kak → rc/filetype/coffee.kak
diff --git a/rc/base/css.kak → rc/filetype/css.kak b/rc/base/css.kak → rc/filetype/css.kak
diff --git a/rc/extra/cucumber.kak → rc/filetype/cucumber.kak b/rc/extra/cucumber.kak → rc/filetype/cucumber.kak
diff --git a/rc/base/d.kak → rc/filetype/d.kak b/rc/base/d.kak → rc/filetype/d.kak
diff --git a/rc/extra/dart.kak → rc/filetype/dart.kak b/rc/extra/dart.kak → rc/filetype/dart.kak
diff --git a/rc/core/diff.kak → rc/filetype/diff.kak b/rc/core/diff.kak → rc/filetype/diff.kak
diff --git a/rc/extra/dockerfile.kak → rc/filetype/dockerfile.kak b/rc/extra/dockerfile.kak → rc/filetype/dockerfile.kak
diff --git a/rc/extra/elixir.kak → rc/filetype/elixir.kak b/rc/extra/elixir.kak → rc/filetype/elixir.kak
diff --git a/rc/extra/elm.kak → rc/filetype/elm.kak b/rc/extra/elm.kak → rc/filetype/elm.kak
diff --git a/rc/base/etc.kak → rc/filetype/etc.kak b/rc/base/etc.kak → rc/filetype/etc.kak
diff --git a/rc/extra/exherbo.kak → rc/filetype/exherbo.kak b/rc/extra/exherbo.kak → rc/filetype/exherbo.kak
diff --git a/rc/base/fish.kak → rc/filetype/fish.kak b/rc/base/fish.kak → rc/filetype/fish.kak
diff --git a/rc/base/gas.kak → rc/filetype/gas.kak b/rc/base/gas.kak → rc/filetype/gas.kak
diff --git a/rc/base/git.kak → rc/filetype/git.kak b/rc/base/git.kak → rc/filetype/git.kak
diff --git a/rc/base/go.kak → rc/filetype/go.kak b/rc/base/go.kak → rc/filetype/go.kak
diff --git a/rc/extra/haml.kak → rc/filetype/haml.kak b/rc/extra/haml.kak → rc/filetype/haml.kak
diff --git a/rc/base/haskell.kak → rc/filetype/haskell.kak b/rc/base/haskell.kak → rc/filetype/haskell.kak
diff --git a/rc/extra/hbs.kak → rc/filetype/hbs.kak b/rc/extra/hbs.kak → rc/filetype/hbs.kak
diff --git a/rc/base/html.kak → rc/filetype/html.kak b/rc/base/html.kak → rc/filetype/html.kak
diff --git a/rc/extra/i3.kak → rc/filetype/i3.kak b/rc/extra/i3.kak → rc/filetype/i3.kak
diff --git a/rc/base/ini.kak → rc/filetype/ini.kak b/rc/base/ini.kak → rc/filetype/ini.kak
diff --git a/rc/base/java.kak → rc/filetype/java.kak b/rc/base/java.kak → rc/filetype/java.kak
diff --git a/rc/base/javascript.kak → rc/filetype/javascript.kak b/rc/base/javascript.kak → rc/filetype/javascript.kak
diff --git a/rc/base/json.kak → rc/filetype/json.kak b/rc/base/json.kak → rc/filetype/json.kak
diff --git a/rc/base/julia.kak → rc/filetype/julia.kak b/rc/base/julia.kak → rc/filetype/julia.kak
diff --git a/rc/extra/just.kak → rc/filetype/just.kak b/rc/extra/just.kak → rc/filetype/just.kak
diff --git a/rc/core/kakrc.kak → rc/filetype/kakrc.kak b/rc/core/kakrc.kak → rc/filetype/kakrc.kak
diff --git a/rc/extra/kickstart.kak → rc/filetype/kickstart.kak b/rc/extra/kickstart.kak → rc/filetype/kickstart.kak
diff --git a/rc/extra/latex.kak → rc/filetype/latex.kak b/rc/extra/latex.kak → rc/filetype/latex.kak
diff --git a/rc/base/lisp.kak → rc/filetype/lisp.kak b/rc/base/lisp.kak → rc/filetype/lisp.kak
diff --git a/rc/base/lua.kak → rc/filetype/lua.kak b/rc/base/lua.kak → rc/filetype/lua.kak
diff --git a/rc/base/mail.kak → rc/filetype/mail.kak b/rc/base/mail.kak → rc/filetype/mail.kak
diff --git a/rc/core/makefile.kak → rc/filetype/makefile.kak b/rc/core/makefile.kak → rc/filetype/makefile.kak
diff --git a/rc/base/markdown.kak → rc/filetype/markdown.kak b/rc/base/markdown.kak → rc/filetype/markdown.kak
diff --git a/rc/base/mercurial.kak → rc/filetype/mercurial.kak b/rc/base/mercurial.kak → rc/filetype/mercurial.kak
diff --git a/rc/extra/moon.kak → rc/filetype/moon.kak b/rc/extra/moon.kak → rc/filetype/moon.kak
diff --git a/rc/extra/nim.kak → rc/filetype/nim.kak b/rc/extra/nim.kak → rc/filetype/nim.kak
diff --git a/rc/base/ocaml.kak → rc/filetype/ocaml.kak b/rc/base/ocaml.kak → rc/filetype/ocaml.kak
diff --git a/rc/base/perl.kak → rc/filetype/perl.kak b/rc/base/perl.kak → rc/filetype/perl.kak
diff --git a/rc/extra/php.kak → rc/filetype/php.kak b/rc/extra/php.kak → rc/filetype/php.kak
diff --git a/rc/extra/pony.kak → rc/filetype/pony.kak b/rc/extra/pony.kak → rc/filetype/pony.kak
diff --git a/rc/extra/protobuf.kak → rc/filetype/protobuf.kak b/rc/extra/protobuf.kak → rc/filetype/protobuf.kak
diff --git a/rc/extra/pug.kak → rc/filetype/pug.kak b/rc/extra/pug.kak → rc/filetype/pug.kak
diff --git a/rc/core/python.kak → rc/filetype/python.kak b/rc/core/python.kak → rc/filetype/python.kak
diff --git a/rc/extra/ragel.kak → rc/filetype/ragel.kak b/rc/extra/ragel.kak → rc/filetype/ragel.kak
diff --git a/rc/base/restructuredtext.kak → rc/filetype/restructuredtext.kak b/rc/base/restructuredtext.kak → rc/filetype/restructuredtext.kak
diff --git a/rc/base/ruby.kak → rc/filetype/ruby.kak b/rc/base/ruby.kak → rc/filetype/ruby.kak
diff --git a/rc/base/rust.kak → rc/filetype/rust.kak b/rc/base/rust.kak → rc/filetype/rust.kak
diff --git a/rc/extra/sass.kak → rc/filetype/sass.kak b/rc/extra/sass.kak → rc/filetype/sass.kak
diff --git a/rc/base/scala.kak → rc/filetype/scala.kak b/rc/base/scala.kak → rc/filetype/scala.kak
diff --git a/rc/extra/scheme.kak → rc/filetype/scheme.kak b/rc/extra/scheme.kak → rc/filetype/scheme.kak
diff --git a/rc/extra/scss.kak → rc/filetype/scss.kak b/rc/extra/scss.kak → rc/filetype/scss.kak
diff --git a/rc/core/sh.kak → rc/filetype/sh.kak b/rc/core/sh.kak → rc/filetype/sh.kak
diff --git a/rc/base/sql.kak → rc/filetype/sql.kak b/rc/base/sql.kak → rc/filetype/sql.kak
diff --git a/rc/base/swift.kak → rc/filetype/swift.kak b/rc/base/swift.kak → rc/filetype/swift.kak
diff --git a/rc/extra/systemd.kak → rc/filetype/systemd.kak b/rc/extra/systemd.kak → rc/filetype/systemd.kak
diff --git a/rc/extra/taskpaper.kak → rc/filetype/taskpaper.kak b/rc/extra/taskpaper.kak → rc/filetype/taskpaper.kak
diff --git a/rc/extra/toml.kak → rc/filetype/toml.kak b/rc/extra/toml.kak → rc/filetype/toml.kak
diff --git a/rc/extra/troff.kak → rc/filetype/troff.kak b/rc/extra/troff.kak → rc/filetype/troff.kak
diff --git a/rc/extra/tupfile.kak → rc/filetype/tupfile.kak b/rc/extra/tupfile.kak → rc/filetype/tupfile.kak
diff --git a/rc/extra/void-linux.kak → rc/filetype/void-linux.kak b/rc/extra/void-linux.kak → rc/filetype/void-linux.kak
diff --git a/rc/base/yaml.kak → rc/filetype/yaml.kak b/rc/base/yaml.kak → rc/filetype/yaml.kak
diff --git a/rc/extra/autorestore.kak → rc/tools/autorestore.kak b/rc/extra/autorestore.kak → rc/tools/autorestore.kak
diff --git a/rc/base/autowrap.kak → rc/tools/autowrap.kak b/rc/base/autowrap.kak → rc/tools/autowrap.kak
diff --git a/rc/extra/clang.kak → rc/tools/clang.kak b/rc/extra/clang.kak → rc/tools/clang.kak
diff --git a/rc/core/comment.kak → rc/tools/comment.kak b/rc/core/comment.kak → rc/tools/comment.kak
diff --git a/rc/base/ctags.kak → rc/tools/ctags.kak b/rc/base/ctags.kak → rc/tools/ctags.kak
diff --git a/rc/core/doc.kak → rc/tools/doc.kak b/rc/core/doc.kak → rc/tools/doc.kak
diff --git a/rc/core/formatter.kak → rc/tools/formatter.kak b/rc/core/formatter.kak → rc/tools/formatter.kak
diff --git a/rc/extra/git-tools.kak → rc/tools/git.kak b/rc/extra/git-tools.kak → rc/tools/git.kak
diff --git a/rc/extra/go-tools.kak → rc/tools/go/go-tools.kak b/rc/extra/go-tools.kak → rc/tools/go/go-tools.kak
diff --git a/rc/core/grep.kak → rc/tools/grep.kak b/rc/core/grep.kak → rc/tools/grep.kak
diff --git a/rc/base/lint.kak → rc/tools/lint.kak b/rc/base/lint.kak → rc/tools/lint.kak
diff --git a/rc/core/make.kak → rc/tools/make.kak b/rc/core/make.kak → rc/tools/make.kak
diff --git a/rc/core/man.kak → rc/tools/man.kak b/rc/core/man.kak → rc/tools/man.kak
diff --git a/rc/extra/jedi.kak → rc/tools/python/jedi.kak b/rc/extra/jedi.kak → rc/tools/python/jedi.kak
diff --git a/rc/extra/ranger.kak → rc/tools/ranger.kak b/rc/extra/ranger.kak → rc/tools/ranger.kak
diff --git a/rc/extra/racer.kak → rc/tools/rust/racer.kak b/rc/extra/racer.kak → rc/tools/rust/racer.kak
diff --git a/rc/base/spell.kak → rc/tools/spell.kak b/rc/base/spell.kak → rc/tools/spell.kak
diff --git a/rc/extra/iterm.kak → rc/windowing/iterm.kak b/rc/extra/iterm.kak → rc/windowing/iterm.kak
diff --git a/rc/extra/kitty.kak → rc/windowing/kitty.kak b/rc/extra/kitty.kak → rc/windowing/kitty.kak
diff --git a/rc/base/new-client.kak → rc/windowing/new-client.kak b/rc/base/new-client.kak → rc/windowing/new-client.kak
diff --git a/rc/base/screen.kak → rc/windowing/screen.kak b/rc/base/screen.kak → rc/windowing/screen.kak
diff --git a/rc/base/tmux.kak → rc/windowing/tmux.kak b/rc/base/tmux.kak → rc/windowing/tmux.kak
diff --git a/rc/extra/tmux-repl.kak → rc/windowing/tmux/repl.kak b/rc/extra/tmux-repl.kak → rc/windowing/tmux/repl.kak
diff --git a/rc/base/x11.kak → rc/windowing/x11.kak b/rc/base/x11.kak → rc/windowing/x11.kak
diff --git a/rc/extra/x11-repl.kak → rc/windowing/x11/repl.kak b/rc/extra/x11-repl.kak → rc/windowing/x11/repl.kak
diff --git a/test/indent/c-family/align-while-expr/rc b/test/indent/c-family/align-while-expr/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/close-namespace/rc b/test/indent/c-family/close-namespace/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/close-struct/rc b/test/indent/c-family/close-struct/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/comment-line-continuation/rc b/test/indent/c-family/comment-line-continuation/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/construct-align/rc b/test/indent/c-family/construct-align/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/deindent-if-body/rc b/test/indent/c-family/deindent-if-body/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/indent-after-parenthesis/rc b/test/indent/c-family/indent-after-parenthesis/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/indent-if-body/rc b/test/indent/c-family/indent-if-body/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/indent-if-brace/rc b/test/indent/c-family/indent-if-brace/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/move-brace/rc b/test/indent/c-family/move-brace/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/multiline-nested-align/rc b/test/indent/c-family/multiline-nested-align/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/nested-align/rc b/test/indent/c-family/nested-align/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/open-function/rc b/test/indent/c-family/open-function/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/comment/comment-multiple-lines-indented/rc b/test/indent/comment/comment-multiple-lines-indented/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/comment/comment-multiple-lines-unindented/rc b/test/indent/comment/comment-multiple-lines-unindented/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/comment/comment-multiple-lines-when-partially-commented/rc b/test/indent/comment/comment-multiple-lines-when-partially-commented/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/comment/uncomment-multiple-indented-lines/rc b/test/indent/comment/uncomment-multiple-indented-lines/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/haskell/before-comment/rc b/test/indent/haskell/before-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/haskell.kak"
+source "%val{runtime}/rc/filetype/haskell.kak"
 set buffer filetype haskell
diff --git a/test/indent/haskell/indented-comment/rc b/test/indent/haskell/indented-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/haskell.kak"
+source "%val{runtime}/rc/filetype/haskell.kak"
 set buffer filetype haskell
diff --git a/test/indent/haskell/inside-comment/rc b/test/indent/haskell/inside-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/haskell.kak"
+source "%val{runtime}/rc/filetype/haskell.kak"
 set buffer filetype haskell
diff --git a/test/indent/html/indent-closing-tag/rc b/test/indent/html/indent-closing-tag/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/html.kak"
+source "%val{runtime}/rc/filetype/html.kak"
 set buffer filetype html
diff --git a/test/indent/lua/insert-end-only-when-needed/rc b/test/indent/lua/insert-end-only-when-needed/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/lua.kak"
+source "%val{runtime}/rc/filetype/lua.kak"
 set buffer filetype lua
diff --git a/test/indent/markdown/inside-complex-blockquote/rc b/test/indent/markdown/inside-complex-blockquote/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-list-item/rc b/test/indent/markdown/inside-list-item/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-nested-list-item/rc b/test/indent/markdown/inside-nested-list-item/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-simple-blockquote/rc b/test/indent/markdown/inside-simple-blockquote/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-strong-emphasis/rc b/test/indent/markdown/inside-strong-emphasis/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/list-item/rc b/test/indent/markdown/list-item/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/open-after-setext-heading-1/rc b/test/indent/markdown/open-after-setext-heading-1/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/open-after-setext-heading-2/rc b/test/indent/markdown/open-after-setext-heading-2/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/ruby/following-blocks-should-not-prevent-end/rc b/test/indent/ruby/following-blocks-should-not-prevent-end/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/ruby.kak"
+source "%val{runtime}/rc/filetype/ruby.kak"
 set buffer filetype ruby
diff --git a/test/indent/ruby/indent-after-class/rc b/test/indent/ruby/indent-after-class/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/ruby.kak"
+source "%val{runtime}/rc/filetype/ruby.kak"
 set buffer filetype ruby
diff --git a/test/indent/ruby/method-definition-shouldnt-duplicate/rc b/test/indent/ruby/method-definition-shouldnt-duplicate/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/ruby.kak"
+source "%val{runtime}/rc/filetype/ruby.kak"
 set buffer filetype ruby
diff --git a/test/regression/1074-comment-leader-autoinsert-error/rc b/test/regression/1074-comment-leader-autoinsert-error/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/1111-unexpected-behaviour-on-new-line-in-comment/rc b/test/regression/1111-unexpected-behaviour-on-new-line-in-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/1118-misaligned-comment-start/rc b/test/regression/1118-misaligned-comment-start/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/rc b/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/kakrc.kak"
+source "%val{runtime}/rc/filetype/kakrc.kak"
 set buffer filetype kak
diff --git a/test/regression/1525-lua-indent-error/rc b/test/regression/1525-lua-indent-error/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/lua.kak"
+source "%val{runtime}/rc/filetype/lua.kak"
 set buffer filetype lua
diff --git a/test/regression/1920-crash-on-python-in-docstring/rc b/test/regression/1920-crash-on-python-in-docstring/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/python.kak"
+source "%val{runtime}/rc/filetype/python.kak"
 set buffer filetype python
diff --git a/test/regression/2499-html-regions-assert/rc b/test/regression/2499-html-regions-assert/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/html.kak"
+source "%val{runtime}/rc/filetype/html.kak"
 set buffer filetype html
diff --git a/test/regression/860-python-incorrect-commenting/rc b/test/regression/860-python-incorrect-commenting/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/python.kak"
+source "%val{runtime}/rc/filetype/python.kak"
 set buffer filetype python
diff --git a/test/regression/872-indentation-misbeahviour-c++/rc b/test/regression/872-indentation-misbeahviour-c++/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/918-wrong-asterisk-inserted/rc b/test/regression/918-wrong-asterisk-inserted/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp