From 29c0bd0319ab578575a941e89505b91a298819b6 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Wed, 9 Oct 2024 18:57:49 -0400
Subject: [PATCH] tests: split tests into spec/lang, spec/api, spec/cli

---
 Makefile                                                    | 5 +++--
 spec/cli/check_spec.lua                                     | 2 +-
 spec/cli/feat_spec.lua                                      | 2 +-
 spec/cli/gen_spec.lua                                       | 2 +-
 spec/cli/global_env_def_spec.lua                            | 2 +-
 spec/cli/include_dir_spec.lua                               | 2 +-
 spec/cli/output_spec.lua                                    | 2 +-
 spec/cli/quiet_spec.lua                                     | 2 +-
 spec/cli/run_spec.lua                                       | 2 +-
 spec/cli/types_spec.lua                                     | 2 +-
 spec/cli/warning_spec.lua                                   | 4 ++--
 spec/{ => lang}/arguments/array_spec.lua                    | 0
 spec/{ => lang}/arguments/boolean_spec.lua                  | 0
 spec/{ => lang}/arguments/enum_spec.lua                     | 0
 spec/{ => lang}/arguments/record_spec.lua                   | 0
 spec/{ => lang}/arguments/union_spec.lua                    | 0
 spec/{ => lang}/assignment/to_any_spec.lua                  | 0
 spec/{ => lang}/assignment/to_array_of_maps_spec.lua        | 0
 spec/{ => lang}/assignment/to_array_spec.lua                | 0
 spec/{ => lang}/assignment/to_const_spec.lua                | 0
 spec/{ => lang}/assignment/to_enum_spec.lua                 | 0
 spec/{ => lang}/assignment/to_function_spec.lua             | 0
 spec/{ => lang}/assignment/to_generic_function_spec.lua     | 0
 spec/{ => lang}/assignment/to_interface_spec.lua            | 0
 spec/{ => lang}/assignment/to_map_spec.lua                  | 0
 spec/{ => lang}/assignment/to_multiple_variables_spec.lua   | 0
 spec/{ => lang}/assignment/to_nominal_arrayrecord_spec.lua  | 0
 spec/{ => lang}/assignment/to_nominal_record_field_spec.lua | 0
 spec/{ => lang}/assignment/to_nominal_record_spec.lua       | 0
 spec/{ => lang}/assignment/to_self_record_field_spec.lua    | 0
 spec/{ => lang}/assignment/to_tuple_spec.lua                | 0
 spec/{ => lang}/assignment/to_type_spec.lua                 | 0
 spec/{ => lang}/assignment/to_union_spec.lua                | 0
 spec/{ => lang}/call/function_spec.lua                      | 0
 spec/{ => lang}/call/generic_function_spec.lua              | 0
 spec/{ => lang}/call/record_method_spec.lua                 | 0
 spec/{ => lang}/call/string_method_spec.lua                 | 0
 spec/{ => lang}/call/syntax_errors_spec.lua                 | 0
 spec/{ => lang}/code_gen/global_type_spec.lua               | 0
 spec/{ => lang}/code_gen/linebreak_spec.lua                 | 0
 spec/{ => lang}/code_gen/local_type_spec.lua                | 0
 spec/{ => lang}/code_gen/macroexp_spec.lua                  | 0
 spec/{ => lang}/code_gen/string_compatability_spec.lua      | 0
 spec/{ => lang}/compat/lua_versions_spec.lua                | 0
 spec/{ => lang}/config/errors.lua                           | 0
 spec/{ => lang}/declaration/array_spec.lua                  | 0
 spec/{ => lang}/declaration/enum_spec.lua                   | 0
 spec/{ => lang}/declaration/functiontype_spec.lua           | 0
 spec/{ => lang}/declaration/global_function_spec.lua        | 0
 spec/{ => lang}/declaration/global_spec.lua                 | 0
 spec/{ => lang}/declaration/local_function_spec.lua         | 0
 spec/{ => lang}/declaration/local_spec.lua                  | 0
 spec/{ => lang}/declaration/local_type_spec.lua             | 0
 spec/{ => lang}/declaration/macroexp_spec.lua               | 0
 spec/{ => lang}/declaration/map_spec.lua                    | 0
 spec/{ => lang}/declaration/metatable_spec.lua              | 0
 spec/{ => lang}/declaration/nominal_spec.lua                | 0
 spec/{ => lang}/declaration/record_function_spec.lua        | 0
 spec/{ => lang}/declaration/record_method_spec.lua          | 0
 spec/{ => lang}/declaration/record_spec.lua                 | 0
 spec/{ => lang}/declaration/tuple_spec.lua                  | 0
 spec/{ => lang}/declaration/union_spec.lua                  | 0
 spec/{ => lang}/error_reporting/module_error_spec.lua       | 0
 spec/{ => lang}/error_reporting/syntax_error_spec.lua       | 0
 spec/{ => lang}/error_reporting/typecheck_error_spec.lua    | 0
 spec/{ => lang}/error_reporting/warning_spec.lua            | 0
 spec/{ => lang}/inference/emptytable_spec.lua               | 0
 spec/{ => lang}/inference/function_result_spec.lua          | 0
 spec/{ => lang}/inference/if_spec.lua                       | 0
 spec/{ => lang}/inference/table_literal_spec.lua            | 0
 spec/{ => lang}/lax/lax_spec.lua                            | 0
 spec/{ => lang}/lexer/comments_spec.lua                     | 0
 spec/{ => lang}/lexer/doublequote_string_spec.lua           | 0
 spec/{ => lang}/lexer/eof_spec.lua                          | 0
 spec/{ => lang}/lexer/hashbang_spec.lua                     | 0
 spec/{ => lang}/lexer/literals_spec.lua                     | 0
 spec/{ => lang}/lexer/long_comment_spec.lua                 | 0
 spec/{ => lang}/lexer/long_string_and_comment_spec.lua      | 0
 spec/{ => lang}/lexer/long_string_spec.lua                  | 0
 spec/{ => lang}/lexer/semicolon_spec.lua                    | 0
 spec/{ => lang}/lexer/singlequote_string_spec.lua           | 0
 spec/{ => lang}/literals/boolean_spec.lua                   | 0
 spec/{ => lang}/loader/loader_spec.lua                      | 0
 spec/{ => lang}/macroexp/is_spec.lua                        | 0
 spec/{ => lang}/metamethods/add_spec.lua                    | 0
 spec/{ => lang}/metamethods/bnot_spec.lua                   | 0
 spec/{ => lang}/metamethods/call_spec.lua                   | 0
 spec/{ => lang}/metamethods/idiv_spec.lua                   | 0
 spec/{ => lang}/metamethods/index_spec.lua                  | 0
 spec/{ => lang}/metamethods/le_spec.lua                     | 0
 spec/{ => lang}/metamethods/len_spec.lua                    | 0
 spec/{ => lang}/metamethods/lt_spec.lua                     | 0
 spec/{ => lang}/metamethods/tostring_spec.lua               | 0
 spec/{ => lang}/metamethods/unm_spec.lua                    | 0
 spec/{ => lang}/operator/as_spec.lua                        | 0
 spec/{ => lang}/operator/bit_spec.lua                       | 0
 spec/{ => lang}/operator/dot_spec.lua                       | 0
 spec/{ => lang}/operator/eq_spec.lua                        | 0
 spec/{ => lang}/operator/idiv_spec.lua                      | 0
 spec/{ => lang}/operator/index_spec.lua                     | 0
 spec/{ => lang}/operator/is_spec.lua                        | 0
 spec/{ => lang}/operator/len_spec.lua                       | 0
 spec/{ => lang}/operator/lt_spec.lua                        | 0
 spec/{ => lang}/operator/mod_spec.lua                       | 0
 spec/{ => lang}/operator/not_spec.lua                       | 0
 spec/{ => lang}/operator/or_spec.lua                        | 0
 spec/{ => lang}/operator/paren_spec.lua                     | 0
 spec/{ => lang}/operator/plus_spec.lua                      | 0
 spec/{ => lang}/operator/pow_spec.lua                       | 0
 spec/{ => lang}/parser/parser_error_spec.lua                | 0
 spec/{ => lang}/parser/parser_spec.lua                      | 0
 spec/{ => lang}/parser/syntax_errors_spec.lua               | 0
 spec/{ => lang}/pragma/arity_spec.lua                       | 0
 spec/{ => lang}/pragma/invalid_spec.lua                     | 0
 spec/{ => lang}/preload/preload_spec.lua                    | 0
 spec/{ => lang}/statement/forin_spec.lua                    | 0
 spec/{ => lang}/statement/goto_spec.lua                     | 0
 spec/{ => lang}/statement/if_spec.lua                       | 0
 spec/{ => lang}/statement/repeat_spec.lua                   | 0
 spec/{ => lang}/statement/return_spec.lua                   | 0
 spec/{ => lang}/statement/while_spec.lua                    | 0
 spec/{ => lang}/stdlib/assert_spec.lua                      | 0
 spec/{ => lang}/stdlib/coroutine_spec.lua                   | 0
 spec/{ => lang}/stdlib/io_spec.lua                          | 0
 spec/{ => lang}/stdlib/ipairs_spec.lua                      | 0
 spec/{ => lang}/stdlib/math_spec.lua                        | 0
 spec/{ => lang}/stdlib/next_spec.lua                        | 0
 spec/{ => lang}/stdlib/os_spec.lua                          | 0
 spec/{ => lang}/stdlib/pcall_spec.lua                       | 0
 spec/{ => lang}/stdlib/rawget_spec.lua                      | 0
 spec/{ => lang}/stdlib/require_spec.lua                     | 0
 spec/{ => lang}/stdlib/select_spec.lua                      | 0
 spec/{ => lang}/stdlib/setmetatable_spec.lua                | 0
 spec/{ => lang}/stdlib/string_spec.lua                      | 0
 spec/{ => lang}/stdlib/table_spec.lua                       | 0
 spec/{ => lang}/stdlib/xpcall_spec.lua                      | 0
 spec/{ => lang}/subtyping/any_spec.lua                      | 0
 spec/{ => lang}/subtyping/integer_spec.lua                  | 0
 spec/{ => lang}/subtyping/interface_spec.lua                | 0
 spec/{ => lang}/subtyping/nil_spec.lua                      | 0
 spec/{ => lang}/subtyping/number_spec.lua                   | 0
 spec/{ => lang}/subtyping/poly_spec.lua                     | 0
 spec/{ => lang}/subtyping/record_spec.lua                   | 0
 spec/{ => lang}/subtyping/self_spec.lua                     | 0
 spec/{ => lang}/subtyping/table_spec.lua                    | 0
 spec/{ => lang}/subtyping/typealias_spec.lua                | 0
 spec/{ => lang}/subtyping/union_spec.lua                    | 0
 spec/{ => lang}/varargs/type_base_spec.lua                  | 0
 spec/{ => lang}/varargs/typed_varargs_spec.lua              | 0
 spec/{ => lang}/varargs/vararg_scope_spec.lua               | 0
 150 files changed, 14 insertions(+), 13 deletions(-)
 rename spec/{ => lang}/arguments/array_spec.lua (100%)
 rename spec/{ => lang}/arguments/boolean_spec.lua (100%)
 rename spec/{ => lang}/arguments/enum_spec.lua (100%)
 rename spec/{ => lang}/arguments/record_spec.lua (100%)
 rename spec/{ => lang}/arguments/union_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_any_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_array_of_maps_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_array_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_const_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_enum_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_function_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_generic_function_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_interface_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_map_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_multiple_variables_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_nominal_arrayrecord_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_nominal_record_field_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_nominal_record_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_self_record_field_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_tuple_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_type_spec.lua (100%)
 rename spec/{ => lang}/assignment/to_union_spec.lua (100%)
 rename spec/{ => lang}/call/function_spec.lua (100%)
 rename spec/{ => lang}/call/generic_function_spec.lua (100%)
 rename spec/{ => lang}/call/record_method_spec.lua (100%)
 rename spec/{ => lang}/call/string_method_spec.lua (100%)
 rename spec/{ => lang}/call/syntax_errors_spec.lua (100%)
 rename spec/{ => lang}/code_gen/global_type_spec.lua (100%)
 rename spec/{ => lang}/code_gen/linebreak_spec.lua (100%)
 rename spec/{ => lang}/code_gen/local_type_spec.lua (100%)
 rename spec/{ => lang}/code_gen/macroexp_spec.lua (100%)
 rename spec/{ => lang}/code_gen/string_compatability_spec.lua (100%)
 rename spec/{ => lang}/compat/lua_versions_spec.lua (100%)
 rename spec/{ => lang}/config/errors.lua (100%)
 rename spec/{ => lang}/declaration/array_spec.lua (100%)
 rename spec/{ => lang}/declaration/enum_spec.lua (100%)
 rename spec/{ => lang}/declaration/functiontype_spec.lua (100%)
 rename spec/{ => lang}/declaration/global_function_spec.lua (100%)
 rename spec/{ => lang}/declaration/global_spec.lua (100%)
 rename spec/{ => lang}/declaration/local_function_spec.lua (100%)
 rename spec/{ => lang}/declaration/local_spec.lua (100%)
 rename spec/{ => lang}/declaration/local_type_spec.lua (100%)
 rename spec/{ => lang}/declaration/macroexp_spec.lua (100%)
 rename spec/{ => lang}/declaration/map_spec.lua (100%)
 rename spec/{ => lang}/declaration/metatable_spec.lua (100%)
 rename spec/{ => lang}/declaration/nominal_spec.lua (100%)
 rename spec/{ => lang}/declaration/record_function_spec.lua (100%)
 rename spec/{ => lang}/declaration/record_method_spec.lua (100%)
 rename spec/{ => lang}/declaration/record_spec.lua (100%)
 rename spec/{ => lang}/declaration/tuple_spec.lua (100%)
 rename spec/{ => lang}/declaration/union_spec.lua (100%)
 rename spec/{ => lang}/error_reporting/module_error_spec.lua (100%)
 rename spec/{ => lang}/error_reporting/syntax_error_spec.lua (100%)
 rename spec/{ => lang}/error_reporting/typecheck_error_spec.lua (100%)
 rename spec/{ => lang}/error_reporting/warning_spec.lua (100%)
 rename spec/{ => lang}/inference/emptytable_spec.lua (100%)
 rename spec/{ => lang}/inference/function_result_spec.lua (100%)
 rename spec/{ => lang}/inference/if_spec.lua (100%)
 rename spec/{ => lang}/inference/table_literal_spec.lua (100%)
 rename spec/{ => lang}/lax/lax_spec.lua (100%)
 rename spec/{ => lang}/lexer/comments_spec.lua (100%)
 rename spec/{ => lang}/lexer/doublequote_string_spec.lua (100%)
 rename spec/{ => lang}/lexer/eof_spec.lua (100%)
 rename spec/{ => lang}/lexer/hashbang_spec.lua (100%)
 rename spec/{ => lang}/lexer/literals_spec.lua (100%)
 rename spec/{ => lang}/lexer/long_comment_spec.lua (100%)
 rename spec/{ => lang}/lexer/long_string_and_comment_spec.lua (100%)
 rename spec/{ => lang}/lexer/long_string_spec.lua (100%)
 rename spec/{ => lang}/lexer/semicolon_spec.lua (100%)
 rename spec/{ => lang}/lexer/singlequote_string_spec.lua (100%)
 rename spec/{ => lang}/literals/boolean_spec.lua (100%)
 rename spec/{ => lang}/loader/loader_spec.lua (100%)
 rename spec/{ => lang}/macroexp/is_spec.lua (100%)
 rename spec/{ => lang}/metamethods/add_spec.lua (100%)
 rename spec/{ => lang}/metamethods/bnot_spec.lua (100%)
 rename spec/{ => lang}/metamethods/call_spec.lua (100%)
 rename spec/{ => lang}/metamethods/idiv_spec.lua (100%)
 rename spec/{ => lang}/metamethods/index_spec.lua (100%)
 rename spec/{ => lang}/metamethods/le_spec.lua (100%)
 rename spec/{ => lang}/metamethods/len_spec.lua (100%)
 rename spec/{ => lang}/metamethods/lt_spec.lua (100%)
 rename spec/{ => lang}/metamethods/tostring_spec.lua (100%)
 rename spec/{ => lang}/metamethods/unm_spec.lua (100%)
 rename spec/{ => lang}/operator/as_spec.lua (100%)
 rename spec/{ => lang}/operator/bit_spec.lua (100%)
 rename spec/{ => lang}/operator/dot_spec.lua (100%)
 rename spec/{ => lang}/operator/eq_spec.lua (100%)
 rename spec/{ => lang}/operator/idiv_spec.lua (100%)
 rename spec/{ => lang}/operator/index_spec.lua (100%)
 rename spec/{ => lang}/operator/is_spec.lua (100%)
 rename spec/{ => lang}/operator/len_spec.lua (100%)
 rename spec/{ => lang}/operator/lt_spec.lua (100%)
 rename spec/{ => lang}/operator/mod_spec.lua (100%)
 rename spec/{ => lang}/operator/not_spec.lua (100%)
 rename spec/{ => lang}/operator/or_spec.lua (100%)
 rename spec/{ => lang}/operator/paren_spec.lua (100%)
 rename spec/{ => lang}/operator/plus_spec.lua (100%)
 rename spec/{ => lang}/operator/pow_spec.lua (100%)
 rename spec/{ => lang}/parser/parser_error_spec.lua (100%)
 rename spec/{ => lang}/parser/parser_spec.lua (100%)
 rename spec/{ => lang}/parser/syntax_errors_spec.lua (100%)
 rename spec/{ => lang}/pragma/arity_spec.lua (100%)
 rename spec/{ => lang}/pragma/invalid_spec.lua (100%)
 rename spec/{ => lang}/preload/preload_spec.lua (100%)
 rename spec/{ => lang}/statement/forin_spec.lua (100%)
 rename spec/{ => lang}/statement/goto_spec.lua (100%)
 rename spec/{ => lang}/statement/if_spec.lua (100%)
 rename spec/{ => lang}/statement/repeat_spec.lua (100%)
 rename spec/{ => lang}/statement/return_spec.lua (100%)
 rename spec/{ => lang}/statement/while_spec.lua (100%)
 rename spec/{ => lang}/stdlib/assert_spec.lua (100%)
 rename spec/{ => lang}/stdlib/coroutine_spec.lua (100%)
 rename spec/{ => lang}/stdlib/io_spec.lua (100%)
 rename spec/{ => lang}/stdlib/ipairs_spec.lua (100%)
 rename spec/{ => lang}/stdlib/math_spec.lua (100%)
 rename spec/{ => lang}/stdlib/next_spec.lua (100%)
 rename spec/{ => lang}/stdlib/os_spec.lua (100%)
 rename spec/{ => lang}/stdlib/pcall_spec.lua (100%)
 rename spec/{ => lang}/stdlib/rawget_spec.lua (100%)
 rename spec/{ => lang}/stdlib/require_spec.lua (100%)
 rename spec/{ => lang}/stdlib/select_spec.lua (100%)
 rename spec/{ => lang}/stdlib/setmetatable_spec.lua (100%)
 rename spec/{ => lang}/stdlib/string_spec.lua (100%)
 rename spec/{ => lang}/stdlib/table_spec.lua (100%)
 rename spec/{ => lang}/stdlib/xpcall_spec.lua (100%)
 rename spec/{ => lang}/subtyping/any_spec.lua (100%)
 rename spec/{ => lang}/subtyping/integer_spec.lua (100%)
 rename spec/{ => lang}/subtyping/interface_spec.lua (100%)
 rename spec/{ => lang}/subtyping/nil_spec.lua (100%)
 rename spec/{ => lang}/subtyping/number_spec.lua (100%)
 rename spec/{ => lang}/subtyping/poly_spec.lua (100%)
 rename spec/{ => lang}/subtyping/record_spec.lua (100%)
 rename spec/{ => lang}/subtyping/self_spec.lua (100%)
 rename spec/{ => lang}/subtyping/table_spec.lua (100%)
 rename spec/{ => lang}/subtyping/typealias_spec.lua (100%)
 rename spec/{ => lang}/subtyping/union_spec.lua (100%)
 rename spec/{ => lang}/varargs/type_base_spec.lua (100%)
 rename spec/{ => lang}/varargs/typed_varargs_spec.lua (100%)
 rename spec/{ => lang}/varargs/vararg_scope_spec.lua (100%)

diff --git a/Makefile b/Makefile
index 20f977009..59fc13d2d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,9 @@ selfbuild:
 	diff tl.lua.1 tl.lua.2
 
 suite:
-	${BUSTED} -v $(TESTFLAGS) --exclude-tags cli
-	${BUSTED} -v $(TESTFLAGS) --tags cli
+	${BUSTED} -v $(TESTFLAGS) spec/lang
+	${BUSTED} -v $(TESTFLAGS) spec/api
+	${BUSTED} -v $(TESTFLAGS) spec/cli
 
 cov:
 	rm -f luacov.stats.out luacov.report.out
diff --git a/spec/cli/check_spec.lua b/spec/cli/check_spec.lua
index 17f5bf453..347c369aa 100644
--- a/spec/cli/check_spec.lua
+++ b/spec/cli/check_spec.lua
@@ -1,7 +1,7 @@
 local assert = require("luassert")
 local util = require("spec.util")
 
-describe("#cli tl check", function()
+describe("tl check", function()
    describe("on .tl files", function()
       it("reports if file does not exist", function()
          local pd = io.popen(util.tl_cmd("check", "file_that_does_not_exist.tl") .. " 2>&1", "r")
diff --git a/spec/cli/feat_spec.lua b/spec/cli/feat_spec.lua
index d96471bdb..7741cc8f3 100644
--- a/spec/cli/feat_spec.lua
+++ b/spec/cli/feat_spec.lua
@@ -52,7 +52,7 @@ local test_cases = {
    }
 }
 
-describe("#cli feat flags", function()
+describe("feat flags", function()
    for flag, tests in pairs(test_cases) do
       describe(flag, function()
          for _, case in ipairs(tests) do
diff --git a/spec/cli/gen_spec.lua b/spec/cli/gen_spec.lua
index ae8460cb1..7f537e109 100644
--- a/spec/cli/gen_spec.lua
+++ b/spec/cli/gen_spec.lua
@@ -102,7 +102,7 @@ local function tl_to_lua(name)
    return (name:gsub("%.tl$", ".lua"):gsub("^" .. util.os_tmp .. util.os_sep, ""))
 end
 
-describe("#cli tl gen", function()
+describe("tl gen", function()
    setup(util.chdir_setup)
    teardown(util.chdir_teardown)
    describe("on .tl files", function()
diff --git a/spec/cli/global_env_def_spec.lua b/spec/cli/global_env_def_spec.lua
index 20c9bdaea..8dc71a01b 100644
--- a/spec/cli/global_env_def_spec.lua
+++ b/spec/cli/global_env_def_spec.lua
@@ -1,7 +1,7 @@
 local assert = require("luassert")
 local util = require("spec.util")
 
-describe("#cli --global-env-def argument", function()
+describe("--global-env-def argument", function()
    it("exports globals from a module", function()
       util.do_in(util.write_tmp_dir(finally, {
          mod = {
diff --git a/spec/cli/include_dir_spec.lua b/spec/cli/include_dir_spec.lua
index cadfb5d89..20bdbe00a 100644
--- a/spec/cli/include_dir_spec.lua
+++ b/spec/cli/include_dir_spec.lua
@@ -1,7 +1,7 @@
 local assert = require("luassert")
 local util = require("spec.util")
 
-describe("#cli -I --include-dir argument", function()
+describe("-I --include-dir argument", function()
    it("adds a directory to package.path", function()
       util.do_in(util.write_tmp_dir(finally, {
          mod = {
diff --git a/spec/cli/output_spec.lua b/spec/cli/output_spec.lua
index b16dbccdb..92956044f 100644
--- a/spec/cli/output_spec.lua
+++ b/spec/cli/output_spec.lua
@@ -1,6 +1,6 @@
 local util = require("spec.util")
 
-describe("#cli -o --output", function()
+describe("-o --output", function()
    it("should gen in the current directory when not provided", function()
       util.run_mock_project(finally, {
          dir_structure = {
diff --git a/spec/cli/quiet_spec.lua b/spec/cli/quiet_spec.lua
index 922b7cce9..11031fcc6 100644
--- a/spec/cli/quiet_spec.lua
+++ b/spec/cli/quiet_spec.lua
@@ -1,6 +1,6 @@
 local util = require("spec.util")
 
-describe("#cli -q --quiet flag", function()
+describe("-q --quiet flag", function()
    setup(util.chdir_setup)
    teardown(util.chdir_teardown)
    it("silences warnings from tlconfig.lua", function()
diff --git a/spec/cli/run_spec.lua b/spec/cli/run_spec.lua
index c785161c0..26f9d7335 100644
--- a/spec/cli/run_spec.lua
+++ b/spec/cli/run_spec.lua
@@ -1,6 +1,6 @@
 local util = require("spec.util")
 
-describe("#cli tl run", function()
+describe("tl run", function()
    setup(util.chdir_setup)
    teardown(util.chdir_teardown)
    describe("on .tl files", function()
diff --git a/spec/cli/types_spec.lua b/spec/cli/types_spec.lua
index 55940d00a..32d5649da 100644
--- a/spec/cli/types_spec.lua
+++ b/spec/cli/types_spec.lua
@@ -2,7 +2,7 @@ local assert = require("luassert")
 local json = require("dkjson")
 local util = require("spec.util")
 
-describe("#cli tl types works like check", function()
+describe("tl types works like check", function()
    describe("on .tl files", function()
       it("reports missing files", function()
          local pd = io.popen(util.tl_cmd("types", "nonexistent_file") .. "2>&1 1>" .. util.os_null, "r")
diff --git a/spec/cli/warning_spec.lua b/spec/cli/warning_spec.lua
index 0d28a8b92..60eb4a74e 100644
--- a/spec/cli/warning_spec.lua
+++ b/spec/cli/warning_spec.lua
@@ -2,7 +2,7 @@ local assert = require("luassert")
 local util = require("spec.util")
 local tl = require("tl")
 
-describe("#cli tl warnings", function()
+describe("tl warnings", function()
    it("reports existing warning types when given no arguments", function()
       local pd = io.popen(util.tl_cmd("warnings"), "r")
       local output = pd:read("*a")
@@ -16,7 +16,7 @@ describe("#cli tl warnings", function()
    end)
 end)
 
-describe("#cli warning flags", function()
+describe("warning flags", function()
    describe("in tlconfig.lua", function()
       describe("disable_warnings", function()
          it("disables the given warnings", function()
diff --git a/spec/arguments/array_spec.lua b/spec/lang/arguments/array_spec.lua
similarity index 100%
rename from spec/arguments/array_spec.lua
rename to spec/lang/arguments/array_spec.lua
diff --git a/spec/arguments/boolean_spec.lua b/spec/lang/arguments/boolean_spec.lua
similarity index 100%
rename from spec/arguments/boolean_spec.lua
rename to spec/lang/arguments/boolean_spec.lua
diff --git a/spec/arguments/enum_spec.lua b/spec/lang/arguments/enum_spec.lua
similarity index 100%
rename from spec/arguments/enum_spec.lua
rename to spec/lang/arguments/enum_spec.lua
diff --git a/spec/arguments/record_spec.lua b/spec/lang/arguments/record_spec.lua
similarity index 100%
rename from spec/arguments/record_spec.lua
rename to spec/lang/arguments/record_spec.lua
diff --git a/spec/arguments/union_spec.lua b/spec/lang/arguments/union_spec.lua
similarity index 100%
rename from spec/arguments/union_spec.lua
rename to spec/lang/arguments/union_spec.lua
diff --git a/spec/assignment/to_any_spec.lua b/spec/lang/assignment/to_any_spec.lua
similarity index 100%
rename from spec/assignment/to_any_spec.lua
rename to spec/lang/assignment/to_any_spec.lua
diff --git a/spec/assignment/to_array_of_maps_spec.lua b/spec/lang/assignment/to_array_of_maps_spec.lua
similarity index 100%
rename from spec/assignment/to_array_of_maps_spec.lua
rename to spec/lang/assignment/to_array_of_maps_spec.lua
diff --git a/spec/assignment/to_array_spec.lua b/spec/lang/assignment/to_array_spec.lua
similarity index 100%
rename from spec/assignment/to_array_spec.lua
rename to spec/lang/assignment/to_array_spec.lua
diff --git a/spec/assignment/to_const_spec.lua b/spec/lang/assignment/to_const_spec.lua
similarity index 100%
rename from spec/assignment/to_const_spec.lua
rename to spec/lang/assignment/to_const_spec.lua
diff --git a/spec/assignment/to_enum_spec.lua b/spec/lang/assignment/to_enum_spec.lua
similarity index 100%
rename from spec/assignment/to_enum_spec.lua
rename to spec/lang/assignment/to_enum_spec.lua
diff --git a/spec/assignment/to_function_spec.lua b/spec/lang/assignment/to_function_spec.lua
similarity index 100%
rename from spec/assignment/to_function_spec.lua
rename to spec/lang/assignment/to_function_spec.lua
diff --git a/spec/assignment/to_generic_function_spec.lua b/spec/lang/assignment/to_generic_function_spec.lua
similarity index 100%
rename from spec/assignment/to_generic_function_spec.lua
rename to spec/lang/assignment/to_generic_function_spec.lua
diff --git a/spec/assignment/to_interface_spec.lua b/spec/lang/assignment/to_interface_spec.lua
similarity index 100%
rename from spec/assignment/to_interface_spec.lua
rename to spec/lang/assignment/to_interface_spec.lua
diff --git a/spec/assignment/to_map_spec.lua b/spec/lang/assignment/to_map_spec.lua
similarity index 100%
rename from spec/assignment/to_map_spec.lua
rename to spec/lang/assignment/to_map_spec.lua
diff --git a/spec/assignment/to_multiple_variables_spec.lua b/spec/lang/assignment/to_multiple_variables_spec.lua
similarity index 100%
rename from spec/assignment/to_multiple_variables_spec.lua
rename to spec/lang/assignment/to_multiple_variables_spec.lua
diff --git a/spec/assignment/to_nominal_arrayrecord_spec.lua b/spec/lang/assignment/to_nominal_arrayrecord_spec.lua
similarity index 100%
rename from spec/assignment/to_nominal_arrayrecord_spec.lua
rename to spec/lang/assignment/to_nominal_arrayrecord_spec.lua
diff --git a/spec/assignment/to_nominal_record_field_spec.lua b/spec/lang/assignment/to_nominal_record_field_spec.lua
similarity index 100%
rename from spec/assignment/to_nominal_record_field_spec.lua
rename to spec/lang/assignment/to_nominal_record_field_spec.lua
diff --git a/spec/assignment/to_nominal_record_spec.lua b/spec/lang/assignment/to_nominal_record_spec.lua
similarity index 100%
rename from spec/assignment/to_nominal_record_spec.lua
rename to spec/lang/assignment/to_nominal_record_spec.lua
diff --git a/spec/assignment/to_self_record_field_spec.lua b/spec/lang/assignment/to_self_record_field_spec.lua
similarity index 100%
rename from spec/assignment/to_self_record_field_spec.lua
rename to spec/lang/assignment/to_self_record_field_spec.lua
diff --git a/spec/assignment/to_tuple_spec.lua b/spec/lang/assignment/to_tuple_spec.lua
similarity index 100%
rename from spec/assignment/to_tuple_spec.lua
rename to spec/lang/assignment/to_tuple_spec.lua
diff --git a/spec/assignment/to_type_spec.lua b/spec/lang/assignment/to_type_spec.lua
similarity index 100%
rename from spec/assignment/to_type_spec.lua
rename to spec/lang/assignment/to_type_spec.lua
diff --git a/spec/assignment/to_union_spec.lua b/spec/lang/assignment/to_union_spec.lua
similarity index 100%
rename from spec/assignment/to_union_spec.lua
rename to spec/lang/assignment/to_union_spec.lua
diff --git a/spec/call/function_spec.lua b/spec/lang/call/function_spec.lua
similarity index 100%
rename from spec/call/function_spec.lua
rename to spec/lang/call/function_spec.lua
diff --git a/spec/call/generic_function_spec.lua b/spec/lang/call/generic_function_spec.lua
similarity index 100%
rename from spec/call/generic_function_spec.lua
rename to spec/lang/call/generic_function_spec.lua
diff --git a/spec/call/record_method_spec.lua b/spec/lang/call/record_method_spec.lua
similarity index 100%
rename from spec/call/record_method_spec.lua
rename to spec/lang/call/record_method_spec.lua
diff --git a/spec/call/string_method_spec.lua b/spec/lang/call/string_method_spec.lua
similarity index 100%
rename from spec/call/string_method_spec.lua
rename to spec/lang/call/string_method_spec.lua
diff --git a/spec/call/syntax_errors_spec.lua b/spec/lang/call/syntax_errors_spec.lua
similarity index 100%
rename from spec/call/syntax_errors_spec.lua
rename to spec/lang/call/syntax_errors_spec.lua
diff --git a/spec/code_gen/global_type_spec.lua b/spec/lang/code_gen/global_type_spec.lua
similarity index 100%
rename from spec/code_gen/global_type_spec.lua
rename to spec/lang/code_gen/global_type_spec.lua
diff --git a/spec/code_gen/linebreak_spec.lua b/spec/lang/code_gen/linebreak_spec.lua
similarity index 100%
rename from spec/code_gen/linebreak_spec.lua
rename to spec/lang/code_gen/linebreak_spec.lua
diff --git a/spec/code_gen/local_type_spec.lua b/spec/lang/code_gen/local_type_spec.lua
similarity index 100%
rename from spec/code_gen/local_type_spec.lua
rename to spec/lang/code_gen/local_type_spec.lua
diff --git a/spec/code_gen/macroexp_spec.lua b/spec/lang/code_gen/macroexp_spec.lua
similarity index 100%
rename from spec/code_gen/macroexp_spec.lua
rename to spec/lang/code_gen/macroexp_spec.lua
diff --git a/spec/code_gen/string_compatability_spec.lua b/spec/lang/code_gen/string_compatability_spec.lua
similarity index 100%
rename from spec/code_gen/string_compatability_spec.lua
rename to spec/lang/code_gen/string_compatability_spec.lua
diff --git a/spec/compat/lua_versions_spec.lua b/spec/lang/compat/lua_versions_spec.lua
similarity index 100%
rename from spec/compat/lua_versions_spec.lua
rename to spec/lang/compat/lua_versions_spec.lua
diff --git a/spec/config/errors.lua b/spec/lang/config/errors.lua
similarity index 100%
rename from spec/config/errors.lua
rename to spec/lang/config/errors.lua
diff --git a/spec/declaration/array_spec.lua b/spec/lang/declaration/array_spec.lua
similarity index 100%
rename from spec/declaration/array_spec.lua
rename to spec/lang/declaration/array_spec.lua
diff --git a/spec/declaration/enum_spec.lua b/spec/lang/declaration/enum_spec.lua
similarity index 100%
rename from spec/declaration/enum_spec.lua
rename to spec/lang/declaration/enum_spec.lua
diff --git a/spec/declaration/functiontype_spec.lua b/spec/lang/declaration/functiontype_spec.lua
similarity index 100%
rename from spec/declaration/functiontype_spec.lua
rename to spec/lang/declaration/functiontype_spec.lua
diff --git a/spec/declaration/global_function_spec.lua b/spec/lang/declaration/global_function_spec.lua
similarity index 100%
rename from spec/declaration/global_function_spec.lua
rename to spec/lang/declaration/global_function_spec.lua
diff --git a/spec/declaration/global_spec.lua b/spec/lang/declaration/global_spec.lua
similarity index 100%
rename from spec/declaration/global_spec.lua
rename to spec/lang/declaration/global_spec.lua
diff --git a/spec/declaration/local_function_spec.lua b/spec/lang/declaration/local_function_spec.lua
similarity index 100%
rename from spec/declaration/local_function_spec.lua
rename to spec/lang/declaration/local_function_spec.lua
diff --git a/spec/declaration/local_spec.lua b/spec/lang/declaration/local_spec.lua
similarity index 100%
rename from spec/declaration/local_spec.lua
rename to spec/lang/declaration/local_spec.lua
diff --git a/spec/declaration/local_type_spec.lua b/spec/lang/declaration/local_type_spec.lua
similarity index 100%
rename from spec/declaration/local_type_spec.lua
rename to spec/lang/declaration/local_type_spec.lua
diff --git a/spec/declaration/macroexp_spec.lua b/spec/lang/declaration/macroexp_spec.lua
similarity index 100%
rename from spec/declaration/macroexp_spec.lua
rename to spec/lang/declaration/macroexp_spec.lua
diff --git a/spec/declaration/map_spec.lua b/spec/lang/declaration/map_spec.lua
similarity index 100%
rename from spec/declaration/map_spec.lua
rename to spec/lang/declaration/map_spec.lua
diff --git a/spec/declaration/metatable_spec.lua b/spec/lang/declaration/metatable_spec.lua
similarity index 100%
rename from spec/declaration/metatable_spec.lua
rename to spec/lang/declaration/metatable_spec.lua
diff --git a/spec/declaration/nominal_spec.lua b/spec/lang/declaration/nominal_spec.lua
similarity index 100%
rename from spec/declaration/nominal_spec.lua
rename to spec/lang/declaration/nominal_spec.lua
diff --git a/spec/declaration/record_function_spec.lua b/spec/lang/declaration/record_function_spec.lua
similarity index 100%
rename from spec/declaration/record_function_spec.lua
rename to spec/lang/declaration/record_function_spec.lua
diff --git a/spec/declaration/record_method_spec.lua b/spec/lang/declaration/record_method_spec.lua
similarity index 100%
rename from spec/declaration/record_method_spec.lua
rename to spec/lang/declaration/record_method_spec.lua
diff --git a/spec/declaration/record_spec.lua b/spec/lang/declaration/record_spec.lua
similarity index 100%
rename from spec/declaration/record_spec.lua
rename to spec/lang/declaration/record_spec.lua
diff --git a/spec/declaration/tuple_spec.lua b/spec/lang/declaration/tuple_spec.lua
similarity index 100%
rename from spec/declaration/tuple_spec.lua
rename to spec/lang/declaration/tuple_spec.lua
diff --git a/spec/declaration/union_spec.lua b/spec/lang/declaration/union_spec.lua
similarity index 100%
rename from spec/declaration/union_spec.lua
rename to spec/lang/declaration/union_spec.lua
diff --git a/spec/error_reporting/module_error_spec.lua b/spec/lang/error_reporting/module_error_spec.lua
similarity index 100%
rename from spec/error_reporting/module_error_spec.lua
rename to spec/lang/error_reporting/module_error_spec.lua
diff --git a/spec/error_reporting/syntax_error_spec.lua b/spec/lang/error_reporting/syntax_error_spec.lua
similarity index 100%
rename from spec/error_reporting/syntax_error_spec.lua
rename to spec/lang/error_reporting/syntax_error_spec.lua
diff --git a/spec/error_reporting/typecheck_error_spec.lua b/spec/lang/error_reporting/typecheck_error_spec.lua
similarity index 100%
rename from spec/error_reporting/typecheck_error_spec.lua
rename to spec/lang/error_reporting/typecheck_error_spec.lua
diff --git a/spec/error_reporting/warning_spec.lua b/spec/lang/error_reporting/warning_spec.lua
similarity index 100%
rename from spec/error_reporting/warning_spec.lua
rename to spec/lang/error_reporting/warning_spec.lua
diff --git a/spec/inference/emptytable_spec.lua b/spec/lang/inference/emptytable_spec.lua
similarity index 100%
rename from spec/inference/emptytable_spec.lua
rename to spec/lang/inference/emptytable_spec.lua
diff --git a/spec/inference/function_result_spec.lua b/spec/lang/inference/function_result_spec.lua
similarity index 100%
rename from spec/inference/function_result_spec.lua
rename to spec/lang/inference/function_result_spec.lua
diff --git a/spec/inference/if_spec.lua b/spec/lang/inference/if_spec.lua
similarity index 100%
rename from spec/inference/if_spec.lua
rename to spec/lang/inference/if_spec.lua
diff --git a/spec/inference/table_literal_spec.lua b/spec/lang/inference/table_literal_spec.lua
similarity index 100%
rename from spec/inference/table_literal_spec.lua
rename to spec/lang/inference/table_literal_spec.lua
diff --git a/spec/lax/lax_spec.lua b/spec/lang/lax/lax_spec.lua
similarity index 100%
rename from spec/lax/lax_spec.lua
rename to spec/lang/lax/lax_spec.lua
diff --git a/spec/lexer/comments_spec.lua b/spec/lang/lexer/comments_spec.lua
similarity index 100%
rename from spec/lexer/comments_spec.lua
rename to spec/lang/lexer/comments_spec.lua
diff --git a/spec/lexer/doublequote_string_spec.lua b/spec/lang/lexer/doublequote_string_spec.lua
similarity index 100%
rename from spec/lexer/doublequote_string_spec.lua
rename to spec/lang/lexer/doublequote_string_spec.lua
diff --git a/spec/lexer/eof_spec.lua b/spec/lang/lexer/eof_spec.lua
similarity index 100%
rename from spec/lexer/eof_spec.lua
rename to spec/lang/lexer/eof_spec.lua
diff --git a/spec/lexer/hashbang_spec.lua b/spec/lang/lexer/hashbang_spec.lua
similarity index 100%
rename from spec/lexer/hashbang_spec.lua
rename to spec/lang/lexer/hashbang_spec.lua
diff --git a/spec/lexer/literals_spec.lua b/spec/lang/lexer/literals_spec.lua
similarity index 100%
rename from spec/lexer/literals_spec.lua
rename to spec/lang/lexer/literals_spec.lua
diff --git a/spec/lexer/long_comment_spec.lua b/spec/lang/lexer/long_comment_spec.lua
similarity index 100%
rename from spec/lexer/long_comment_spec.lua
rename to spec/lang/lexer/long_comment_spec.lua
diff --git a/spec/lexer/long_string_and_comment_spec.lua b/spec/lang/lexer/long_string_and_comment_spec.lua
similarity index 100%
rename from spec/lexer/long_string_and_comment_spec.lua
rename to spec/lang/lexer/long_string_and_comment_spec.lua
diff --git a/spec/lexer/long_string_spec.lua b/spec/lang/lexer/long_string_spec.lua
similarity index 100%
rename from spec/lexer/long_string_spec.lua
rename to spec/lang/lexer/long_string_spec.lua
diff --git a/spec/lexer/semicolon_spec.lua b/spec/lang/lexer/semicolon_spec.lua
similarity index 100%
rename from spec/lexer/semicolon_spec.lua
rename to spec/lang/lexer/semicolon_spec.lua
diff --git a/spec/lexer/singlequote_string_spec.lua b/spec/lang/lexer/singlequote_string_spec.lua
similarity index 100%
rename from spec/lexer/singlequote_string_spec.lua
rename to spec/lang/lexer/singlequote_string_spec.lua
diff --git a/spec/literals/boolean_spec.lua b/spec/lang/literals/boolean_spec.lua
similarity index 100%
rename from spec/literals/boolean_spec.lua
rename to spec/lang/literals/boolean_spec.lua
diff --git a/spec/loader/loader_spec.lua b/spec/lang/loader/loader_spec.lua
similarity index 100%
rename from spec/loader/loader_spec.lua
rename to spec/lang/loader/loader_spec.lua
diff --git a/spec/macroexp/is_spec.lua b/spec/lang/macroexp/is_spec.lua
similarity index 100%
rename from spec/macroexp/is_spec.lua
rename to spec/lang/macroexp/is_spec.lua
diff --git a/spec/metamethods/add_spec.lua b/spec/lang/metamethods/add_spec.lua
similarity index 100%
rename from spec/metamethods/add_spec.lua
rename to spec/lang/metamethods/add_spec.lua
diff --git a/spec/metamethods/bnot_spec.lua b/spec/lang/metamethods/bnot_spec.lua
similarity index 100%
rename from spec/metamethods/bnot_spec.lua
rename to spec/lang/metamethods/bnot_spec.lua
diff --git a/spec/metamethods/call_spec.lua b/spec/lang/metamethods/call_spec.lua
similarity index 100%
rename from spec/metamethods/call_spec.lua
rename to spec/lang/metamethods/call_spec.lua
diff --git a/spec/metamethods/idiv_spec.lua b/spec/lang/metamethods/idiv_spec.lua
similarity index 100%
rename from spec/metamethods/idiv_spec.lua
rename to spec/lang/metamethods/idiv_spec.lua
diff --git a/spec/metamethods/index_spec.lua b/spec/lang/metamethods/index_spec.lua
similarity index 100%
rename from spec/metamethods/index_spec.lua
rename to spec/lang/metamethods/index_spec.lua
diff --git a/spec/metamethods/le_spec.lua b/spec/lang/metamethods/le_spec.lua
similarity index 100%
rename from spec/metamethods/le_spec.lua
rename to spec/lang/metamethods/le_spec.lua
diff --git a/spec/metamethods/len_spec.lua b/spec/lang/metamethods/len_spec.lua
similarity index 100%
rename from spec/metamethods/len_spec.lua
rename to spec/lang/metamethods/len_spec.lua
diff --git a/spec/metamethods/lt_spec.lua b/spec/lang/metamethods/lt_spec.lua
similarity index 100%
rename from spec/metamethods/lt_spec.lua
rename to spec/lang/metamethods/lt_spec.lua
diff --git a/spec/metamethods/tostring_spec.lua b/spec/lang/metamethods/tostring_spec.lua
similarity index 100%
rename from spec/metamethods/tostring_spec.lua
rename to spec/lang/metamethods/tostring_spec.lua
diff --git a/spec/metamethods/unm_spec.lua b/spec/lang/metamethods/unm_spec.lua
similarity index 100%
rename from spec/metamethods/unm_spec.lua
rename to spec/lang/metamethods/unm_spec.lua
diff --git a/spec/operator/as_spec.lua b/spec/lang/operator/as_spec.lua
similarity index 100%
rename from spec/operator/as_spec.lua
rename to spec/lang/operator/as_spec.lua
diff --git a/spec/operator/bit_spec.lua b/spec/lang/operator/bit_spec.lua
similarity index 100%
rename from spec/operator/bit_spec.lua
rename to spec/lang/operator/bit_spec.lua
diff --git a/spec/operator/dot_spec.lua b/spec/lang/operator/dot_spec.lua
similarity index 100%
rename from spec/operator/dot_spec.lua
rename to spec/lang/operator/dot_spec.lua
diff --git a/spec/operator/eq_spec.lua b/spec/lang/operator/eq_spec.lua
similarity index 100%
rename from spec/operator/eq_spec.lua
rename to spec/lang/operator/eq_spec.lua
diff --git a/spec/operator/idiv_spec.lua b/spec/lang/operator/idiv_spec.lua
similarity index 100%
rename from spec/operator/idiv_spec.lua
rename to spec/lang/operator/idiv_spec.lua
diff --git a/spec/operator/index_spec.lua b/spec/lang/operator/index_spec.lua
similarity index 100%
rename from spec/operator/index_spec.lua
rename to spec/lang/operator/index_spec.lua
diff --git a/spec/operator/is_spec.lua b/spec/lang/operator/is_spec.lua
similarity index 100%
rename from spec/operator/is_spec.lua
rename to spec/lang/operator/is_spec.lua
diff --git a/spec/operator/len_spec.lua b/spec/lang/operator/len_spec.lua
similarity index 100%
rename from spec/operator/len_spec.lua
rename to spec/lang/operator/len_spec.lua
diff --git a/spec/operator/lt_spec.lua b/spec/lang/operator/lt_spec.lua
similarity index 100%
rename from spec/operator/lt_spec.lua
rename to spec/lang/operator/lt_spec.lua
diff --git a/spec/operator/mod_spec.lua b/spec/lang/operator/mod_spec.lua
similarity index 100%
rename from spec/operator/mod_spec.lua
rename to spec/lang/operator/mod_spec.lua
diff --git a/spec/operator/not_spec.lua b/spec/lang/operator/not_spec.lua
similarity index 100%
rename from spec/operator/not_spec.lua
rename to spec/lang/operator/not_spec.lua
diff --git a/spec/operator/or_spec.lua b/spec/lang/operator/or_spec.lua
similarity index 100%
rename from spec/operator/or_spec.lua
rename to spec/lang/operator/or_spec.lua
diff --git a/spec/operator/paren_spec.lua b/spec/lang/operator/paren_spec.lua
similarity index 100%
rename from spec/operator/paren_spec.lua
rename to spec/lang/operator/paren_spec.lua
diff --git a/spec/operator/plus_spec.lua b/spec/lang/operator/plus_spec.lua
similarity index 100%
rename from spec/operator/plus_spec.lua
rename to spec/lang/operator/plus_spec.lua
diff --git a/spec/operator/pow_spec.lua b/spec/lang/operator/pow_spec.lua
similarity index 100%
rename from spec/operator/pow_spec.lua
rename to spec/lang/operator/pow_spec.lua
diff --git a/spec/parser/parser_error_spec.lua b/spec/lang/parser/parser_error_spec.lua
similarity index 100%
rename from spec/parser/parser_error_spec.lua
rename to spec/lang/parser/parser_error_spec.lua
diff --git a/spec/parser/parser_spec.lua b/spec/lang/parser/parser_spec.lua
similarity index 100%
rename from spec/parser/parser_spec.lua
rename to spec/lang/parser/parser_spec.lua
diff --git a/spec/parser/syntax_errors_spec.lua b/spec/lang/parser/syntax_errors_spec.lua
similarity index 100%
rename from spec/parser/syntax_errors_spec.lua
rename to spec/lang/parser/syntax_errors_spec.lua
diff --git a/spec/pragma/arity_spec.lua b/spec/lang/pragma/arity_spec.lua
similarity index 100%
rename from spec/pragma/arity_spec.lua
rename to spec/lang/pragma/arity_spec.lua
diff --git a/spec/pragma/invalid_spec.lua b/spec/lang/pragma/invalid_spec.lua
similarity index 100%
rename from spec/pragma/invalid_spec.lua
rename to spec/lang/pragma/invalid_spec.lua
diff --git a/spec/preload/preload_spec.lua b/spec/lang/preload/preload_spec.lua
similarity index 100%
rename from spec/preload/preload_spec.lua
rename to spec/lang/preload/preload_spec.lua
diff --git a/spec/statement/forin_spec.lua b/spec/lang/statement/forin_spec.lua
similarity index 100%
rename from spec/statement/forin_spec.lua
rename to spec/lang/statement/forin_spec.lua
diff --git a/spec/statement/goto_spec.lua b/spec/lang/statement/goto_spec.lua
similarity index 100%
rename from spec/statement/goto_spec.lua
rename to spec/lang/statement/goto_spec.lua
diff --git a/spec/statement/if_spec.lua b/spec/lang/statement/if_spec.lua
similarity index 100%
rename from spec/statement/if_spec.lua
rename to spec/lang/statement/if_spec.lua
diff --git a/spec/statement/repeat_spec.lua b/spec/lang/statement/repeat_spec.lua
similarity index 100%
rename from spec/statement/repeat_spec.lua
rename to spec/lang/statement/repeat_spec.lua
diff --git a/spec/statement/return_spec.lua b/spec/lang/statement/return_spec.lua
similarity index 100%
rename from spec/statement/return_spec.lua
rename to spec/lang/statement/return_spec.lua
diff --git a/spec/statement/while_spec.lua b/spec/lang/statement/while_spec.lua
similarity index 100%
rename from spec/statement/while_spec.lua
rename to spec/lang/statement/while_spec.lua
diff --git a/spec/stdlib/assert_spec.lua b/spec/lang/stdlib/assert_spec.lua
similarity index 100%
rename from spec/stdlib/assert_spec.lua
rename to spec/lang/stdlib/assert_spec.lua
diff --git a/spec/stdlib/coroutine_spec.lua b/spec/lang/stdlib/coroutine_spec.lua
similarity index 100%
rename from spec/stdlib/coroutine_spec.lua
rename to spec/lang/stdlib/coroutine_spec.lua
diff --git a/spec/stdlib/io_spec.lua b/spec/lang/stdlib/io_spec.lua
similarity index 100%
rename from spec/stdlib/io_spec.lua
rename to spec/lang/stdlib/io_spec.lua
diff --git a/spec/stdlib/ipairs_spec.lua b/spec/lang/stdlib/ipairs_spec.lua
similarity index 100%
rename from spec/stdlib/ipairs_spec.lua
rename to spec/lang/stdlib/ipairs_spec.lua
diff --git a/spec/stdlib/math_spec.lua b/spec/lang/stdlib/math_spec.lua
similarity index 100%
rename from spec/stdlib/math_spec.lua
rename to spec/lang/stdlib/math_spec.lua
diff --git a/spec/stdlib/next_spec.lua b/spec/lang/stdlib/next_spec.lua
similarity index 100%
rename from spec/stdlib/next_spec.lua
rename to spec/lang/stdlib/next_spec.lua
diff --git a/spec/stdlib/os_spec.lua b/spec/lang/stdlib/os_spec.lua
similarity index 100%
rename from spec/stdlib/os_spec.lua
rename to spec/lang/stdlib/os_spec.lua
diff --git a/spec/stdlib/pcall_spec.lua b/spec/lang/stdlib/pcall_spec.lua
similarity index 100%
rename from spec/stdlib/pcall_spec.lua
rename to spec/lang/stdlib/pcall_spec.lua
diff --git a/spec/stdlib/rawget_spec.lua b/spec/lang/stdlib/rawget_spec.lua
similarity index 100%
rename from spec/stdlib/rawget_spec.lua
rename to spec/lang/stdlib/rawget_spec.lua
diff --git a/spec/stdlib/require_spec.lua b/spec/lang/stdlib/require_spec.lua
similarity index 100%
rename from spec/stdlib/require_spec.lua
rename to spec/lang/stdlib/require_spec.lua
diff --git a/spec/stdlib/select_spec.lua b/spec/lang/stdlib/select_spec.lua
similarity index 100%
rename from spec/stdlib/select_spec.lua
rename to spec/lang/stdlib/select_spec.lua
diff --git a/spec/stdlib/setmetatable_spec.lua b/spec/lang/stdlib/setmetatable_spec.lua
similarity index 100%
rename from spec/stdlib/setmetatable_spec.lua
rename to spec/lang/stdlib/setmetatable_spec.lua
diff --git a/spec/stdlib/string_spec.lua b/spec/lang/stdlib/string_spec.lua
similarity index 100%
rename from spec/stdlib/string_spec.lua
rename to spec/lang/stdlib/string_spec.lua
diff --git a/spec/stdlib/table_spec.lua b/spec/lang/stdlib/table_spec.lua
similarity index 100%
rename from spec/stdlib/table_spec.lua
rename to spec/lang/stdlib/table_spec.lua
diff --git a/spec/stdlib/xpcall_spec.lua b/spec/lang/stdlib/xpcall_spec.lua
similarity index 100%
rename from spec/stdlib/xpcall_spec.lua
rename to spec/lang/stdlib/xpcall_spec.lua
diff --git a/spec/subtyping/any_spec.lua b/spec/lang/subtyping/any_spec.lua
similarity index 100%
rename from spec/subtyping/any_spec.lua
rename to spec/lang/subtyping/any_spec.lua
diff --git a/spec/subtyping/integer_spec.lua b/spec/lang/subtyping/integer_spec.lua
similarity index 100%
rename from spec/subtyping/integer_spec.lua
rename to spec/lang/subtyping/integer_spec.lua
diff --git a/spec/subtyping/interface_spec.lua b/spec/lang/subtyping/interface_spec.lua
similarity index 100%
rename from spec/subtyping/interface_spec.lua
rename to spec/lang/subtyping/interface_spec.lua
diff --git a/spec/subtyping/nil_spec.lua b/spec/lang/subtyping/nil_spec.lua
similarity index 100%
rename from spec/subtyping/nil_spec.lua
rename to spec/lang/subtyping/nil_spec.lua
diff --git a/spec/subtyping/number_spec.lua b/spec/lang/subtyping/number_spec.lua
similarity index 100%
rename from spec/subtyping/number_spec.lua
rename to spec/lang/subtyping/number_spec.lua
diff --git a/spec/subtyping/poly_spec.lua b/spec/lang/subtyping/poly_spec.lua
similarity index 100%
rename from spec/subtyping/poly_spec.lua
rename to spec/lang/subtyping/poly_spec.lua
diff --git a/spec/subtyping/record_spec.lua b/spec/lang/subtyping/record_spec.lua
similarity index 100%
rename from spec/subtyping/record_spec.lua
rename to spec/lang/subtyping/record_spec.lua
diff --git a/spec/subtyping/self_spec.lua b/spec/lang/subtyping/self_spec.lua
similarity index 100%
rename from spec/subtyping/self_spec.lua
rename to spec/lang/subtyping/self_spec.lua
diff --git a/spec/subtyping/table_spec.lua b/spec/lang/subtyping/table_spec.lua
similarity index 100%
rename from spec/subtyping/table_spec.lua
rename to spec/lang/subtyping/table_spec.lua
diff --git a/spec/subtyping/typealias_spec.lua b/spec/lang/subtyping/typealias_spec.lua
similarity index 100%
rename from spec/subtyping/typealias_spec.lua
rename to spec/lang/subtyping/typealias_spec.lua
diff --git a/spec/subtyping/union_spec.lua b/spec/lang/subtyping/union_spec.lua
similarity index 100%
rename from spec/subtyping/union_spec.lua
rename to spec/lang/subtyping/union_spec.lua
diff --git a/spec/varargs/type_base_spec.lua b/spec/lang/varargs/type_base_spec.lua
similarity index 100%
rename from spec/varargs/type_base_spec.lua
rename to spec/lang/varargs/type_base_spec.lua
diff --git a/spec/varargs/typed_varargs_spec.lua b/spec/lang/varargs/typed_varargs_spec.lua
similarity index 100%
rename from spec/varargs/typed_varargs_spec.lua
rename to spec/lang/varargs/typed_varargs_spec.lua
diff --git a/spec/varargs/vararg_scope_spec.lua b/spec/lang/varargs/vararg_scope_spec.lua
similarity index 100%
rename from spec/varargs/vararg_scope_spec.lua
rename to spec/lang/varargs/vararg_scope_spec.lua