diff --git a/core/fg42.el b/lisp/fg42.el
similarity index 100%
rename from core/fg42.el
rename to lisp/fg42.el
diff --git a/core/fg42/build/core.el b/lisp/fg42/build/core.el
similarity index 100%
rename from core/fg42/build/core.el
rename to lisp/fg42/build/core.el
diff --git a/core/fg42/build/docs.el b/lisp/fg42/build/docs.el
similarity index 100%
rename from core/fg42/build/docs.el
rename to lisp/fg42/build/docs.el
diff --git a/core/fg42/build/ox-template.el b/lisp/fg42/build/ox-template.el
similarity index 100%
rename from core/fg42/build/ox-template.el
rename to lisp/fg42/build/ox-template.el
diff --git a/core/fg42/build/rss.el b/lisp/fg42/build/rss.el
similarity index 100%
rename from core/fg42/build/rss.el
rename to lisp/fg42/build/rss.el
diff --git a/core/fg42/build/utils.el b/lisp/fg42/build/utils.el
similarity index 100%
rename from core/fg42/build/utils.el
rename to lisp/fg42/build/utils.el
diff --git a/core/fg42/core.el b/lisp/fg42/core.el
similarity index 100%
rename from core/fg42/core.el
rename to lisp/fg42/core.el
diff --git a/core/fg42/cube.el b/lisp/fg42/cube.el
similarity index 100%
rename from core/fg42/cube.el
rename to lisp/fg42/cube.el
diff --git a/core/cubes/agda.el b/lisp/fg42/cubes/agda.el
similarity index 100%
rename from core/cubes/agda.el
rename to lisp/fg42/cubes/agda.el
diff --git a/core/cubes/all.el b/lisp/fg42/cubes/all.el
similarity index 100%
rename from core/cubes/all.el
rename to lisp/fg42/cubes/all.el
diff --git a/core/cubes/autocompletion.el b/lisp/fg42/cubes/autocompletion.el
similarity index 100%
rename from core/cubes/autocompletion.el
rename to lisp/fg42/cubes/autocompletion.el
diff --git a/core/cubes/bookmark.el b/lisp/fg42/cubes/bookmark.el
similarity index 100%
rename from core/cubes/bookmark.el
rename to lisp/fg42/cubes/bookmark.el
diff --git a/core/cubes/clojure.el b/lisp/fg42/cubes/clojure.el
similarity index 100%
rename from core/cubes/clojure.el
rename to lisp/fg42/cubes/clojure.el
diff --git a/core/cubes/clojure/core.el b/lisp/fg42/cubes/clojure/core.el
similarity index 100%
rename from core/cubes/clojure/core.el
rename to lisp/fg42/cubes/clojure/core.el
diff --git a/core/cubes/cpp.el b/lisp/fg42/cubes/cpp.el
similarity index 100%
rename from core/cubes/cpp.el
rename to lisp/fg42/cubes/cpp.el
diff --git a/core/cubes/editor.el b/lisp/fg42/cubes/editor.el
similarity index 100%
rename from core/cubes/editor.el
rename to lisp/fg42/cubes/editor.el
diff --git a/core/cubes/eldoc.el b/lisp/fg42/cubes/eldoc.el
similarity index 100%
rename from core/cubes/eldoc.el
rename to lisp/fg42/cubes/eldoc.el
diff --git a/core/cubes/elisp.el b/lisp/fg42/cubes/elisp.el
similarity index 100%
rename from core/cubes/elisp.el
rename to lisp/fg42/cubes/elisp.el
diff --git a/core/cubes/elisp/core.el b/lisp/fg42/cubes/elisp/core.el
similarity index 100%
rename from core/cubes/elisp/core.el
rename to lisp/fg42/cubes/elisp/core.el
diff --git a/core/cubes/fg42.el b/lisp/fg42/cubes/fg42.el
similarity index 100%
rename from core/cubes/fg42.el
rename to lisp/fg42/cubes/fg42.el
diff --git a/core/cubes/git.el b/lisp/fg42/cubes/git.el
similarity index 100%
rename from core/cubes/git.el
rename to lisp/fg42/cubes/git.el
diff --git a/core/cubes/godot3d.el b/lisp/fg42/cubes/godot3d.el
similarity index 100%
rename from core/cubes/godot3d.el
rename to lisp/fg42/cubes/godot3d.el
diff --git a/core/cubes/golang.el b/lisp/fg42/cubes/golang.el
similarity index 100%
rename from core/cubes/golang.el
rename to lisp/fg42/cubes/golang.el
diff --git a/core/cubes/golang/core.el b/lisp/fg42/cubes/golang/core.el
similarity index 100%
rename from core/cubes/golang/core.el
rename to lisp/fg42/cubes/golang/core.el
diff --git a/core/cubes/graph.el b/lisp/fg42/cubes/graph.el
similarity index 100%
rename from core/cubes/graph.el
rename to lisp/fg42/cubes/graph.el
diff --git a/core/cubes/groovy.el b/lisp/fg42/cubes/groovy.el
similarity index 100%
rename from core/cubes/groovy.el
rename to lisp/fg42/cubes/groovy.el
diff --git a/core/cubes/haml.el b/lisp/fg42/cubes/haml.el
similarity index 100%
rename from core/cubes/haml.el
rename to lisp/fg42/cubes/haml.el
diff --git a/core/cubes/icons.el b/lisp/fg42/cubes/icons.el
similarity index 100%
rename from core/cubes/icons.el
rename to lisp/fg42/cubes/icons.el
diff --git a/core/cubes/irc.el b/lisp/fg42/cubes/irc.el
similarity index 100%
rename from core/cubes/irc.el
rename to lisp/fg42/cubes/irc.el
diff --git a/core/cubes/irc/core.el b/lisp/fg42/cubes/irc/core.el
similarity index 100%
rename from core/cubes/irc/core.el
rename to lisp/fg42/cubes/irc/core.el
diff --git a/core/cubes/java.el b/lisp/fg42/cubes/java.el
similarity index 100%
rename from core/cubes/java.el
rename to lisp/fg42/cubes/java.el
diff --git a/core/cubes/julia.el b/lisp/fg42/cubes/julia.el
similarity index 100%
rename from core/cubes/julia.el
rename to lisp/fg42/cubes/julia.el
diff --git a/core/cubes/keyboard.el b/lisp/fg42/cubes/keyboard.el
similarity index 100%
rename from core/cubes/keyboard.el
rename to lisp/fg42/cubes/keyboard.el
diff --git a/core/cubes/langtool.el b/lisp/fg42/cubes/langtool.el
similarity index 100%
rename from core/cubes/langtool.el
rename to lisp/fg42/cubes/langtool.el
diff --git a/core/cubes/mastodon.el b/lisp/fg42/cubes/mastodon.el
similarity index 100%
rename from core/cubes/mastodon.el
rename to lisp/fg42/cubes/mastodon.el
diff --git a/core/cubes/meissa.el b/lisp/fg42/cubes/meissa.el
similarity index 100%
rename from core/cubes/meissa.el
rename to lisp/fg42/cubes/meissa.el
diff --git a/core/cubes/meson.el b/lisp/fg42/cubes/meson.el
similarity index 100%
rename from core/cubes/meson.el
rename to lisp/fg42/cubes/meson.el
diff --git a/core/cubes/modeline.el b/lisp/fg42/cubes/modeline.el
similarity index 100%
rename from core/cubes/modeline.el
rename to lisp/fg42/cubes/modeline.el
diff --git a/core/cubes/modeline/statusbar-default.el b/lisp/fg42/cubes/modeline/statusbar-default.el
similarity index 100%
rename from core/cubes/modeline/statusbar-default.el
rename to lisp/fg42/cubes/modeline/statusbar-default.el
diff --git a/core/cubes/nix.el b/lisp/fg42/cubes/nix.el
similarity index 100%
rename from core/cubes/nix.el
rename to lisp/fg42/cubes/nix.el
diff --git a/core/cubes/noether.el b/lisp/fg42/cubes/noether.el
similarity index 100%
rename from core/cubes/noether.el
rename to lisp/fg42/cubes/noether.el
diff --git a/core/cubes/notifications.el b/lisp/fg42/cubes/notifications.el
similarity index 100%
rename from core/cubes/notifications.el
rename to lisp/fg42/cubes/notifications.el
diff --git a/core/cubes/org.el b/lisp/fg42/cubes/org.el
similarity index 100%
rename from core/cubes/org.el
rename to lisp/fg42/cubes/org.el
diff --git a/core/cubes/project.el b/lisp/fg42/cubes/project.el
similarity index 100%
rename from core/cubes/project.el
rename to lisp/fg42/cubes/project.el
diff --git a/core/cubes/proof.el b/lisp/fg42/cubes/proof.el
similarity index 100%
rename from core/cubes/proof.el
rename to lisp/fg42/cubes/proof.el
diff --git a/core/cubes/python.el b/lisp/fg42/cubes/python.el
similarity index 100%
rename from core/cubes/python.el
rename to lisp/fg42/cubes/python.el
diff --git a/core/cubes/region-expansion.el b/lisp/fg42/cubes/region-expansion.el
similarity index 100%
rename from core/cubes/region-expansion.el
rename to lisp/fg42/cubes/region-expansion.el
diff --git a/core/cubes/rigel.el b/lisp/fg42/cubes/rigel.el
similarity index 100%
rename from core/cubes/rigel.el
rename to lisp/fg42/cubes/rigel.el
diff --git a/core/cubes/rigel/core.el b/lisp/fg42/cubes/rigel/core.el
similarity index 100%
rename from core/cubes/rigel/core.el
rename to lisp/fg42/cubes/rigel/core.el
diff --git a/core/cubes/rust.el b/lisp/fg42/cubes/rust.el
similarity index 100%
rename from core/cubes/rust.el
rename to lisp/fg42/cubes/rust.el
diff --git a/core/cubes/scheme.el b/lisp/fg42/cubes/scheme.el
similarity index 100%
rename from core/cubes/scheme.el
rename to lisp/fg42/cubes/scheme.el
diff --git a/core/cubes/snippets.el b/lisp/fg42/cubes/snippets.el
similarity index 100%
rename from core/cubes/snippets.el
rename to lisp/fg42/cubes/snippets.el
diff --git a/core/cubes/snippets/c++-mode/section b/lisp/fg42/cubes/snippets/c++-mode/section
similarity index 100%
rename from core/cubes/snippets/c++-mode/section
rename to lisp/fg42/cubes/snippets/c++-mode/section
diff --git a/core/cubes/snippets/org-mode/align b/lisp/fg42/cubes/snippets/org-mode/align
similarity index 100%
rename from core/cubes/snippets/org-mode/align
rename to lisp/fg42/cubes/snippets/org-mode/align
diff --git a/core/cubes/snippets/org-mode/begin b/lisp/fg42/cubes/snippets/org-mode/begin
similarity index 100%
rename from core/cubes/snippets/org-mode/begin
rename to lisp/fg42/cubes/snippets/org-mode/begin
diff --git a/core/cubes/snippets/org-mode/block b/lisp/fg42/cubes/snippets/org-mode/block
similarity index 100%
rename from core/cubes/snippets/org-mode/block
rename to lisp/fg42/cubes/snippets/org-mode/block
diff --git a/core/cubes/snippets/org-mode/equation b/lisp/fg42/cubes/snippets/org-mode/equation
similarity index 100%
rename from core/cubes/snippets/org-mode/equation
rename to lisp/fg42/cubes/snippets/org-mode/equation
diff --git a/core/cubes/snippets/org-mode/frac b/lisp/fg42/cubes/snippets/org-mode/frac
similarity index 100%
rename from core/cubes/snippets/org-mode/frac
rename to lisp/fg42/cubes/snippets/org-mode/frac
diff --git a/core/cubes/snippets/org-mode/infobox b/lisp/fg42/cubes/snippets/org-mode/infobox
similarity index 100%
rename from core/cubes/snippets/org-mode/infobox
rename to lisp/fg42/cubes/snippets/org-mode/infobox
diff --git a/core/cubes/snippets/org-mode/prod b/lisp/fg42/cubes/snippets/org-mode/prod
similarity index 100%
rename from core/cubes/snippets/org-mode/prod
rename to lisp/fg42/cubes/snippets/org-mode/prod
diff --git a/core/cubes/snippets/org-mode/sum b/lisp/fg42/cubes/snippets/org-mode/sum
similarity index 100%
rename from core/cubes/snippets/org-mode/sum
rename to lisp/fg42/cubes/snippets/org-mode/sum
diff --git a/core/cubes/snippets/org-mode/tw b/lisp/fg42/cubes/snippets/org-mode/tw
similarity index 100%
rename from core/cubes/snippets/org-mode/tw
rename to lisp/fg42/cubes/snippets/org-mode/tw
diff --git a/core/cubes/terminal.el b/lisp/fg42/cubes/terminal.el
similarity index 100%
rename from core/cubes/terminal.el
rename to lisp/fg42/cubes/terminal.el
diff --git a/core/cubes/terraform.el b/lisp/fg42/cubes/terraform.el
similarity index 100%
rename from core/cubes/terraform.el
rename to lisp/fg42/cubes/terraform.el
diff --git a/core/cubes/themes.el b/lisp/fg42/cubes/themes.el
similarity index 100%
rename from core/cubes/themes.el
rename to lisp/fg42/cubes/themes.el
diff --git a/core/cubes/wm.el b/lisp/fg42/cubes/wm.el
similarity index 100%
rename from core/cubes/wm.el
rename to lisp/fg42/cubes/wm.el
diff --git a/core/cubes/wm/core.el b/lisp/fg42/cubes/wm/core.el
similarity index 100%
rename from core/cubes/wm/core.el
rename to lisp/fg42/cubes/wm/core.el
diff --git a/core/cubes/zig.el b/lisp/fg42/cubes/zig.el
similarity index 100%
rename from core/cubes/zig.el
rename to lisp/fg42/cubes/zig.el
diff --git a/core/fg42/flags.el b/lisp/fg42/flags.el
similarity index 100%
rename from core/fg42/flags.el
rename to lisp/fg42/flags.el
diff --git a/core/fg42/lang-servers.el b/lisp/fg42/lang-servers.el
similarity index 100%
rename from core/fg42/lang-servers.el
rename to lisp/fg42/lang-servers.el
diff --git a/core/fg42/modeline.el b/lisp/fg42/modeline.el
similarity index 100%
rename from core/fg42/modeline.el
rename to lisp/fg42/modeline.el
diff --git a/core/fg42/project.el b/lisp/fg42/project.el
similarity index 100%
rename from core/fg42/project.el
rename to lisp/fg42/project.el
diff --git a/core/fg42/shell.el b/lisp/fg42/shell.el
similarity index 100%
rename from core/fg42/shell.el
rename to lisp/fg42/shell.el
diff --git a/core/fg42/status.el b/lisp/fg42/status.el
similarity index 100%
rename from core/fg42/status.el
rename to lisp/fg42/status.el
diff --git a/core/fg42/statusbar.el b/lisp/fg42/statusbar.el
similarity index 100%
rename from core/fg42/statusbar.el
rename to lisp/fg42/statusbar.el
diff --git a/core/fg42/themes.el b/lisp/fg42/themes.el
similarity index 100%
rename from core/fg42/themes.el
rename to lisp/fg42/themes.el
diff --git a/core/fg42/utils.el b/lisp/fg42/utils.el
similarity index 100%
rename from core/fg42/utils.el
rename to lisp/fg42/utils.el
diff --git a/core/fg42/x.el b/lisp/fg42/x.el
similarity index 100%
rename from core/fg42/x.el
rename to lisp/fg42/x.el
diff --git a/core/fpkg.el b/lisp/fpkg.el
similarity index 100%
rename from core/fpkg.el
rename to lisp/fpkg.el
diff --git a/core/fpkg/core.el b/lisp/fpkg/core.el
similarity index 100%
rename from core/fpkg/core.el
rename to lisp/fpkg/core.el
diff --git a/core/ob-graphviz-dot.el b/lisp/ob-graphviz-dot.el
similarity index 100%
rename from core/ob-graphviz-dot.el
rename to lisp/ob-graphviz-dot.el