Add categories in rc/

Closes #2783

139 files changed, 47 insertions, 47 deletions

diff --git a/rc/extra/editorconfig.kak b/rc/detection/editorconfig.kak
index 9421e033..9421e033 100644
--- a/rc/extra/editorconfig.kak
+++ b/rc/detection/editorconfig.kak
diff --git a/rc/base/file.kak b/rc/detection/file.kak
index 073e9ce0..073e9ce0 100644
--- a/rc/base/file.kak
+++ b/rc/detection/file.kak
diff --git a/rc/extra/modeline.kak b/rc/detection/modeline.kak
index ece6d97a..ece6d97a 100644
--- a/rc/extra/modeline.kak
+++ b/rc/detection/modeline.kak
diff --git a/rc/extra/arch-linux.kak b/rc/filetype/arch-linux.kak
index 08135a76..08135a76 100644
--- a/rc/extra/arch-linux.kak
+++ b/rc/filetype/arch-linux.kak
diff --git a/rc/core/asciidoc.kak b/rc/filetype/asciidoc.kak
index 8bdcce07..8bdcce07 100644
--- a/rc/core/asciidoc.kak
+++ b/rc/filetype/asciidoc.kak
diff --git a/rc/core/c-family.kak b/rc/filetype/c-family.kak
index 461545fb..461545fb 100644
--- a/rc/core/c-family.kak
+++ b/rc/filetype/c-family.kak
diff --git a/rc/extra/cabal.kak b/rc/filetype/cabal.kak
index b3e7e58c..b3e7e58c 100644
--- a/rc/extra/cabal.kak
+++ b/rc/filetype/cabal.kak
diff --git a/rc/base/clojure.kak b/rc/filetype/clojure.kak
index da6134a6..da6134a6 100644
--- a/rc/base/clojure.kak
+++ b/rc/filetype/clojure.kak
diff --git a/rc/extra/cmake.kak b/rc/filetype/cmake.kak
index 77ec18c5..77ec18c5 100644
--- a/rc/extra/cmake.kak
+++ b/rc/filetype/cmake.kak
diff --git a/rc/extra/coffee.kak b/rc/filetype/coffee.kak
index c8e7384e..c8e7384e 100644
--- a/rc/extra/coffee.kak
+++ b/rc/filetype/coffee.kak
diff --git a/rc/base/css.kak b/rc/filetype/css.kak
index ecc456ed..ecc456ed 100644
--- a/rc/base/css.kak
+++ b/rc/filetype/css.kak
diff --git a/rc/extra/cucumber.kak b/rc/filetype/cucumber.kak
index 180da7d0..180da7d0 100644
--- a/rc/extra/cucumber.kak
+++ b/rc/filetype/cucumber.kak
diff --git a/rc/base/d.kak b/rc/filetype/d.kak
index f0f08248..f0f08248 100644
--- a/rc/base/d.kak
+++ b/rc/filetype/d.kak
diff --git a/rc/extra/dart.kak b/rc/filetype/dart.kak
index 5b5600cb..5b5600cb 100644
--- a/rc/extra/dart.kak
+++ b/rc/filetype/dart.kak
diff --git a/rc/core/diff.kak b/rc/filetype/diff.kak
index 5b4e065b..5b4e065b 100644
--- a/rc/core/diff.kak
+++ b/rc/filetype/diff.kak
diff --git a/rc/extra/dockerfile.kak b/rc/filetype/dockerfile.kak
index 07da2347..07da2347 100644
--- a/rc/extra/dockerfile.kak
+++ b/rc/filetype/dockerfile.kak
diff --git a/rc/extra/elixir.kak b/rc/filetype/elixir.kak
index a2587d1e..a2587d1e 100644
--- a/rc/extra/elixir.kak
+++ b/rc/filetype/elixir.kak
diff --git a/rc/extra/elm.kak b/rc/filetype/elm.kak
index 05d1248b..05d1248b 100644
--- a/rc/extra/elm.kak
+++ b/rc/filetype/elm.kak
diff --git a/rc/base/etc.kak b/rc/filetype/etc.kak
index 1e2067fe..1e2067fe 100644
--- a/rc/base/etc.kak
+++ b/rc/filetype/etc.kak
diff --git a/rc/extra/exherbo.kak b/rc/filetype/exherbo.kak
index 42cc618c..42cc618c 100644
--- a/rc/extra/exherbo.kak
+++ b/rc/filetype/exherbo.kak
diff --git a/rc/base/fish.kak b/rc/filetype/fish.kak
index 8e23ede4..8e23ede4 100644
--- a/rc/base/fish.kak
+++ b/rc/filetype/fish.kak
diff --git a/rc/base/gas.kak b/rc/filetype/gas.kak
index 0c1f79f8..0c1f79f8 100644
--- a/rc/base/gas.kak
+++ b/rc/filetype/gas.kak
diff --git a/rc/base/git.kak b/rc/filetype/git.kak
index 13d58f0a..13d58f0a 100644
--- a/rc/base/git.kak
+++ b/rc/filetype/git.kak
diff --git a/rc/base/go.kak b/rc/filetype/go.kak
index 8aebe657..8aebe657 100644
--- a/rc/base/go.kak
+++ b/rc/filetype/go.kak
diff --git a/rc/extra/haml.kak b/rc/filetype/haml.kak
index e3e7f593..e3e7f593 100644
--- a/rc/extra/haml.kak
+++ b/rc/filetype/haml.kak
diff --git a/rc/base/haskell.kak b/rc/filetype/haskell.kak
index c51bcaf4..c51bcaf4 100644
--- a/rc/base/haskell.kak
+++ b/rc/filetype/haskell.kak
diff --git a/rc/extra/hbs.kak b/rc/filetype/hbs.kak
index a0948e6f..a0948e6f 100644
--- a/rc/extra/hbs.kak
+++ b/rc/filetype/hbs.kak
diff --git a/rc/base/html.kak b/rc/filetype/html.kak
index 5f76721d..5f76721d 100644
--- a/rc/base/html.kak
+++ b/rc/filetype/html.kak
diff --git a/rc/extra/i3.kak b/rc/filetype/i3.kak
index e661fcd7..e661fcd7 100644
--- a/rc/extra/i3.kak
+++ b/rc/filetype/i3.kak
diff --git a/rc/base/ini.kak b/rc/filetype/ini.kak
index c03cae4e..c03cae4e 100644
--- a/rc/base/ini.kak
+++ b/rc/filetype/ini.kak
diff --git a/rc/base/java.kak b/rc/filetype/java.kak
index 7caa5aee..7caa5aee 100644
--- a/rc/base/java.kak
+++ b/rc/filetype/java.kak
diff --git a/rc/base/javascript.kak b/rc/filetype/javascript.kak
index 4d16ee68..4d16ee68 100644
--- a/rc/base/javascript.kak
+++ b/rc/filetype/javascript.kak
diff --git a/rc/base/json.kak b/rc/filetype/json.kak
index ae04c55a..ae04c55a 100644
--- a/rc/base/json.kak
+++ b/rc/filetype/json.kak
diff --git a/rc/base/julia.kak b/rc/filetype/julia.kak
index abdf547a..abdf547a 100644
--- a/rc/base/julia.kak
+++ b/rc/filetype/julia.kak
diff --git a/rc/extra/just.kak b/rc/filetype/just.kak
index 201bfc3d..201bfc3d 100644
--- a/rc/extra/just.kak
+++ b/rc/filetype/just.kak
diff --git a/rc/core/kakrc.kak b/rc/filetype/kakrc.kak
index 7a9af989..7a9af989 100644
--- a/rc/core/kakrc.kak
+++ b/rc/filetype/kakrc.kak
diff --git a/rc/extra/kickstart.kak b/rc/filetype/kickstart.kak
index 6f30b4b8..6f30b4b8 100644
--- a/rc/extra/kickstart.kak
+++ b/rc/filetype/kickstart.kak
diff --git a/rc/extra/latex.kak b/rc/filetype/latex.kak
index acb5c1fc..acb5c1fc 100644
--- a/rc/extra/latex.kak
+++ b/rc/filetype/latex.kak
diff --git a/rc/base/lisp.kak b/rc/filetype/lisp.kak
index 378bb3c5..378bb3c5 100644
--- a/rc/base/lisp.kak
+++ b/rc/filetype/lisp.kak
diff --git a/rc/base/lua.kak b/rc/filetype/lua.kak
index 605148e0..605148e0 100644
--- a/rc/base/lua.kak
+++ b/rc/filetype/lua.kak
diff --git a/rc/base/mail.kak b/rc/filetype/mail.kak
index 4323d28c..4323d28c 100644
--- a/rc/base/mail.kak
+++ b/rc/filetype/mail.kak
diff --git a/rc/core/makefile.kak b/rc/filetype/makefile.kak
index 569d51f9..569d51f9 100644
--- a/rc/core/makefile.kak
+++ b/rc/filetype/makefile.kak
diff --git a/rc/base/markdown.kak b/rc/filetype/markdown.kak
index 18f3ccf6..18f3ccf6 100644
--- a/rc/base/markdown.kak
+++ b/rc/filetype/markdown.kak
diff --git a/rc/base/mercurial.kak b/rc/filetype/mercurial.kak
index 3f84eea2..3f84eea2 100644
--- a/rc/base/mercurial.kak
+++ b/rc/filetype/mercurial.kak
diff --git a/rc/extra/moon.kak b/rc/filetype/moon.kak
index a1d2ecb8..a1d2ecb8 100644
--- a/rc/extra/moon.kak
+++ b/rc/filetype/moon.kak
diff --git a/rc/extra/nim.kak b/rc/filetype/nim.kak
index 901ce68a..901ce68a 100644
--- a/rc/extra/nim.kak
+++ b/rc/filetype/nim.kak
diff --git a/rc/base/ocaml.kak b/rc/filetype/ocaml.kak
index 0a3d49bf..0a3d49bf 100644
--- a/rc/base/ocaml.kak
+++ b/rc/filetype/ocaml.kak
diff --git a/rc/base/perl.kak b/rc/filetype/perl.kak
index e69058d3..e69058d3 100644
--- a/rc/base/perl.kak
+++ b/rc/filetype/perl.kak
diff --git a/rc/extra/php.kak b/rc/filetype/php.kak
index 4acfde85..4acfde85 100644
--- a/rc/extra/php.kak
+++ b/rc/filetype/php.kak
diff --git a/rc/extra/pony.kak b/rc/filetype/pony.kak
index 713cc295..713cc295 100644
--- a/rc/extra/pony.kak
+++ b/rc/filetype/pony.kak
diff --git a/rc/extra/protobuf.kak b/rc/filetype/protobuf.kak
index 2ef10480..2ef10480 100644
--- a/rc/extra/protobuf.kak
+++ b/rc/filetype/protobuf.kak
diff --git a/rc/extra/pug.kak b/rc/filetype/pug.kak
index 13aa839f..13aa839f 100644
--- a/rc/extra/pug.kak
+++ b/rc/filetype/pug.kak
diff --git a/rc/core/python.kak b/rc/filetype/python.kak
index fb9477b9..fb9477b9 100644
--- a/rc/core/python.kak
+++ b/rc/filetype/python.kak
diff --git a/rc/extra/ragel.kak b/rc/filetype/ragel.kak
index b6e8dd4c..b6e8dd4c 100644
--- a/rc/extra/ragel.kak
+++ b/rc/filetype/ragel.kak
diff --git a/rc/base/restructuredtext.kak b/rc/filetype/restructuredtext.kak
index 1eaf4bfc..1eaf4bfc 100644
--- a/rc/base/restructuredtext.kak
+++ b/rc/filetype/restructuredtext.kak
diff --git a/rc/base/ruby.kak b/rc/filetype/ruby.kak
index 3e5cfcfa..3e5cfcfa 100644
--- a/rc/base/ruby.kak
+++ b/rc/filetype/ruby.kak
diff --git a/rc/base/rust.kak b/rc/filetype/rust.kak
index 9cbca842..9cbca842 100644
--- a/rc/base/rust.kak
+++ b/rc/filetype/rust.kak
diff --git a/rc/extra/sass.kak b/rc/filetype/sass.kak
index d23a7b81..d23a7b81 100644
--- a/rc/extra/sass.kak
+++ b/rc/filetype/sass.kak
diff --git a/rc/base/scala.kak b/rc/filetype/scala.kak
index 1e62e2ad..1e62e2ad 100644
--- a/rc/base/scala.kak
+++ b/rc/filetype/scala.kak
diff --git a/rc/extra/scheme.kak b/rc/filetype/scheme.kak
index ec86638b..ec86638b 100644
--- a/rc/extra/scheme.kak
+++ b/rc/filetype/scheme.kak
diff --git a/rc/extra/scss.kak b/rc/filetype/scss.kak
index bb720db5..bb720db5 100644
--- a/rc/extra/scss.kak
+++ b/rc/filetype/scss.kak
diff --git a/rc/core/sh.kak b/rc/filetype/sh.kak
index 517f6a18..517f6a18 100644
--- a/rc/core/sh.kak
+++ b/rc/filetype/sh.kak
diff --git a/rc/base/sql.kak b/rc/filetype/sql.kak
index dbecea9c..dbecea9c 100644
--- a/rc/base/sql.kak
+++ b/rc/filetype/sql.kak
diff --git a/rc/base/swift.kak b/rc/filetype/swift.kak
index 1526cadb..1526cadb 100644
--- a/rc/base/swift.kak
+++ b/rc/filetype/swift.kak
diff --git a/rc/extra/systemd.kak b/rc/filetype/systemd.kak
index 3810d005..3810d005 100644
--- a/rc/extra/systemd.kak
+++ b/rc/filetype/systemd.kak
diff --git a/rc/extra/taskpaper.kak b/rc/filetype/taskpaper.kak
index dca5de1e..dca5de1e 100644
--- a/rc/extra/taskpaper.kak
+++ b/rc/filetype/taskpaper.kak
diff --git a/rc/extra/toml.kak b/rc/filetype/toml.kak
index f95fbb9d..f95fbb9d 100644
--- a/rc/extra/toml.kak
+++ b/rc/filetype/toml.kak
diff --git a/rc/extra/troff.kak b/rc/filetype/troff.kak
index 072cc3d1..072cc3d1 100644
--- a/rc/extra/troff.kak
+++ b/rc/filetype/troff.kak
diff --git a/rc/extra/tupfile.kak b/rc/filetype/tupfile.kak
index e7ba0d52..e7ba0d52 100644
--- a/rc/extra/tupfile.kak
+++ b/rc/filetype/tupfile.kak
diff --git a/rc/extra/void-linux.kak b/rc/filetype/void-linux.kak
index 23a02061..23a02061 100644
--- a/rc/extra/void-linux.kak
+++ b/rc/filetype/void-linux.kak
diff --git a/rc/base/yaml.kak b/rc/filetype/yaml.kak
index 7076e13d..7076e13d 100644
--- a/rc/base/yaml.kak
+++ b/rc/filetype/yaml.kak
diff --git a/rc/extra/autorestore.kak b/rc/tools/autorestore.kak
index f8e3e14d..f8e3e14d 100644
--- a/rc/extra/autorestore.kak
+++ b/rc/tools/autorestore.kak
diff --git a/rc/base/autowrap.kak b/rc/tools/autowrap.kak
index 0fb12123..0fb12123 100644
--- a/rc/base/autowrap.kak
+++ b/rc/tools/autowrap.kak
diff --git a/rc/extra/clang.kak b/rc/tools/clang.kak
index 3386073b..3386073b 100644
--- a/rc/extra/clang.kak
+++ b/rc/tools/clang.kak
diff --git a/rc/core/comment.kak b/rc/tools/comment.kak
index fbfb8267..fbfb8267 100644
--- a/rc/core/comment.kak
+++ b/rc/tools/comment.kak
diff --git a/rc/base/ctags.kak b/rc/tools/ctags.kak
index 20eabac0..20eabac0 100644
--- a/rc/base/ctags.kak
+++ b/rc/tools/ctags.kak
diff --git a/rc/core/doc.kak b/rc/tools/doc.kak
index f1dbc850..f1dbc850 100644
--- a/rc/core/doc.kak
+++ b/rc/tools/doc.kak
diff --git a/rc/core/formatter.kak b/rc/tools/formatter.kak
index 40c38444..40c38444 100644
--- a/rc/core/formatter.kak
+++ b/rc/tools/formatter.kak
diff --git a/rc/extra/git-tools.kak b/rc/tools/git.kak
index 21b5627b..21b5627b 100644
--- a/rc/extra/git-tools.kak
+++ b/rc/tools/git.kak
diff --git a/rc/extra/go-tools.kak b/rc/tools/go/go-tools.kak
index ee26698e..ee26698e 100644
--- a/rc/extra/go-tools.kak
+++ b/rc/tools/go/go-tools.kak
diff --git a/rc/core/grep.kak b/rc/tools/grep.kak
index 9e6ed5ab..9e6ed5ab 100644
--- a/rc/core/grep.kak
+++ b/rc/tools/grep.kak
diff --git a/rc/base/lint.kak b/rc/tools/lint.kak
index 11189315..11189315 100644
--- a/rc/base/lint.kak
+++ b/rc/tools/lint.kak
diff --git a/rc/core/make.kak b/rc/tools/make.kak
index 89533a59..89533a59 100644
--- a/rc/core/make.kak
+++ b/rc/tools/make.kak
diff --git a/rc/core/man.kak b/rc/tools/man.kak
index 41d91104..41d91104 100644
--- a/rc/core/man.kak
+++ b/rc/tools/man.kak
diff --git a/rc/extra/jedi.kak b/rc/tools/python/jedi.kak
index a0fe9449..a0fe9449 100644
--- a/rc/extra/jedi.kak
+++ b/rc/tools/python/jedi.kak
diff --git a/rc/extra/ranger.kak b/rc/tools/ranger.kak
index 4bb49a7b..4bb49a7b 100644
--- a/rc/extra/ranger.kak
+++ b/rc/tools/ranger.kak
diff --git a/rc/extra/racer.kak b/rc/tools/rust/racer.kak
index 2371c597..2371c597 100644
--- a/rc/extra/racer.kak
+++ b/rc/tools/rust/racer.kak
diff --git a/rc/base/spell.kak b/rc/tools/spell.kak
index 10c0f915..10c0f915 100644
--- a/rc/base/spell.kak
+++ b/rc/tools/spell.kak
diff --git a/rc/extra/iterm.kak b/rc/windowing/iterm.kak
index 7518d2d0..7518d2d0 100644
--- a/rc/extra/iterm.kak
+++ b/rc/windowing/iterm.kak
diff --git a/rc/extra/kitty.kak b/rc/windowing/kitty.kak
index 79583945..79583945 100644
--- a/rc/extra/kitty.kak
+++ b/rc/windowing/kitty.kak
diff --git a/rc/base/new-client.kak b/rc/windowing/new-client.kak
index 6ec538a9..6ec538a9 100644
--- a/rc/base/new-client.kak
+++ b/rc/windowing/new-client.kak
diff --git a/rc/base/screen.kak b/rc/windowing/screen.kak
index e4ddd2e9..e4ddd2e9 100644
--- a/rc/base/screen.kak
+++ b/rc/windowing/screen.kak
diff --git a/rc/base/tmux.kak b/rc/windowing/tmux.kak
index acc5c097..acc5c097 100644
--- a/rc/base/tmux.kak
+++ b/rc/windowing/tmux.kak
diff --git a/rc/extra/tmux-repl.kak b/rc/windowing/tmux/repl.kak
index a176f5f5..a176f5f5 100644
--- a/rc/extra/tmux-repl.kak
+++ b/rc/windowing/tmux/repl.kak
diff --git a/rc/base/x11.kak b/rc/windowing/x11.kak
index 27b637ae..27b637ae 100644
--- a/rc/base/x11.kak
+++ b/rc/windowing/x11.kak
diff --git a/rc/extra/x11-repl.kak b/rc/windowing/x11/repl.kak
index 865e2748..865e2748 100644
--- a/rc/extra/x11-repl.kak
+++ b/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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 4808655d..f9dc592b 100644
--- 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
index 4808655d..f9dc592b 100644
--- 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
index 4808655d..f9dc592b 100644
--- 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
index 4808655d..f9dc592b 100644
--- 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
index 7e506fc4..3f756817 100644
--- 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
index 7e506fc4..3f756817 100644
--- 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
index 7e506fc4..3f756817 100644
--- 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
index 5756ea1a..ef3301f7 100644
--- 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
index 7550d15c..b5cf999d 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index 7b9ff85e..59ce7862 100644
--- 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
index d4fadeea..934f7e83 100644
--- 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
index d4fadeea..934f7e83 100644
--- 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
index d4fadeea..934f7e83 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 3daaec2e..367014a1 100644
--- 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
index 7550d15c..b5cf999d 100644
--- 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
index 909f53ff..a098fc21 100644
--- 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
index 5756ea1a..ef3301f7 100644
--- 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
index 909f53ff..a098fc21 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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
index 53c40654..2c2a7247 100644
--- 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