diff --git a/test/compiler/expressions/helper.rb b/test/soml/expressions/helper.rb
similarity index 100%
rename from test/compiler/expressions/helper.rb
rename to test/soml/expressions/helper.rb
diff --git a/test/compiler/expressions/test_all.rb b/test/soml/expressions/test_all.rb
similarity index 100%
rename from test/compiler/expressions/test_all.rb
rename to test/soml/expressions/test_all.rb
diff --git a/test/compiler/expressions/test_basic.rb b/test/soml/expressions/test_basic.rb
similarity index 100%
rename from test/compiler/expressions/test_basic.rb
rename to test/soml/expressions/test_basic.rb
diff --git a/test/compiler/expressions/test_call.rb b/test/soml/expressions/test_call.rb
similarity index 100%
rename from test/compiler/expressions/test_call.rb
rename to test/soml/expressions/test_call.rb
diff --git a/test/compiler/expressions/test_field_access.rb b/test/soml/expressions/test_field_access.rb
similarity index 100%
rename from test/compiler/expressions/test_field_access.rb
rename to test/soml/expressions/test_field_access.rb
diff --git a/test/compiler/expressions/test_ops.rb b/test/soml/expressions/test_ops.rb
similarity index 100%
rename from test/compiler/expressions/test_ops.rb
rename to test/soml/expressions/test_ops.rb
diff --git a/test/compiler/fragments/helper.rb b/test/soml/fragments/helper.rb
similarity index 100%
rename from test/compiler/fragments/helper.rb
rename to test/soml/fragments/helper.rb
diff --git a/test/compiler/fragments/test_all.rb b/test/soml/fragments/test_all.rb
similarity index 100%
rename from test/compiler/fragments/test_all.rb
rename to test/soml/fragments/test_all.rb
diff --git a/test/compiler/fragments/test_class.rb b/test/soml/fragments/test_class.rb
similarity index 100%
rename from test/compiler/fragments/test_class.rb
rename to test/soml/fragments/test_class.rb
diff --git a/test/compiler/fragments/test_functions.rb b/test/soml/fragments/test_functions.rb
similarity index 100%
rename from test/compiler/fragments/test_functions.rb
rename to test/soml/fragments/test_functions.rb
diff --git a/test/compiler/fragments/test_hello.rb b/test/soml/fragments/test_hello.rb
similarity index 100%
rename from test/compiler/fragments/test_hello.rb
rename to test/soml/fragments/test_hello.rb
diff --git a/test/compiler/fragments/test_if.rb b/test/soml/fragments/test_if.rb
similarity index 100%
rename from test/compiler/fragments/test_if.rb
rename to test/soml/fragments/test_if.rb
diff --git a/test/compiler/fragments/test_putint.rb b/test/soml/fragments/test_putint.rb
similarity index 100%
rename from test/compiler/fragments/test_putint.rb
rename to test/soml/fragments/test_putint.rb
diff --git a/test/compiler/fragments/test_recursive_fibo.rb b/test/soml/fragments/test_recursive_fibo.rb
similarity index 100%
rename from test/compiler/fragments/test_recursive_fibo.rb
rename to test/soml/fragments/test_recursive_fibo.rb
diff --git a/test/compiler/fragments/test_return.rb b/test/soml/fragments/test_return.rb
similarity index 100%
rename from test/compiler/fragments/test_return.rb
rename to test/soml/fragments/test_return.rb
diff --git a/test/compiler/fragments/test_while_fibo.rb b/test/soml/fragments/test_while_fibo.rb
similarity index 100%
rename from test/compiler/fragments/test_while_fibo.rb
rename to test/soml/fragments/test_while_fibo.rb
diff --git a/test/compiler/fragments/test_word.rb b/test/soml/fragments/test_word.rb
similarity index 100%
rename from test/compiler/fragments/test_word.rb
rename to test/soml/fragments/test_word.rb
diff --git a/test/parfait/helper.rb b/test/soml/parfait/helper.rb
similarity index 98%
rename from test/parfait/helper.rb
rename to test/soml/parfait/helper.rb
index 5e2c2c04..524a9b17 100644
--- a/test/parfait/helper.rb
+++ b/test/soml/parfait/helper.rb
@@ -1,4 +1,4 @@
-require_relative '../helper'
+require_relative '../../helper'
 require "register/interpreter"
 require "rye"
 Rye::Cmd.add_command :ld, '/usr/bin/ld'
diff --git a/test/parfait/test_all.rb b/test/soml/parfait/test_all.rb
similarity index 100%
rename from test/parfait/test_all.rb
rename to test/soml/parfait/test_all.rb
diff --git a/test/parfait/test_integer.rb b/test/soml/parfait/test_integer.rb
similarity index 100%
rename from test/parfait/test_integer.rb
rename to test/soml/parfait/test_integer.rb
diff --git a/test/parfait/test_layout.rb b/test/soml/parfait/test_layout.rb
similarity index 100%
rename from test/parfait/test_layout.rb
rename to test/soml/parfait/test_layout.rb
diff --git a/test/parfait/test_word.rb b/test/soml/parfait/test_word.rb
similarity index 100%
rename from test/parfait/test_word.rb
rename to test/soml/parfait/test_word.rb
diff --git a/test/compiler/statements/helper.rb b/test/soml/statements/helper.rb
similarity index 100%
rename from test/compiler/statements/helper.rb
rename to test/soml/statements/helper.rb
diff --git a/test/compiler/statements/test_all.rb b/test/soml/statements/test_all.rb
similarity index 100%
rename from test/compiler/statements/test_all.rb
rename to test/soml/statements/test_all.rb
diff --git a/test/compiler/statements/test_assign.rb b/test/soml/statements/test_assign.rb
similarity index 100%
rename from test/compiler/statements/test_assign.rb
rename to test/soml/statements/test_assign.rb
diff --git a/test/compiler/statements/test_call.rb b/test/soml/statements/test_call.rb
similarity index 100%
rename from test/compiler/statements/test_call.rb
rename to test/soml/statements/test_call.rb
diff --git a/test/compiler/statements/test_class.rb b/test/soml/statements/test_class.rb
similarity index 100%
rename from test/compiler/statements/test_class.rb
rename to test/soml/statements/test_class.rb
diff --git a/test/compiler/statements/test_fields.rb b/test/soml/statements/test_fields.rb
similarity index 100%
rename from test/compiler/statements/test_fields.rb
rename to test/soml/statements/test_fields.rb
diff --git a/test/compiler/statements/test_if.rb b/test/soml/statements/test_if.rb
similarity index 100%
rename from test/compiler/statements/test_if.rb
rename to test/soml/statements/test_if.rb
diff --git a/test/compiler/statements/test_return.rb b/test/soml/statements/test_return.rb
similarity index 100%
rename from test/compiler/statements/test_return.rb
rename to test/soml/statements/test_return.rb
diff --git a/test/compiler/statements/test_while.rb b/test/soml/statements/test_while.rb
similarity index 100%
rename from test/compiler/statements/test_while.rb
rename to test/soml/statements/test_while.rb
diff --git a/test/compiler/test_all.rb b/test/soml/test_all.rb
similarity index 76%
rename from test/compiler/test_all.rb
rename to test/soml/test_all.rb
index 272825eb..7ebaf9dd 100644
--- a/test/compiler/test_all.rb
+++ b/test/soml/test_all.rb
@@ -3,3 +3,5 @@ require_relative "expressions/test_all"
 require_relative "statements/test_all"
 
 require_relative "fragments/test_all"
+
+require_relative "parfait/test_all"
diff --git a/test/test_all.rb b/test/test_all.rb
index 4d1857b4..c565c0eb 100644
--- a/test/test_all.rb
+++ b/test/test_all.rb
@@ -1,7 +1,5 @@
-require_relative "compiler/test_all"
+require_relative "soml/test_all"
 
 require_relative "elf/test_all"
 
-require_relative "parfait/test_all"
-
 require_relative "register/test_all"