diff --git a/rc/autowrap.kak b/rc/base/autowrap.kak
similarity index 100%
rename from rc/autowrap.kak
rename to rc/base/autowrap.kak
diff --git a/rc/clojure.kak b/rc/base/clojure.kak
similarity index 100%
rename from rc/clojure.kak
rename to rc/base/clojure.kak
diff --git a/rc/css.kak b/rc/base/css.kak
similarity index 100%
rename from rc/css.kak
rename to rc/base/css.kak
diff --git a/rc/ctags.kak b/rc/base/ctags.kak
similarity index 100%
rename from rc/ctags.kak
rename to rc/base/ctags.kak
diff --git a/rc/dlang.kak b/rc/base/dlang.kak
similarity index 100%
rename from rc/dlang.kak
rename to rc/base/dlang.kak
diff --git a/rc/etc.kak b/rc/base/etc.kak
similarity index 100%
rename from rc/etc.kak
rename to rc/base/etc.kak
diff --git a/rc/fish.kak b/rc/base/fish.kak
similarity index 100%
rename from rc/fish.kak
rename to rc/base/fish.kak
diff --git a/rc/gas.kak b/rc/base/gas.kak
similarity index 100%
rename from rc/gas.kak
rename to rc/base/gas.kak
diff --git a/rc/git.kak b/rc/base/git.kak
similarity index 100%
rename from rc/git.kak
rename to rc/base/git.kak
diff --git a/rc/golang.kak b/rc/base/golang.kak
similarity index 100%
rename from rc/golang.kak
rename to rc/base/golang.kak
diff --git a/rc/haskell.kak b/rc/base/haskell.kak
similarity index 100%
rename from rc/haskell.kak
rename to rc/base/haskell.kak
diff --git a/rc/html.kak b/rc/base/html.kak
similarity index 100%
rename from rc/html.kak
rename to rc/base/html.kak
diff --git a/rc/ini.kak b/rc/base/ini.kak
similarity index 100%
rename from rc/ini.kak
rename to rc/base/ini.kak
diff --git a/rc/java.kak b/rc/base/java.kak
similarity index 100%
rename from rc/java.kak
rename to rc/base/java.kak
diff --git a/rc/javascript.kak b/rc/base/javascript.kak
similarity index 100%
rename from rc/javascript.kak
rename to rc/base/javascript.kak
diff --git a/rc/json.kak b/rc/base/json.kak
similarity index 100%
rename from rc/json.kak
rename to rc/base/json.kak
diff --git a/rc/julia.kak b/rc/base/julia.kak
similarity index 100%
rename from rc/julia.kak
rename to rc/base/julia.kak
diff --git a/rc/lisp.kak b/rc/base/lisp.kak
similarity index 100%
rename from rc/lisp.kak
rename to rc/base/lisp.kak
diff --git a/rc/lua.kak b/rc/base/lua.kak
similarity index 100%
rename from rc/lua.kak
rename to rc/base/lua.kak
diff --git a/rc/mail.kak b/rc/base/mail.kak
similarity index 100%
rename from rc/mail.kak
rename to rc/base/mail.kak
diff --git a/rc/makefile.kak b/rc/base/makefile.kak
similarity index 100%
rename from rc/makefile.kak
rename to rc/base/makefile.kak
diff --git a/rc/markdown.kak b/rc/base/markdown.kak
similarity index 100%
rename from rc/markdown.kak
rename to rc/base/markdown.kak
diff --git a/rc/mime.kak b/rc/base/mime.kak
similarity index 100%
rename from rc/mime.kak
rename to rc/base/mime.kak
diff --git a/rc/perl.kak b/rc/base/perl.kak
similarity index 100%
rename from rc/perl.kak
rename to rc/base/perl.kak
diff --git a/rc/ruby.kak b/rc/base/ruby.kak
similarity index 100%
rename from rc/ruby.kak
rename to rc/base/ruby.kak
diff --git a/rc/rust.kak b/rc/base/rust.kak
similarity index 100%
rename from rc/rust.kak
rename to rc/base/rust.kak
diff --git a/rc/scala.kak b/rc/base/scala.kak
similarity index 100%
rename from rc/scala.kak
rename to rc/base/scala.kak
diff --git a/rc/spell.kak b/rc/base/spell.kak
similarity index 100%
rename from rc/spell.kak
rename to rc/base/spell.kak
diff --git a/rc/yaml.kak b/rc/base/yaml.kak
similarity index 100%
rename from rc/yaml.kak
rename to rc/base/yaml.kak
diff --git a/rc/asciidoc.kak b/rc/core/asciidoc.kak
similarity index 100%
rename from rc/asciidoc.kak
rename to rc/core/asciidoc.kak
diff --git a/rc/c-family.kak b/rc/core/c-family.kak
similarity index 100%
rename from rc/c-family.kak
rename to rc/core/c-family.kak
diff --git a/rc/commenting.kak b/rc/core/commenting.kak
similarity index 100%
rename from rc/commenting.kak
rename to rc/core/commenting.kak
diff --git a/rc/diff.kak b/rc/core/diff.kak
similarity index 100%
rename from rc/diff.kak
rename to rc/core/diff.kak
diff --git a/rc/formatter.kak b/rc/core/formatter.kak
similarity index 100%
rename from rc/formatter.kak
rename to rc/core/formatter.kak
diff --git a/rc/grep.kak b/rc/core/grep.kak
similarity index 100%
rename from rc/grep.kak
rename to rc/core/grep.kak
diff --git a/rc/kakrc.kak b/rc/core/kakrc.kak
similarity index 100%
rename from rc/kakrc.kak
rename to rc/core/kakrc.kak
diff --git a/rc/make.kak b/rc/core/make.kak
similarity index 100%
rename from rc/make.kak
rename to rc/core/make.kak
diff --git a/rc/man.kak b/rc/core/man.kak
similarity index 100%
rename from rc/man.kak
rename to rc/core/man.kak
diff --git a/rc/python.kak b/rc/core/python.kak
similarity index 100%
rename from rc/python.kak
rename to rc/core/python.kak
diff --git a/rc/sh.kak b/rc/core/sh.kak
similarity index 100%
rename from rc/sh.kak
rename to rc/core/sh.kak
diff --git a/rc/tmux.kak b/rc/core/tmux.kak
similarity index 100%
rename from rc/tmux.kak
rename to rc/core/tmux.kak
diff --git a/rc/x11.kak b/rc/core/x11.kak
similarity index 100%
rename from rc/x11.kak
rename to rc/core/x11.kak
diff --git a/rc/autorestore.kak b/rc/extra/autorestore.kak
similarity index 100%
rename from rc/autorestore.kak
rename to rc/extra/autorestore.kak
diff --git a/rc/cabal.kak b/rc/extra/cabal.kak
similarity index 100%
rename from rc/cabal.kak
rename to rc/extra/cabal.kak
diff --git a/rc/clang.kak b/rc/extra/clang.kak
similarity index 100%
rename from rc/clang.kak
rename to rc/extra/clang.kak
diff --git a/rc/coffee.kak b/rc/extra/coffee.kak
similarity index 100%
rename from rc/coffee.kak
rename to rc/extra/coffee.kak
diff --git a/rc/cucumber.kak b/rc/extra/cucumber.kak
similarity index 100%
rename from rc/cucumber.kak
rename to rc/extra/cucumber.kak
diff --git a/rc/dockerfile.kak b/rc/extra/dockerfile.kak
similarity index 100%
rename from rc/dockerfile.kak
rename to rc/extra/dockerfile.kak
diff --git a/rc/exherbo.kak b/rc/extra/exherbo.kak
similarity index 100%
rename from rc/exherbo.kak
rename to rc/extra/exherbo.kak
diff --git a/rc/git-tools.kak b/rc/extra/git-tools.kak
similarity index 100%
rename from rc/git-tools.kak
rename to rc/extra/git-tools.kak
diff --git a/rc/grench.kak b/rc/extra/grench.kak
similarity index 100%
rename from rc/grench.kak
rename to rc/extra/grench.kak
diff --git a/rc/haml.kak b/rc/extra/haml.kak
similarity index 100%
rename from rc/haml.kak
rename to rc/extra/haml.kak
diff --git a/rc/jedi.kak b/rc/extra/jedi.kak
similarity index 100%
rename from rc/jedi.kak
rename to rc/extra/jedi.kak
diff --git a/rc/kickstart.kak b/rc/extra/kickstart.kak
similarity index 100%
rename from rc/kickstart.kak
rename to rc/extra/kickstart.kak
diff --git a/rc/ragel.kak b/rc/extra/ragel.kak
similarity index 100%
rename from rc/ragel.kak
rename to rc/extra/ragel.kak
diff --git a/rc/sass.kak b/rc/extra/sass.kak
similarity index 100%
rename from rc/sass.kak
rename to rc/extra/sass.kak
diff --git a/rc/scss.kak b/rc/extra/scss.kak
similarity index 100%
rename from rc/scss.kak
rename to rc/extra/scss.kak
diff --git a/rc/tmux-repl.kak b/rc/extra/tmux-repl.kak
similarity index 100%
rename from rc/tmux-repl.kak
rename to rc/extra/tmux-repl.kak
diff --git a/rc/tupfile.kak b/rc/extra/tupfile.kak
similarity index 100%
rename from rc/tupfile.kak
rename to rc/extra/tupfile.kak
diff --git a/rc/x11-repl.kak b/rc/extra/x11-repl.kak
similarity index 100%
rename from rc/x11-repl.kak
rename to rc/extra/x11-repl.kak