diff --git a/.gitignore b/lang/.gitignore
similarity index 100%
rename from .gitignore
rename to lang/.gitignore
diff --git a/AGENTS.md b/lang/AGENTS.md
similarity index 100%
rename from AGENTS.md
rename to lang/AGENTS.md
diff --git a/BOOTSTRAP.md b/lang/BOOTSTRAP.md
similarity index 100%
rename from BOOTSTRAP.md
rename to lang/BOOTSTRAP.md
diff --git a/dist/elc-bootstrap.c b/lang/dist/elc-bootstrap.c
similarity index 100%
rename from dist/elc-bootstrap.c
rename to lang/dist/elc-bootstrap.c
diff --git a/dist/elc-new.c b/lang/dist/elc-new.c
similarity index 100%
rename from dist/elc-new.c
rename to lang/dist/elc-new.c
diff --git a/dist/platform/elb b/lang/dist/platform/elb
similarity index 100%
rename from dist/platform/elb
rename to lang/dist/platform/elb
diff --git a/dist/platform/elc b/lang/dist/platform/elc
similarity index 100%
rename from dist/platform/elc
rename to lang/dist/platform/elc
diff --git a/dist/platform/elc-asan b/lang/dist/platform/elc-asan
similarity index 100%
rename from dist/platform/elc-asan
rename to lang/dist/platform/elc-asan
diff --git a/dist/platform/elc-asan.dSYM/Contents/Info.plist b/lang/dist/platform/elc-asan.dSYM/Contents/Info.plist
similarity index 100%
rename from dist/platform/elc-asan.dSYM/Contents/Info.plist
rename to lang/dist/platform/elc-asan.dSYM/Contents/Info.plist
diff --git a/dist/platform/elc-asan.dSYM/Contents/Resources/DWARF/elc-asan b/lang/dist/platform/elc-asan.dSYM/Contents/Resources/DWARF/elc-asan
similarity index 100%
rename from dist/platform/elc-asan.dSYM/Contents/Resources/DWARF/elc-asan
rename to lang/dist/platform/elc-asan.dSYM/Contents/Resources/DWARF/elc-asan
diff --git a/dist/platform/elc-asan.dSYM/Contents/Resources/Relocations/aarch64/elc-asan.yml b/lang/dist/platform/elc-asan.dSYM/Contents/Resources/Relocations/aarch64/elc-asan.yml
similarity index 100%
rename from dist/platform/elc-asan.dSYM/Contents/Resources/Relocations/aarch64/elc-asan.yml
rename to lang/dist/platform/elc-asan.dSYM/Contents/Resources/Relocations/aarch64/elc-asan.yml
diff --git a/dist/platform/elc-darwin-arm64 b/lang/dist/platform/elc-darwin-arm64
similarity index 100%
rename from dist/platform/elc-darwin-arm64
rename to lang/dist/platform/elc-darwin-arm64
diff --git a/dist/platform/elc-new b/lang/dist/platform/elc-new
similarity index 100%
rename from dist/platform/elc-new
rename to lang/dist/platform/elc-new
diff --git a/dist/platform/elc.20260502-0130-self-host b/lang/dist/platform/elc.20260502-0130-self-host
similarity index 100%
rename from dist/platform/elc.20260502-0130-self-host
rename to lang/dist/platform/elc.20260502-0130-self-host
diff --git a/dist/platform/elc.20260502-1104-self-host b/lang/dist/platform/elc.20260502-1104-self-host
similarity index 100%
rename from dist/platform/elc.20260502-1104-self-host
rename to lang/dist/platform/elc.20260502-1104-self-host
diff --git a/dist/platform/elc.20260502-1231-self-host b/lang/dist/platform/elc.20260502-1231-self-host
similarity index 100%
rename from dist/platform/elc.20260502-1231-self-host
rename to lang/dist/platform/elc.20260502-1231-self-host
diff --git a/dist/platform/elc.20260502-1249-self-host b/lang/dist/platform/elc.20260502-1249-self-host
similarity index 100%
rename from dist/platform/elc.20260502-1249-self-host
rename to lang/dist/platform/elc.20260502-1249-self-host
diff --git a/dist/platform/elc.20260502-1256-self-host b/lang/dist/platform/elc.20260502-1256-self-host
similarity index 100%
rename from dist/platform/elc.20260502-1256-self-host
rename to lang/dist/platform/elc.20260502-1256-self-host
diff --git a/dist/platform/elc.20260502-1321-self-host b/lang/dist/platform/elc.20260502-1321-self-host
similarity index 100%
rename from dist/platform/elc.20260502-1321-self-host
rename to lang/dist/platform/elc.20260502-1321-self-host
diff --git a/dist/platform/elc.20260502-1916-self-host b/lang/dist/platform/elc.20260502-1916-self-host
similarity index 100%
rename from dist/platform/elc.20260502-1916-self-host
rename to lang/dist/platform/elc.20260502-1916-self-host
diff --git a/dist/platform/elc.20260503-1555-post-sprint b/lang/dist/platform/elc.20260503-1555-post-sprint
similarity index 100%
rename from dist/platform/elc.20260503-1555-post-sprint
rename to lang/dist/platform/elc.20260503-1555-post-sprint
diff --git a/dist/platform/elc.20260503-1603-post-lsp b/lang/dist/platform/elc.20260503-1603-post-lsp
similarity index 100%
rename from dist/platform/elc.20260503-1603-post-lsp
rename to lang/dist/platform/elc.20260503-1603-post-lsp
diff --git a/dist/platform/elc.c b/lang/dist/platform/elc.c
similarity index 100%
rename from dist/platform/elc.c
rename to lang/dist/platform/elc.c
diff --git a/dist/platform/elc.legacy b/lang/dist/platform/elc.legacy
similarity index 100%
rename from dist/platform/elc.legacy
rename to lang/dist/platform/elc.legacy
diff --git a/dist/platform/elc.prelaunch.bak b/lang/dist/platform/elc.prelaunch.bak
similarity index 100%
rename from dist/platform/elc.prelaunch.bak
rename to lang/dist/platform/elc.prelaunch.bak
diff --git a/dist/platform/elc.preselfhost b/lang/dist/platform/elc.preselfhost
similarity index 100%
rename from dist/platform/elc.preselfhost
rename to lang/dist/platform/elc.preselfhost
diff --git a/dist/platform/elc.prev5 b/lang/dist/platform/elc.prev5
similarity index 100%
rename from dist/platform/elc.prev5
rename to lang/dist/platform/elc.prev5
diff --git a/dist/platform/elc.prev6 b/lang/dist/platform/elc.prev6
similarity index 100%
rename from dist/platform/elc.prev6
rename to lang/dist/platform/elc.prev6
diff --git a/dist/platform/elc.prev7 b/lang/dist/platform/elc.prev7
similarity index 100%
rename from dist/platform/elc.prev7
rename to lang/dist/platform/elc.prev7
diff --git a/dist/platform/elc.prev8 b/lang/dist/platform/elc.prev8
similarity index 100%
rename from dist/platform/elc.prev8
rename to lang/dist/platform/elc.prev8
diff --git a/dist/platform/elc.prev9 b/lang/dist/platform/elc.prev9
similarity index 100%
rename from dist/platform/elc.prev9
rename to lang/dist/platform/elc.prev9
diff --git a/el-compiler/manifest.el b/lang/el-compiler/manifest.el
similarity index 100%
rename from el-compiler/manifest.el
rename to lang/el-compiler/manifest.el
diff --git a/el-compiler/runtime/el_runtime.c b/lang/el-compiler/runtime/el_runtime.c
similarity index 100%
rename from el-compiler/runtime/el_runtime.c
rename to lang/el-compiler/runtime/el_runtime.c
diff --git a/el-compiler/runtime/el_runtime.h b/lang/el-compiler/runtime/el_runtime.h
similarity index 100%
rename from el-compiler/runtime/el_runtime.h
rename to lang/el-compiler/runtime/el_runtime.h
diff --git a/el-compiler/runtime/el_runtime.js b/lang/el-compiler/runtime/el_runtime.js
similarity index 100%
rename from el-compiler/runtime/el_runtime.js
rename to lang/el-compiler/runtime/el_runtime.js
diff --git a/el-compiler/runtime/el_seed.c b/lang/el-compiler/runtime/el_seed.c
similarity index 100%
rename from el-compiler/runtime/el_seed.c
rename to lang/el-compiler/runtime/el_seed.c
diff --git a/el-compiler/runtime/el_seed.h b/lang/el-compiler/runtime/el_seed.h
similarity index 100%
rename from el-compiler/runtime/el_seed.h
rename to lang/el-compiler/runtime/el_seed.h
diff --git a/el-compiler/runtime/legacy/el_runtime.c b/lang/el-compiler/runtime/legacy/el_runtime.c
similarity index 100%
rename from el-compiler/runtime/legacy/el_runtime.c
rename to lang/el-compiler/runtime/legacy/el_runtime.c
diff --git a/el-compiler/runtime/legacy/el_runtime.h b/lang/el-compiler/runtime/legacy/el_runtime.h
similarity index 100%
rename from el-compiler/runtime/legacy/el_runtime.h
rename to lang/el-compiler/runtime/legacy/el_runtime.h
diff --git a/el-compiler/src/codegen-js.el b/lang/el-compiler/src/codegen-js.el
similarity index 100%
rename from el-compiler/src/codegen-js.el
rename to lang/el-compiler/src/codegen-js.el
diff --git a/el-compiler/src/codegen.el b/lang/el-compiler/src/codegen.el
similarity index 100%
rename from el-compiler/src/codegen.el
rename to lang/el-compiler/src/codegen.el
diff --git a/el-compiler/src/compiler.el b/lang/el-compiler/src/compiler.el
similarity index 100%
rename from el-compiler/src/compiler.el
rename to lang/el-compiler/src/compiler.el
diff --git a/el-compiler/src/lexer.el b/lang/el-compiler/src/lexer.el
similarity index 100%
rename from el-compiler/src/lexer.el
rename to lang/el-compiler/src/lexer.el
diff --git a/el-compiler/src/parser.el b/lang/el-compiler/src/parser.el
similarity index 100%
rename from el-compiler/src/parser.el
rename to lang/el-compiler/src/parser.el
diff --git a/elb.el b/lang/elb.el
similarity index 100%
rename from elb.el
rename to lang/elb.el
diff --git a/elc-cli.el b/lang/elc-cli.el
similarity index 100%
rename from elc-cli.el
rename to lang/elc-cli.el
diff --git a/elc-combined.el b/lang/elc-combined.el
similarity index 100%
rename from elc-combined.el
rename to lang/elc-combined.el
diff --git a/examples/activate.el b/lang/examples/activate.el
similarity index 100%
rename from examples/activate.el
rename to lang/examples/activate.el
diff --git a/examples/browser-auth.el b/lang/examples/browser-auth.el
similarity index 100%
rename from examples/browser-auth.el
rename to lang/examples/browser-auth.el
diff --git a/examples/browser-counter.el b/lang/examples/browser-counter.el
similarity index 100%
rename from examples/browser-counter.el
rename to lang/examples/browser-counter.el
diff --git a/examples/hello-project/src/tests.el b/lang/examples/hello-project/src/tests.el
similarity index 100%
rename from examples/hello-project/src/tests.el
rename to lang/examples/hello-project/src/tests.el
diff --git a/examples/hello.el b/lang/examples/hello.el
similarity index 100%
rename from examples/hello.el
rename to lang/examples/hello.el
diff --git a/examples/html-page.el b/lang/examples/html-page.el
similarity index 100%
rename from examples/html-page.el
rename to lang/examples/html-page.el
diff --git a/examples/http-status-envelope.el b/lang/examples/http-status-envelope.el
similarity index 100%
rename from examples/http-status-envelope.el
rename to lang/examples/http-status-envelope.el
diff --git a/examples/json-array-traversal.el b/lang/examples/json-array-traversal.el
similarity index 100%
rename from examples/json-array-traversal.el
rename to lang/examples/json-array-traversal.el
diff --git a/examples/reassign-in-if.el b/lang/examples/reassign-in-if.el
similarity index 100%
rename from examples/reassign-in-if.el
rename to lang/examples/reassign-in-if.el
diff --git a/examples/types.el b/lang/examples/types.el
similarity index 100%
rename from examples/types.el
rename to lang/examples/types.el
diff --git a/install.sh b/lang/install.sh
similarity index 100%
rename from install.sh
rename to lang/install.sh
diff --git a/releases/v1.0.0-20260501/RELEASE.md b/lang/releases/v1.0.0-20260501/RELEASE.md
similarity index 100%
rename from releases/v1.0.0-20260501/RELEASE.md
rename to lang/releases/v1.0.0-20260501/RELEASE.md
diff --git a/releases/v1.0.0-20260501/el_runtime.c b/lang/releases/v1.0.0-20260501/el_runtime.c
similarity index 100%
rename from releases/v1.0.0-20260501/el_runtime.c
rename to lang/releases/v1.0.0-20260501/el_runtime.c
diff --git a/releases/v1.0.0-20260501/el_runtime.h b/lang/releases/v1.0.0-20260501/el_runtime.h
similarity index 100%
rename from releases/v1.0.0-20260501/el_runtime.h
rename to lang/releases/v1.0.0-20260501/el_runtime.h
diff --git a/runtime/channel.el b/lang/runtime/channel.el
similarity index 100%
rename from runtime/channel.el
rename to lang/runtime/channel.el
diff --git a/runtime/engram.el b/lang/runtime/engram.el
similarity index 100%
rename from runtime/engram.el
rename to lang/runtime/engram.el
diff --git a/runtime/env.el b/lang/runtime/env.el
similarity index 100%
rename from runtime/env.el
rename to lang/runtime/env.el
diff --git a/runtime/exec.el b/lang/runtime/exec.el
similarity index 100%
rename from runtime/exec.el
rename to lang/runtime/exec.el
diff --git a/runtime/fs.el b/lang/runtime/fs.el
similarity index 100%
rename from runtime/fs.el
rename to lang/runtime/fs.el
diff --git a/runtime/http.el b/lang/runtime/http.el
similarity index 100%
rename from runtime/http.el
rename to lang/runtime/http.el
diff --git a/runtime/json.el b/lang/runtime/json.el
similarity index 100%
rename from runtime/json.el
rename to lang/runtime/json.el
diff --git a/runtime/manifest.el b/lang/runtime/manifest.el
similarity index 100%
rename from runtime/manifest.el
rename to lang/runtime/manifest.el
diff --git a/runtime/math.el b/lang/runtime/math.el
similarity index 100%
rename from runtime/math.el
rename to lang/runtime/math.el
diff --git a/runtime/state.el b/lang/runtime/state.el
similarity index 100%
rename from runtime/state.el
rename to lang/runtime/state.el
diff --git a/runtime/stdlib.el b/lang/runtime/stdlib.el
similarity index 100%
rename from runtime/stdlib.el
rename to lang/runtime/stdlib.el
diff --git a/runtime/string.el b/lang/runtime/string.el
similarity index 100%
rename from runtime/string.el
rename to lang/runtime/string.el
diff --git a/runtime/test.el b/lang/runtime/test.el
similarity index 100%
rename from runtime/test.el
rename to lang/runtime/test.el
diff --git a/runtime/thread.el b/lang/runtime/thread.el
similarity index 100%
rename from runtime/thread.el
rename to lang/runtime/thread.el
diff --git a/runtime/time.el b/lang/runtime/time.el
similarity index 100%
rename from runtime/time.el
rename to lang/runtime/time.el
diff --git a/spec/codegen-js.md b/lang/spec/codegen-js.md
similarity index 100%
rename from spec/codegen-js.md
rename to lang/spec/codegen-js.md
diff --git a/spec/language.md b/lang/spec/language.md
similarity index 100%
rename from spec/language.md
rename to lang/spec/language.md
diff --git a/tests/calendar/examples/cross-calendar-comparison.el b/lang/tests/calendar/examples/cross-calendar-comparison.el
similarity index 100%
rename from tests/calendar/examples/cross-calendar-comparison.el
rename to lang/tests/calendar/examples/cross-calendar-comparison.el
diff --git a/tests/calendar/examples/cycle-300yr.el b/lang/tests/calendar/examples/cycle-300yr.el
similarity index 100%
rename from tests/calendar/examples/cycle-300yr.el
rename to lang/tests/calendar/examples/cycle-300yr.el
diff --git a/tests/calendar/examples/cycle-30hr.el b/lang/tests/calendar/examples/cycle-30hr.el
similarity index 100%
rename from tests/calendar/examples/cycle-30hr.el
rename to lang/tests/calendar/examples/cycle-30hr.el
diff --git a/tests/calendar/examples/dst-spring-forward.el b/lang/tests/calendar/examples/dst-spring-forward.el
similarity index 100%
rename from tests/calendar/examples/dst-spring-forward.el
rename to lang/tests/calendar/examples/dst-spring-forward.el
diff --git a/tests/calendar/examples/earth-zone.el b/lang/tests/calendar/examples/earth-zone.el
similarity index 100%
rename from tests/calendar/examples/earth-zone.el
rename to lang/tests/calendar/examples/earth-zone.el
diff --git a/tests/calendar/examples/local-date-arithmetic.el b/lang/tests/calendar/examples/local-date-arithmetic.el
similarity index 100%
rename from tests/calendar/examples/local-date-arithmetic.el
rename to lang/tests/calendar/examples/local-date-arithmetic.el
diff --git a/tests/calendar/examples/mars-calendar.el b/lang/tests/calendar/examples/mars-calendar.el
similarity index 100%
rename from tests/calendar/examples/mars-calendar.el
rename to lang/tests/calendar/examples/mars-calendar.el
diff --git a/tests/calendar/examples/no-cycle.el b/lang/tests/calendar/examples/no-cycle.el
similarity index 100%
rename from tests/calendar/examples/no-cycle.el
rename to lang/tests/calendar/examples/no-cycle.el
diff --git a/tests/calendar/examples/rhythm-cycle-30hr.el b/lang/tests/calendar/examples/rhythm-cycle-30hr.el
similarity index 100%
rename from tests/calendar/examples/rhythm-cycle-30hr.el
rename to lang/tests/calendar/examples/rhythm-cycle-30hr.el
diff --git a/tests/calendar/examples/rhythm-grounding.el b/lang/tests/calendar/examples/rhythm-grounding.el
similarity index 100%
rename from tests/calendar/examples/rhythm-grounding.el
rename to lang/tests/calendar/examples/rhythm-grounding.el
diff --git a/tests/calendar/run.sh b/lang/tests/calendar/run.sh
similarity index 100%
rename from tests/calendar/run.sh
rename to lang/tests/calendar/run.sh
diff --git a/tests/calendar/runner.el b/lang/tests/calendar/runner.el
similarity index 100%
rename from tests/calendar/runner.el
rename to lang/tests/calendar/runner.el
diff --git a/tests/html_sanitizer/cases.json b/lang/tests/html_sanitizer/cases.json
similarity index 100%
rename from tests/html_sanitizer/cases.json
rename to lang/tests/html_sanitizer/cases.json
diff --git a/tests/html_sanitizer/run.sh b/lang/tests/html_sanitizer/run.sh
similarity index 100%
rename from tests/html_sanitizer/run.sh
rename to lang/tests/html_sanitizer/run.sh
diff --git a/tests/html_sanitizer/runner.el b/lang/tests/html_sanitizer/runner.el
similarity index 100%
rename from tests/html_sanitizer/runner.el
rename to lang/tests/html_sanitizer/runner.el
diff --git a/tests/native/test_core.el b/lang/tests/native/test_core.el
similarity index 100%
rename from tests/native/test_core.el
rename to lang/tests/native/test_core.el
diff --git a/tests/native/test_env.el b/lang/tests/native/test_env.el
similarity index 100%
rename from tests/native/test_env.el
rename to lang/tests/native/test_env.el
diff --git a/tests/native/test_fs.el b/lang/tests/native/test_fs.el
similarity index 100%
rename from tests/native/test_fs.el
rename to lang/tests/native/test_fs.el
diff --git a/tests/native/test_json.el b/lang/tests/native/test_json.el
similarity index 100%
rename from tests/native/test_json.el
rename to lang/tests/native/test_json.el
diff --git a/tests/native/test_math.el b/lang/tests/native/test_math.el
similarity index 100%
rename from tests/native/test_math.el
rename to lang/tests/native/test_math.el
diff --git a/tests/native/test_state.el b/lang/tests/native/test_state.el
similarity index 100%
rename from tests/native/test_state.el
rename to lang/tests/native/test_state.el
diff --git a/tests/native/test_string.el b/lang/tests/native/test_string.el
similarity index 100%
rename from tests/native/test_string.el
rename to lang/tests/native/test_string.el
diff --git a/tests/native/test_text.el b/lang/tests/native/test_text.el
similarity index 100%
rename from tests/native/test_text.el
rename to lang/tests/native/test_text.el
diff --git a/tests/native/test_time.el b/lang/tests/native/test_time.el
similarity index 100%
rename from tests/native/test_time.el
rename to lang/tests/native/test_time.el
diff --git a/tests/runtime/string_test.el b/lang/tests/runtime/string_test.el
similarity index 100%
rename from tests/runtime/string_test.el
rename to lang/tests/runtime/string_test.el
diff --git a/tests/suite/infra.c b/lang/tests/suite/infra.c
similarity index 100%
rename from tests/suite/infra.c
rename to lang/tests/suite/infra.c
diff --git a/tests/suite/manifest.el b/lang/tests/suite/manifest.el
similarity index 100%
rename from tests/suite/manifest.el
rename to lang/tests/suite/manifest.el
diff --git a/tests/suite/src/test_all.el b/lang/tests/suite/src/test_all.el
similarity index 100%
rename from tests/suite/src/test_all.el
rename to lang/tests/suite/src/test_all.el
diff --git a/tests/suite/src/test_collections.el b/lang/tests/suite/src/test_collections.el
similarity index 100%
rename from tests/suite/src/test_collections.el
rename to lang/tests/suite/src/test_collections.el
diff --git a/tests/suite/src/test_fs.el b/lang/tests/suite/src/test_fs.el
similarity index 100%
rename from tests/suite/src/test_fs.el
rename to lang/tests/suite/src/test_fs.el
diff --git a/tests/suite/src/test_json.el b/lang/tests/suite/src/test_json.el
similarity index 100%
rename from tests/suite/src/test_json.el
rename to lang/tests/suite/src/test_json.el
diff --git a/tests/suite/src/test_math.el b/lang/tests/suite/src/test_math.el
similarity index 100%
rename from tests/suite/src/test_math.el
rename to lang/tests/suite/src/test_math.el
diff --git a/tests/suite/src/test_state.el b/lang/tests/suite/src/test_state.el
similarity index 100%
rename from tests/suite/src/test_state.el
rename to lang/tests/suite/src/test_state.el
diff --git a/tests/suite/src/test_string.el b/lang/tests/suite/src/test_string.el
similarity index 100%
rename from tests/suite/src/test_string.el
rename to lang/tests/suite/src/test_string.el
diff --git a/tests/suite/src/test_time.el b/lang/tests/suite/src/test_time.el
similarity index 100%
rename from tests/suite/src/test_time.el
rename to lang/tests/suite/src/test_time.el
diff --git a/tests/text/examples/char-classes.el b/lang/tests/text/examples/char-classes.el
similarity index 100%
rename from tests/text/examples/char-classes.el
rename to lang/tests/text/examples/char-classes.el
diff --git a/tests/text/examples/count-lines-words-letters.el b/lang/tests/text/examples/count-lines-words-letters.el
similarity index 100%
rename from tests/text/examples/count-lines-words-letters.el
rename to lang/tests/text/examples/count-lines-words-letters.el
diff --git a/tests/text/examples/count-overlap-skip.el b/lang/tests/text/examples/count-overlap-skip.el
similarity index 100%
rename from tests/text/examples/count-overlap-skip.el
rename to lang/tests/text/examples/count-overlap-skip.el
diff --git a/tests/text/examples/count-substring.el b/lang/tests/text/examples/count-substring.el
similarity index 100%
rename from tests/text/examples/count-substring.el
rename to lang/tests/text/examples/count-substring.el
diff --git a/tests/text/examples/index-of-all.el b/lang/tests/text/examples/index-of-all.el
similarity index 100%
rename from tests/text/examples/index-of-all.el
rename to lang/tests/text/examples/index-of-all.el
diff --git a/tests/text/examples/join.el b/lang/tests/text/examples/join.el
similarity index 100%
rename from tests/text/examples/join.el
rename to lang/tests/text/examples/join.el
diff --git a/tests/text/examples/split-lines.el b/lang/tests/text/examples/split-lines.el
similarity index 100%
rename from tests/text/examples/split-lines.el
rename to lang/tests/text/examples/split-lines.el
diff --git a/tests/text/examples/transform-suite.el b/lang/tests/text/examples/transform-suite.el
similarity index 100%
rename from tests/text/examples/transform-suite.el
rename to lang/tests/text/examples/transform-suite.el
diff --git a/tests/text/run.sh b/lang/tests/text/run.sh
similarity index 100%
rename from tests/text/run.sh
rename to lang/tests/text/run.sh
diff --git a/tests/text/runner.el b/lang/tests/text/runner.el
similarity index 100%
rename from tests/text/runner.el
rename to lang/tests/text/runner.el
diff --git a/tests/time/examples/sleep-typed.el b/lang/tests/time/examples/sleep-typed.el
similarity index 100%
rename from tests/time/examples/sleep-typed.el
rename to lang/tests/time/examples/sleep-typed.el
diff --git a/tests/time/examples/time-arithmetic.el b/lang/tests/time/examples/time-arithmetic.el
similarity index 100%
rename from tests/time/examples/time-arithmetic.el
rename to lang/tests/time/examples/time-arithmetic.el
diff --git a/tests/time/examples/time-comparison.el b/lang/tests/time/examples/time-comparison.el
similarity index 100%
rename from tests/time/examples/time-comparison.el
rename to lang/tests/time/examples/time-comparison.el
diff --git a/tests/time/examples/time-literals.el b/lang/tests/time/examples/time-literals.el
similarity index 100%
rename from tests/time/examples/time-literals.el
rename to lang/tests/time/examples/time-literals.el
diff --git a/tests/time/examples/time-typeerror.el b/lang/tests/time/examples/time-typeerror.el
similarity index 100%
rename from tests/time/examples/time-typeerror.el
rename to lang/tests/time/examples/time-typeerror.el
diff --git a/tests/time/examples/ttl-cache.el b/lang/tests/time/examples/ttl-cache.el
similarity index 100%
rename from tests/time/examples/ttl-cache.el
rename to lang/tests/time/examples/ttl-cache.el
diff --git a/tests/time/run.sh b/lang/tests/time/run.sh
similarity index 100%
rename from tests/time/run.sh
rename to lang/tests/time/run.sh
diff --git a/tests/time/runner.el b/lang/tests/time/runner.el
similarity index 100%
rename from tests/time/runner.el
rename to lang/tests/time/runner.el
diff --git a/tools/install.sh b/lang/tools/install.sh
similarity index 100%
rename from tools/install.sh
rename to lang/tools/install.sh
diff --git a/tools/lsp/README.md b/lang/tools/lsp/README.md
similarity index 100%
rename from tools/lsp/README.md
rename to lang/tools/lsp/README.md
diff --git a/tools/lsp/dist/el-lsp b/lang/tools/lsp/dist/el-lsp
similarity index 100%
rename from tools/lsp/dist/el-lsp
rename to lang/tools/lsp/dist/el-lsp
diff --git a/tools/lsp/dist/el-lsp.c b/lang/tools/lsp/dist/el-lsp.c
similarity index 100%
rename from tools/lsp/dist/el-lsp.c
rename to lang/tools/lsp/dist/el-lsp.c
diff --git a/tools/lsp/el-lsp.el b/lang/tools/lsp/el-lsp.el
similarity index 100%
rename from tools/lsp/el-lsp.el
rename to lang/tools/lsp/el-lsp.el
diff --git a/tools/lsp/vscode-extension/.vscode/launch.json b/lang/tools/lsp/vscode-extension/.vscode/launch.json
similarity index 100%
rename from tools/lsp/vscode-extension/.vscode/launch.json
rename to lang/tools/lsp/vscode-extension/.vscode/launch.json
diff --git a/tools/lsp/vscode-extension/.vscode/tasks.json b/lang/tools/lsp/vscode-extension/.vscode/tasks.json
similarity index 100%
rename from tools/lsp/vscode-extension/.vscode/tasks.json
rename to lang/tools/lsp/vscode-extension/.vscode/tasks.json
diff --git a/tools/lsp/vscode-extension/extension.js b/lang/tools/lsp/vscode-extension/extension.js
similarity index 100%
rename from tools/lsp/vscode-extension/extension.js
rename to lang/tools/lsp/vscode-extension/extension.js
diff --git a/tools/lsp/vscode-extension/language-configuration.json b/lang/tools/lsp/vscode-extension/language-configuration.json
similarity index 100%
rename from tools/lsp/vscode-extension/language-configuration.json
rename to lang/tools/lsp/vscode-extension/language-configuration.json
diff --git a/tools/lsp/vscode-extension/package.json b/lang/tools/lsp/vscode-extension/package.json
similarity index 100%
rename from tools/lsp/vscode-extension/package.json
rename to lang/tools/lsp/vscode-extension/package.json
diff --git a/tools/lsp/vscode-extension/syntaxes/el.tmGrammar.json b/lang/tools/lsp/vscode-extension/syntaxes/el.tmGrammar.json
similarity index 100%
rename from tools/lsp/vscode-extension/syntaxes/el.tmGrammar.json
rename to lang/tools/lsp/vscode-extension/syntaxes/el.tmGrammar.json
diff --git a/tools/new-project.sh b/lang/tools/new-project.sh
similarity index 100%
rename from tools/new-project.sh
rename to lang/tools/new-project.sh