diff --git a/.gitignore b/.gitignore
index 8153f9c71..cebd511c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ examples/master/results
 examples/master/dataset_db.pyon
 examples/sim/dataset_db.pyon
 Output/
-/lit-test/libartiq_support/libartiq_support.so
+/artiq/test/libartiq_support/libartiq_support.so
 
 # for developer convenience
 /test*.py
diff --git a/lit-test/harness.py b/artiq/test/harness.py
similarity index 100%
rename from lit-test/harness.py
rename to artiq/test/harness.py
diff --git a/artiq/test/libartiq_support/Makefile b/artiq/test/libartiq_support/Makefile
new file mode 100644
index 000000000..889b5558f
--- /dev/null
+++ b/artiq/test/libartiq_support/Makefile
@@ -0,0 +1,4 @@
+CC ?= clang
+
+libartiq_support.so: ../../runtime/artiq_personality.c artiq_terminate.c artiq_time.c
+	$(CC) -std=c99 -Wall -Werror -I. -I../../runtime -g -fPIC -shared -o $@ $^
diff --git a/lit-test/libartiq_support/__cxxabi_config.h b/artiq/test/libartiq_support/__cxxabi_config.h
similarity index 100%
rename from lit-test/libartiq_support/__cxxabi_config.h
rename to artiq/test/libartiq_support/__cxxabi_config.h
diff --git a/lit-test/libartiq_support/artiq_terminate.c b/artiq/test/libartiq_support/artiq_terminate.c
similarity index 100%
rename from lit-test/libartiq_support/artiq_terminate.c
rename to artiq/test/libartiq_support/artiq_terminate.c
diff --git a/lit-test/libartiq_support/artiq_time.c b/artiq/test/libartiq_support/artiq_time.c
similarity index 100%
rename from lit-test/libartiq_support/artiq_time.c
rename to artiq/test/libartiq_support/artiq_time.c
diff --git a/lit-test/libartiq_support/unwind.h b/artiq/test/libartiq_support/unwind.h
similarity index 100%
rename from lit-test/libartiq_support/unwind.h
rename to artiq/test/libartiq_support/unwind.h
diff --git a/lit-test/test/codegen/error_illegal_builtin.py b/artiq/test/lit/codegen/error_illegal_builtin.py
similarity index 100%
rename from lit-test/test/codegen/error_illegal_builtin.py
rename to artiq/test/lit/codegen/error_illegal_builtin.py
diff --git a/lit-test/test/codegen/warning_useless_bool.py b/artiq/test/lit/codegen/warning_useless_bool.py
similarity index 100%
rename from lit-test/test/codegen/warning_useless_bool.py
rename to artiq/test/lit/codegen/warning_useless_bool.py
diff --git a/lit-test/test/devirtualization/device_db.pyon b/artiq/test/lit/devirtualization/device_db.pyon
similarity index 100%
rename from lit-test/test/devirtualization/device_db.pyon
rename to artiq/test/lit/devirtualization/device_db.pyon
diff --git a/lit-test/test/devirtualization/function.py b/artiq/test/lit/devirtualization/function.py
similarity index 100%
rename from lit-test/test/devirtualization/function.py
rename to artiq/test/lit/devirtualization/function.py
diff --git a/lit-test/test/devirtualization/method.py b/artiq/test/lit/devirtualization/method.py
similarity index 100%
rename from lit-test/test/devirtualization/method.py
rename to artiq/test/lit/devirtualization/method.py
diff --git a/lit-test/test/embedding/device_db.pyon b/artiq/test/lit/embedding/device_db.pyon
similarity index 100%
rename from lit-test/test/embedding/device_db.pyon
rename to artiq/test/lit/embedding/device_db.pyon
diff --git a/lit-test/test/embedding/error_attr_absent.py b/artiq/test/lit/embedding/error_attr_absent.py
similarity index 100%
rename from lit-test/test/embedding/error_attr_absent.py
rename to artiq/test/lit/embedding/error_attr_absent.py
diff --git a/lit-test/test/embedding/error_attr_absent_suggest.py b/artiq/test/lit/embedding/error_attr_absent_suggest.py
similarity index 100%
rename from lit-test/test/embedding/error_attr_absent_suggest.py
rename to artiq/test/lit/embedding/error_attr_absent_suggest.py
diff --git a/lit-test/test/embedding/error_attr_conflict.py b/artiq/test/lit/embedding/error_attr_conflict.py
similarity index 100%
rename from lit-test/test/embedding/error_attr_conflict.py
rename to artiq/test/lit/embedding/error_attr_conflict.py
diff --git a/lit-test/test/embedding/error_attr_unify.py b/artiq/test/lit/embedding/error_attr_unify.py
similarity index 100%
rename from lit-test/test/embedding/error_attr_unify.py
rename to artiq/test/lit/embedding/error_attr_unify.py
diff --git a/lit-test/test/embedding/error_name_absent_suggest.py b/artiq/test/lit/embedding/error_name_absent_suggest.py
similarity index 100%
rename from lit-test/test/embedding/error_name_absent_suggest.py
rename to artiq/test/lit/embedding/error_name_absent_suggest.py
diff --git a/lit-test/test/embedding/error_rpc_annot_return.py b/artiq/test/lit/embedding/error_rpc_annot_return.py
similarity index 100%
rename from lit-test/test/embedding/error_rpc_annot_return.py
rename to artiq/test/lit/embedding/error_rpc_annot_return.py
diff --git a/lit-test/test/embedding/error_rpc_default_unify.py b/artiq/test/lit/embedding/error_rpc_default_unify.py
similarity index 100%
rename from lit-test/test/embedding/error_rpc_default_unify.py
rename to artiq/test/lit/embedding/error_rpc_default_unify.py
diff --git a/lit-test/test/embedding/error_syscall_annot.py b/artiq/test/lit/embedding/error_syscall_annot.py
similarity index 100%
rename from lit-test/test/embedding/error_syscall_annot.py
rename to artiq/test/lit/embedding/error_syscall_annot.py
diff --git a/lit-test/test/embedding/error_syscall_annot_return.py b/artiq/test/lit/embedding/error_syscall_annot_return.py
similarity index 100%
rename from lit-test/test/embedding/error_syscall_annot_return.py
rename to artiq/test/lit/embedding/error_syscall_annot_return.py
diff --git a/lit-test/test/embedding/error_syscall_arg.py b/artiq/test/lit/embedding/error_syscall_arg.py
similarity index 100%
rename from lit-test/test/embedding/error_syscall_arg.py
rename to artiq/test/lit/embedding/error_syscall_arg.py
diff --git a/lit-test/test/embedding/error_syscall_default_arg.py b/artiq/test/lit/embedding/error_syscall_default_arg.py
similarity index 100%
rename from lit-test/test/embedding/error_syscall_default_arg.py
rename to artiq/test/lit/embedding/error_syscall_default_arg.py
diff --git a/lit-test/test/embedding/error_syscall_return.py b/artiq/test/lit/embedding/error_syscall_return.py
similarity index 100%
rename from lit-test/test/embedding/error_syscall_return.py
rename to artiq/test/lit/embedding/error_syscall_return.py
diff --git a/lit-test/test/embedding/exception.py b/artiq/test/lit/embedding/exception.py
similarity index 100%
rename from lit-test/test/embedding/exception.py
rename to artiq/test/lit/embedding/exception.py
diff --git a/lit-test/test/embedding/function_polymorphism.py b/artiq/test/lit/embedding/function_polymorphism.py
similarity index 100%
rename from lit-test/test/embedding/function_polymorphism.py
rename to artiq/test/lit/embedding/function_polymorphism.py
diff --git a/lit-test/test/embedding/method_polymorphism.py b/artiq/test/lit/embedding/method_polymorphism.py
similarity index 100%
rename from lit-test/test/embedding/method_polymorphism.py
rename to artiq/test/lit/embedding/method_polymorphism.py
diff --git a/lit-test/test/exceptions/catch.py b/artiq/test/lit/exceptions/catch.py
similarity index 100%
rename from lit-test/test/exceptions/catch.py
rename to artiq/test/lit/exceptions/catch.py
diff --git a/lit-test/test/exceptions/catch_all.py b/artiq/test/lit/exceptions/catch_all.py
similarity index 100%
rename from lit-test/test/exceptions/catch_all.py
rename to artiq/test/lit/exceptions/catch_all.py
diff --git a/lit-test/test/exceptions/catch_multi.py b/artiq/test/lit/exceptions/catch_multi.py
similarity index 100%
rename from lit-test/test/exceptions/catch_multi.py
rename to artiq/test/lit/exceptions/catch_multi.py
diff --git a/lit-test/test/exceptions/catch_outer.py b/artiq/test/lit/exceptions/catch_outer.py
similarity index 100%
rename from lit-test/test/exceptions/catch_outer.py
rename to artiq/test/lit/exceptions/catch_outer.py
diff --git a/lit-test/test/exceptions/finally.py b/artiq/test/lit/exceptions/finally.py
similarity index 100%
rename from lit-test/test/exceptions/finally.py
rename to artiq/test/lit/exceptions/finally.py
diff --git a/lit-test/test/exceptions/finally_catch.py b/artiq/test/lit/exceptions/finally_catch.py
similarity index 100%
rename from lit-test/test/exceptions/finally_catch.py
rename to artiq/test/lit/exceptions/finally_catch.py
diff --git a/lit-test/test/exceptions/finally_raise.py b/artiq/test/lit/exceptions/finally_raise.py
similarity index 100%
rename from lit-test/test/exceptions/finally_raise.py
rename to artiq/test/lit/exceptions/finally_raise.py
diff --git a/lit-test/test/exceptions/finally_squash.py b/artiq/test/lit/exceptions/finally_squash.py
similarity index 100%
rename from lit-test/test/exceptions/finally_squash.py
rename to artiq/test/lit/exceptions/finally_squash.py
diff --git a/lit-test/test/exceptions/finally_uncaught.py b/artiq/test/lit/exceptions/finally_uncaught.py
similarity index 100%
rename from lit-test/test/exceptions/finally_uncaught.py
rename to artiq/test/lit/exceptions/finally_uncaught.py
diff --git a/lit-test/test/exceptions/reraise.py b/artiq/test/lit/exceptions/reraise.py
similarity index 100%
rename from lit-test/test/exceptions/reraise.py
rename to artiq/test/lit/exceptions/reraise.py
diff --git a/lit-test/test/exceptions/reraise_update.py b/artiq/test/lit/exceptions/reraise_update.py
similarity index 100%
rename from lit-test/test/exceptions/reraise_update.py
rename to artiq/test/lit/exceptions/reraise_update.py
diff --git a/lit-test/test/exceptions/uncaught.py b/artiq/test/lit/exceptions/uncaught.py
similarity index 100%
rename from lit-test/test/exceptions/uncaught.py
rename to artiq/test/lit/exceptions/uncaught.py
diff --git a/lit-test/test/inferencer/builtin_calls.py b/artiq/test/lit/inferencer/builtin_calls.py
similarity index 100%
rename from lit-test/test/inferencer/builtin_calls.py
rename to artiq/test/lit/inferencer/builtin_calls.py
diff --git a/lit-test/test/inferencer/class.py b/artiq/test/lit/inferencer/class.py
similarity index 100%
rename from lit-test/test/inferencer/class.py
rename to artiq/test/lit/inferencer/class.py
diff --git a/lit-test/test/inferencer/coerce.py b/artiq/test/lit/inferencer/coerce.py
similarity index 100%
rename from lit-test/test/inferencer/coerce.py
rename to artiq/test/lit/inferencer/coerce.py
diff --git a/lit-test/test/inferencer/error_assert.py b/artiq/test/lit/inferencer/error_assert.py
similarity index 100%
rename from lit-test/test/inferencer/error_assert.py
rename to artiq/test/lit/inferencer/error_assert.py
diff --git a/lit-test/test/inferencer/error_builtin_calls.py b/artiq/test/lit/inferencer/error_builtin_calls.py
similarity index 100%
rename from lit-test/test/inferencer/error_builtin_calls.py
rename to artiq/test/lit/inferencer/error_builtin_calls.py
diff --git a/lit-test/test/inferencer/error_call.py b/artiq/test/lit/inferencer/error_call.py
similarity index 100%
rename from lit-test/test/inferencer/error_call.py
rename to artiq/test/lit/inferencer/error_call.py
diff --git a/lit-test/test/inferencer/error_class.py b/artiq/test/lit/inferencer/error_class.py
similarity index 100%
rename from lit-test/test/inferencer/error_class.py
rename to artiq/test/lit/inferencer/error_class.py
diff --git a/lit-test/test/inferencer/error_class_redefine.py b/artiq/test/lit/inferencer/error_class_redefine.py
similarity index 100%
rename from lit-test/test/inferencer/error_class_redefine.py
rename to artiq/test/lit/inferencer/error_class_redefine.py
diff --git a/lit-test/test/inferencer/error_coerce.py b/artiq/test/lit/inferencer/error_coerce.py
similarity index 100%
rename from lit-test/test/inferencer/error_coerce.py
rename to artiq/test/lit/inferencer/error_coerce.py
diff --git a/lit-test/test/inferencer/error_comprehension.py b/artiq/test/lit/inferencer/error_comprehension.py
similarity index 100%
rename from lit-test/test/inferencer/error_comprehension.py
rename to artiq/test/lit/inferencer/error_comprehension.py
diff --git a/lit-test/test/inferencer/error_control_flow.py b/artiq/test/lit/inferencer/error_control_flow.py
similarity index 100%
rename from lit-test/test/inferencer/error_control_flow.py
rename to artiq/test/lit/inferencer/error_control_flow.py
diff --git a/lit-test/test/inferencer/error_exception.py b/artiq/test/lit/inferencer/error_exception.py
similarity index 100%
rename from lit-test/test/inferencer/error_exception.py
rename to artiq/test/lit/inferencer/error_exception.py
diff --git a/lit-test/test/inferencer/error_iterable.py b/artiq/test/lit/inferencer/error_iterable.py
similarity index 100%
rename from lit-test/test/inferencer/error_iterable.py
rename to artiq/test/lit/inferencer/error_iterable.py
diff --git a/lit-test/test/inferencer/error_local_unbound.py b/artiq/test/lit/inferencer/error_local_unbound.py
similarity index 100%
rename from lit-test/test/inferencer/error_local_unbound.py
rename to artiq/test/lit/inferencer/error_local_unbound.py
diff --git a/lit-test/test/inferencer/error_locals.py b/artiq/test/lit/inferencer/error_locals.py
similarity index 100%
rename from lit-test/test/inferencer/error_locals.py
rename to artiq/test/lit/inferencer/error_locals.py
diff --git a/lit-test/test/inferencer/error_method.py b/artiq/test/lit/inferencer/error_method.py
similarity index 100%
rename from lit-test/test/inferencer/error_method.py
rename to artiq/test/lit/inferencer/error_method.py
diff --git a/lit-test/test/inferencer/error_return.py b/artiq/test/lit/inferencer/error_return.py
similarity index 100%
rename from lit-test/test/inferencer/error_return.py
rename to artiq/test/lit/inferencer/error_return.py
diff --git a/lit-test/test/inferencer/error_subscript.py b/artiq/test/lit/inferencer/error_subscript.py
similarity index 100%
rename from lit-test/test/inferencer/error_subscript.py
rename to artiq/test/lit/inferencer/error_subscript.py
diff --git a/lit-test/test/inferencer/error_unify.py b/artiq/test/lit/inferencer/error_unify.py
similarity index 100%
rename from lit-test/test/inferencer/error_unify.py
rename to artiq/test/lit/inferencer/error_unify.py
diff --git a/lit-test/test/inferencer/error_with_arity.py b/artiq/test/lit/inferencer/error_with_arity.py
similarity index 100%
rename from lit-test/test/inferencer/error_with_arity.py
rename to artiq/test/lit/inferencer/error_with_arity.py
diff --git a/lit-test/test/inferencer/error_with_exn.py b/artiq/test/lit/inferencer/error_with_exn.py
similarity index 100%
rename from lit-test/test/inferencer/error_with_exn.py
rename to artiq/test/lit/inferencer/error_with_exn.py
diff --git a/lit-test/test/inferencer/error_with_many.py b/artiq/test/lit/inferencer/error_with_many.py
similarity index 100%
rename from lit-test/test/inferencer/error_with_many.py
rename to artiq/test/lit/inferencer/error_with_many.py
diff --git a/lit-test/test/inferencer/error_with_self.py b/artiq/test/lit/inferencer/error_with_self.py
similarity index 100%
rename from lit-test/test/inferencer/error_with_self.py
rename to artiq/test/lit/inferencer/error_with_self.py
diff --git a/lit-test/test/inferencer/error_with_var.py b/artiq/test/lit/inferencer/error_with_var.py
similarity index 100%
rename from lit-test/test/inferencer/error_with_var.py
rename to artiq/test/lit/inferencer/error_with_var.py
diff --git a/lit-test/test/inferencer/exception.py b/artiq/test/lit/inferencer/exception.py
similarity index 100%
rename from lit-test/test/inferencer/exception.py
rename to artiq/test/lit/inferencer/exception.py
diff --git a/lit-test/test/inferencer/gcd.py b/artiq/test/lit/inferencer/gcd.py
similarity index 100%
rename from lit-test/test/inferencer/gcd.py
rename to artiq/test/lit/inferencer/gcd.py
diff --git a/lit-test/test/inferencer/prelude.py b/artiq/test/lit/inferencer/prelude.py
similarity index 100%
rename from lit-test/test/inferencer/prelude.py
rename to artiq/test/lit/inferencer/prelude.py
diff --git a/lit-test/test/inferencer/scoping.py b/artiq/test/lit/inferencer/scoping.py
similarity index 100%
rename from lit-test/test/inferencer/scoping.py
rename to artiq/test/lit/inferencer/scoping.py
diff --git a/lit-test/test/inferencer/slice.py b/artiq/test/lit/inferencer/slice.py
similarity index 100%
rename from lit-test/test/inferencer/slice.py
rename to artiq/test/lit/inferencer/slice.py
diff --git a/lit-test/test/inferencer/unify.py b/artiq/test/lit/inferencer/unify.py
similarity index 100%
rename from lit-test/test/inferencer/unify.py
rename to artiq/test/lit/inferencer/unify.py
diff --git a/lit-test/test/inferencer/with.py b/artiq/test/lit/inferencer/with.py
similarity index 100%
rename from lit-test/test/inferencer/with.py
rename to artiq/test/lit/inferencer/with.py
diff --git a/lit-test/test/integration/arithmetics.py b/artiq/test/lit/integration/arithmetics.py
similarity index 100%
rename from lit-test/test/integration/arithmetics.py
rename to artiq/test/lit/integration/arithmetics.py
diff --git a/lit-test/test/integration/attribute.py b/artiq/test/lit/integration/attribute.py
similarity index 100%
rename from lit-test/test/integration/attribute.py
rename to artiq/test/lit/integration/attribute.py
diff --git a/lit-test/test/integration/bool.py b/artiq/test/lit/integration/bool.py
similarity index 100%
rename from lit-test/test/integration/bool.py
rename to artiq/test/lit/integration/bool.py
diff --git a/lit-test/test/integration/builtin.py b/artiq/test/lit/integration/builtin.py
similarity index 100%
rename from lit-test/test/integration/builtin.py
rename to artiq/test/lit/integration/builtin.py
diff --git a/lit-test/test/integration/class.py b/artiq/test/lit/integration/class.py
similarity index 100%
rename from lit-test/test/integration/class.py
rename to artiq/test/lit/integration/class.py
diff --git a/lit-test/test/integration/compare.py b/artiq/test/lit/integration/compare.py
similarity index 100%
rename from lit-test/test/integration/compare.py
rename to artiq/test/lit/integration/compare.py
diff --git a/lit-test/test/integration/finally.py b/artiq/test/lit/integration/finally.py
similarity index 100%
rename from lit-test/test/integration/finally.py
rename to artiq/test/lit/integration/finally.py
diff --git a/lit-test/test/integration/for.py b/artiq/test/lit/integration/for.py
similarity index 100%
rename from lit-test/test/integration/for.py
rename to artiq/test/lit/integration/for.py
diff --git a/lit-test/test/integration/function.py b/artiq/test/lit/integration/function.py
similarity index 100%
rename from lit-test/test/integration/function.py
rename to artiq/test/lit/integration/function.py
diff --git a/lit-test/test/integration/if.py b/artiq/test/lit/integration/if.py
similarity index 100%
rename from lit-test/test/integration/if.py
rename to artiq/test/lit/integration/if.py
diff --git a/lit-test/test/integration/instance.py b/artiq/test/lit/integration/instance.py
similarity index 100%
rename from lit-test/test/integration/instance.py
rename to artiq/test/lit/integration/instance.py
diff --git a/lit-test/test/integration/lambda.py b/artiq/test/lit/integration/lambda.py
similarity index 100%
rename from lit-test/test/integration/lambda.py
rename to artiq/test/lit/integration/lambda.py
diff --git a/lit-test/test/integration/list.py b/artiq/test/lit/integration/list.py
similarity index 100%
rename from lit-test/test/integration/list.py
rename to artiq/test/lit/integration/list.py
diff --git a/lit-test/test/integration/locals.py b/artiq/test/lit/integration/locals.py
similarity index 100%
rename from lit-test/test/integration/locals.py
rename to artiq/test/lit/integration/locals.py
diff --git a/lit-test/test/integration/print.py b/artiq/test/lit/integration/print.py
similarity index 100%
rename from lit-test/test/integration/print.py
rename to artiq/test/lit/integration/print.py
diff --git a/lit-test/test/integration/subscript.py b/artiq/test/lit/integration/subscript.py
similarity index 100%
rename from lit-test/test/integration/subscript.py
rename to artiq/test/lit/integration/subscript.py
diff --git a/lit-test/test/integration/tuple.py b/artiq/test/lit/integration/tuple.py
similarity index 100%
rename from lit-test/test/integration/tuple.py
rename to artiq/test/lit/integration/tuple.py
diff --git a/lit-test/test/integration/while.py b/artiq/test/lit/integration/while.py
similarity index 100%
rename from lit-test/test/integration/while.py
rename to artiq/test/lit/integration/while.py
diff --git a/lit-test/test/integration/with.py b/artiq/test/lit/integration/with.py
similarity index 100%
rename from lit-test/test/integration/with.py
rename to artiq/test/lit/integration/with.py
diff --git a/lit-test/test/interleaving/control_flow.py b/artiq/test/lit/interleaving/control_flow.py
similarity index 100%
rename from lit-test/test/interleaving/control_flow.py
rename to artiq/test/lit/interleaving/control_flow.py
diff --git a/lit-test/test/interleaving/error_inlining.py b/artiq/test/lit/interleaving/error_inlining.py
similarity index 100%
rename from lit-test/test/interleaving/error_inlining.py
rename to artiq/test/lit/interleaving/error_inlining.py
diff --git a/lit-test/test/interleaving/error_toplevel_control_flow.py b/artiq/test/lit/interleaving/error_toplevel_control_flow.py
similarity index 100%
rename from lit-test/test/interleaving/error_toplevel_control_flow.py
rename to artiq/test/lit/interleaving/error_toplevel_control_flow.py
diff --git a/lit-test/test/interleaving/indirect.py b/artiq/test/lit/interleaving/indirect.py
similarity index 100%
rename from lit-test/test/interleaving/indirect.py
rename to artiq/test/lit/interleaving/indirect.py
diff --git a/lit-test/test/interleaving/indirect_arg.py b/artiq/test/lit/interleaving/indirect_arg.py
similarity index 100%
rename from lit-test/test/interleaving/indirect_arg.py
rename to artiq/test/lit/interleaving/indirect_arg.py
diff --git a/lit-test/test/interleaving/nonoverlapping.py b/artiq/test/lit/interleaving/nonoverlapping.py
similarity index 100%
rename from lit-test/test/interleaving/nonoverlapping.py
rename to artiq/test/lit/interleaving/nonoverlapping.py
diff --git a/lit-test/test/interleaving/overlapping.py b/artiq/test/lit/interleaving/overlapping.py
similarity index 100%
rename from lit-test/test/interleaving/overlapping.py
rename to artiq/test/lit/interleaving/overlapping.py
diff --git a/lit-test/test/interleaving/pure_impure_tie.py b/artiq/test/lit/interleaving/pure_impure_tie.py
similarity index 100%
rename from lit-test/test/interleaving/pure_impure_tie.py
rename to artiq/test/lit/interleaving/pure_impure_tie.py
diff --git a/lit-test/test/interleaving/unrolling.py b/artiq/test/lit/interleaving/unrolling.py
similarity index 100%
rename from lit-test/test/interleaving/unrolling.py
rename to artiq/test/lit/interleaving/unrolling.py
diff --git a/lit-test/test/iodelay/argument.py b/artiq/test/lit/iodelay/argument.py
similarity index 100%
rename from lit-test/test/iodelay/argument.py
rename to artiq/test/lit/iodelay/argument.py
diff --git a/lit-test/test/iodelay/arith.py b/artiq/test/lit/iodelay/arith.py
similarity index 100%
rename from lit-test/test/iodelay/arith.py
rename to artiq/test/lit/iodelay/arith.py
diff --git a/lit-test/test/iodelay/call.py b/artiq/test/lit/iodelay/call.py
similarity index 100%
rename from lit-test/test/iodelay/call.py
rename to artiq/test/lit/iodelay/call.py
diff --git a/lit-test/test/iodelay/call_subst.py b/artiq/test/lit/iodelay/call_subst.py
similarity index 100%
rename from lit-test/test/iodelay/call_subst.py
rename to artiq/test/lit/iodelay/call_subst.py
diff --git a/lit-test/test/iodelay/class.py b/artiq/test/lit/iodelay/class.py
similarity index 100%
rename from lit-test/test/iodelay/class.py
rename to artiq/test/lit/iodelay/class.py
diff --git a/lit-test/test/iodelay/error_arith.py b/artiq/test/lit/iodelay/error_arith.py
similarity index 100%
rename from lit-test/test/iodelay/error_arith.py
rename to artiq/test/lit/iodelay/error_arith.py
diff --git a/lit-test/test/iodelay/error_bad_parallel.py b/artiq/test/lit/iodelay/error_bad_parallel.py
similarity index 100%
rename from lit-test/test/iodelay/error_bad_parallel.py
rename to artiq/test/lit/iodelay/error_bad_parallel.py
diff --git a/lit-test/test/iodelay/error_builtinfn.py b/artiq/test/lit/iodelay/error_builtinfn.py
similarity index 100%
rename from lit-test/test/iodelay/error_builtinfn.py
rename to artiq/test/lit/iodelay/error_builtinfn.py
diff --git a/lit-test/test/iodelay/error_call_nested.py b/artiq/test/lit/iodelay/error_call_nested.py
similarity index 100%
rename from lit-test/test/iodelay/error_call_nested.py
rename to artiq/test/lit/iodelay/error_call_nested.py
diff --git a/lit-test/test/iodelay/error_call_subst.py b/artiq/test/lit/iodelay/error_call_subst.py
similarity index 100%
rename from lit-test/test/iodelay/error_call_subst.py
rename to artiq/test/lit/iodelay/error_call_subst.py
diff --git a/lit-test/test/iodelay/error_control_flow.py b/artiq/test/lit/iodelay/error_control_flow.py
similarity index 100%
rename from lit-test/test/iodelay/error_control_flow.py
rename to artiq/test/lit/iodelay/error_control_flow.py
diff --git a/lit-test/test/iodelay/error_for.py b/artiq/test/lit/iodelay/error_for.py
similarity index 100%
rename from lit-test/test/iodelay/error_for.py
rename to artiq/test/lit/iodelay/error_for.py
diff --git a/lit-test/test/iodelay/error_goto.py b/artiq/test/lit/iodelay/error_goto.py
similarity index 100%
rename from lit-test/test/iodelay/error_goto.py
rename to artiq/test/lit/iodelay/error_goto.py
diff --git a/lit-test/test/iodelay/error_return.py b/artiq/test/lit/iodelay/error_return.py
similarity index 100%
rename from lit-test/test/iodelay/error_return.py
rename to artiq/test/lit/iodelay/error_return.py
diff --git a/lit-test/test/iodelay/error_unify.py b/artiq/test/lit/iodelay/error_unify.py
similarity index 100%
rename from lit-test/test/iodelay/error_unify.py
rename to artiq/test/lit/iodelay/error_unify.py
diff --git a/lit-test/test/iodelay/goto.py b/artiq/test/lit/iodelay/goto.py
similarity index 100%
rename from lit-test/test/iodelay/goto.py
rename to artiq/test/lit/iodelay/goto.py
diff --git a/lit-test/test/iodelay/linear.py b/artiq/test/lit/iodelay/linear.py
similarity index 100%
rename from lit-test/test/iodelay/linear.py
rename to artiq/test/lit/iodelay/linear.py
diff --git a/lit-test/test/iodelay/loop.py b/artiq/test/lit/iodelay/loop.py
similarity index 100%
rename from lit-test/test/iodelay/loop.py
rename to artiq/test/lit/iodelay/loop.py
diff --git a/lit-test/test/iodelay/order_invariance.py b/artiq/test/lit/iodelay/order_invariance.py
similarity index 100%
rename from lit-test/test/iodelay/order_invariance.py
rename to artiq/test/lit/iodelay/order_invariance.py
diff --git a/lit-test/test/iodelay/parallel.py b/artiq/test/lit/iodelay/parallel.py
similarity index 100%
rename from lit-test/test/iodelay/parallel.py
rename to artiq/test/lit/iodelay/parallel.py
diff --git a/lit-test/test/iodelay/range.py b/artiq/test/lit/iodelay/range.py
similarity index 100%
rename from lit-test/test/iodelay/range.py
rename to artiq/test/lit/iodelay/range.py
diff --git a/lit-test/test/iodelay/return.py b/artiq/test/lit/iodelay/return.py
similarity index 100%
rename from lit-test/test/iodelay/return.py
rename to artiq/test/lit/iodelay/return.py
diff --git a/lit-test/test/iodelay/sequential.py b/artiq/test/lit/iodelay/sequential.py
similarity index 100%
rename from lit-test/test/iodelay/sequential.py
rename to artiq/test/lit/iodelay/sequential.py
diff --git a/lit-test/test/lit.cfg b/artiq/test/lit/lit.cfg
similarity index 100%
rename from lit-test/test/lit.cfg
rename to artiq/test/lit/lit.cfg
diff --git a/lit-test/test/local_access/invalid_closure.py b/artiq/test/lit/local_access/invalid_closure.py
similarity index 100%
rename from lit-test/test/local_access/invalid_closure.py
rename to artiq/test/lit/local_access/invalid_closure.py
diff --git a/lit-test/test/local_access/invalid_flow.py b/artiq/test/lit/local_access/invalid_flow.py
similarity index 100%
rename from lit-test/test/local_access/invalid_flow.py
rename to artiq/test/lit/local_access/invalid_flow.py
diff --git a/lit-test/test/local_access/multiple_asgn.py b/artiq/test/lit/local_access/multiple_asgn.py
similarity index 100%
rename from lit-test/test/local_access/multiple_asgn.py
rename to artiq/test/lit/local_access/multiple_asgn.py
diff --git a/lit-test/test/local_access/parallel.py b/artiq/test/lit/local_access/parallel.py
similarity index 100%
rename from lit-test/test/local_access/parallel.py
rename to artiq/test/lit/local_access/parallel.py
diff --git a/lit-test/test/local_access/valid.py b/artiq/test/lit/local_access/valid.py
similarity index 100%
rename from lit-test/test/local_access/valid.py
rename to artiq/test/lit/local_access/valid.py
diff --git a/lit-test/test/monomorphism/integers.py b/artiq/test/lit/monomorphism/integers.py
similarity index 100%
rename from lit-test/test/monomorphism/integers.py
rename to artiq/test/lit/monomorphism/integers.py
diff --git a/lit-test/test/time/advance.py b/artiq/test/lit/time/advance.py
similarity index 100%
rename from lit-test/test/time/advance.py
rename to artiq/test/lit/time/advance.py
diff --git a/lit-test/test/time/advance_mu.py b/artiq/test/lit/time/advance_mu.py
similarity index 100%
rename from lit-test/test/time/advance_mu.py
rename to artiq/test/lit/time/advance_mu.py
diff --git a/lit-test/test/time/conversion.py b/artiq/test/lit/time/conversion.py
similarity index 100%
rename from lit-test/test/time/conversion.py
rename to artiq/test/lit/time/conversion.py
diff --git a/lit-test/test/time/watchdog.py b/artiq/test/lit/time/watchdog.py
similarity index 100%
rename from lit-test/test/time/watchdog.py
rename to artiq/test/lit/time/watchdog.py
diff --git a/lit-test/not.py b/artiq/test/not.py
similarity index 100%
rename from lit-test/not.py
rename to artiq/test/not.py
diff --git a/lit-test/libartiq_support/Makefile b/lit-test/libartiq_support/Makefile
deleted file mode 100644
index 0406dee63..000000000
--- a/lit-test/libartiq_support/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-CC ?= clang
-
-libartiq_support.so: ../../artiq/runtime/artiq_personality.c artiq_terminate.c artiq_time.c
-	$(CC) -std=c99 -Wall -Werror -I. -I../../artiq/runtime -g -fPIC -shared -o $@ $^