diff --git a/tests/regression/parser/Makefile b/parser/tst/Makefile
similarity index 100%
rename from tests/regression/parser/Makefile
rename to parser/tst/Makefile
diff --git a/tests/regression/parser/README b/parser/tst/README
similarity index 100%
rename from tests/regression/parser/README
rename to parser/tst/README
diff --git a/tests/regression/parser/simple.pl b/parser/tst/simple.pl
similarity index 100%
rename from tests/regression/parser/simple.pl
rename to parser/tst/simple.pl
diff --git a/tests/regression/parser/simple_tests/boolean_bad_1.sd b/parser/tst/simple_tests/boolean_bad_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_1.sd
rename to parser/tst/simple_tests/boolean_bad_1.sd
diff --git a/tests/regression/parser/simple_tests/boolean_bad_2.sd b/parser/tst/simple_tests/boolean_bad_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_2.sd
rename to parser/tst/simple_tests/boolean_bad_2.sd
diff --git a/tests/regression/parser/simple_tests/boolean_bad_3.sd b/parser/tst/simple_tests/boolean_bad_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_3.sd
rename to parser/tst/simple_tests/boolean_bad_3.sd
diff --git a/tests/regression/parser/simple_tests/boolean_bad_4.sd b/parser/tst/simple_tests/boolean_bad_4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_4.sd
rename to parser/tst/simple_tests/boolean_bad_4.sd
diff --git a/tests/regression/parser/simple_tests/boolean_bad_5.sd b/parser/tst/simple_tests/boolean_bad_5.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_5.sd
rename to parser/tst/simple_tests/boolean_bad_5.sd
diff --git a/tests/regression/parser/simple_tests/boolean_bad_6.sd b/parser/tst/simple_tests/boolean_bad_6.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_6.sd
rename to parser/tst/simple_tests/boolean_bad_6.sd
diff --git a/tests/regression/parser/simple_tests/boolean_bad_7.sd b/parser/tst/simple_tests/boolean_bad_7.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_7.sd
rename to parser/tst/simple_tests/boolean_bad_7.sd
diff --git a/tests/regression/parser/simple_tests/boolean_bad_8.sd b/parser/tst/simple_tests/boolean_bad_8.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_bad_8.sd
rename to parser/tst/simple_tests/boolean_bad_8.sd
diff --git a/tests/regression/parser/simple_tests/boolean_good_1.sd b/parser/tst/simple_tests/boolean_good_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/boolean_good_1.sd
rename to parser/tst/simple_tests/boolean_good_1.sd
diff --git a/tests/regression/parser/simple_tests/capabilities_ok.sd b/parser/tst/simple_tests/capabilities_ok.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/capabilities_ok.sd
rename to parser/tst/simple_tests/capabilities_ok.sd
diff --git a/tests/regression/parser/simple_tests/change_hat_new_style1.sd b/parser/tst/simple_tests/change_hat_new_style1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/change_hat_new_style1.sd
rename to parser/tst/simple_tests/change_hat_new_style1.sd
diff --git a/tests/regression/parser/simple_tests/change_hat_new_style2.sd b/parser/tst/simple_tests/change_hat_new_style2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/change_hat_new_style2.sd
rename to parser/tst/simple_tests/change_hat_new_style2.sd
diff --git a/tests/regression/parser/simple_tests/change_hat_old_style1.sd b/parser/tst/simple_tests/change_hat_old_style1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/change_hat_old_style1.sd
rename to parser/tst/simple_tests/change_hat_old_style1.sd
diff --git a/tests/regression/parser/simple_tests/change_hat_old_style2.sd b/parser/tst/simple_tests/change_hat_old_style2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/change_hat_old_style2.sd
rename to parser/tst/simple_tests/change_hat_old_style2.sd
diff --git a/tests/regression/parser/simple_tests/change_hat_old_style3.sd b/parser/tst/simple_tests/change_hat_old_style3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/change_hat_old_style3.sd
rename to parser/tst/simple_tests/change_hat_old_style3.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-1.sd b/parser/tst/simple_tests/conditional-else-if-1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-1.sd
rename to parser/tst/simple_tests/conditional-else-if-1.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-2.sd b/parser/tst/simple_tests/conditional-else-if-2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-2.sd
rename to parser/tst/simple_tests/conditional-else-if-2.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-3.sd b/parser/tst/simple_tests/conditional-else-if-3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-3.sd
rename to parser/tst/simple_tests/conditional-else-if-3.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-4.sd b/parser/tst/simple_tests/conditional-else-if-4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-4.sd
rename to parser/tst/simple_tests/conditional-else-if-4.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-5.sd b/parser/tst/simple_tests/conditional-else-if-5.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-5.sd
rename to parser/tst/simple_tests/conditional-else-if-5.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-6.sd b/parser/tst/simple_tests/conditional-else-if-6.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-6.sd
rename to parser/tst/simple_tests/conditional-else-if-6.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-7.sd b/parser/tst/simple_tests/conditional-else-if-7.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-7.sd
rename to parser/tst/simple_tests/conditional-else-if-7.sd
diff --git a/tests/regression/parser/simple_tests/conditional-else-if-8.sd b/parser/tst/simple_tests/conditional-else-if-8.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional-else-if-8.sd
rename to parser/tst/simple_tests/conditional-else-if-8.sd
diff --git a/tests/regression/parser/simple_tests/conditional_bad_1.sd b/parser/tst/simple_tests/conditional_bad_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_bad_1.sd
rename to parser/tst/simple_tests/conditional_bad_1.sd
diff --git a/tests/regression/parser/simple_tests/conditional_bad_2.sd b/parser/tst/simple_tests/conditional_bad_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_bad_2.sd
rename to parser/tst/simple_tests/conditional_bad_2.sd
diff --git a/tests/regression/parser/simple_tests/conditional_bad_3.sd b/parser/tst/simple_tests/conditional_bad_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_bad_3.sd
rename to parser/tst/simple_tests/conditional_bad_3.sd
diff --git a/tests/regression/parser/simple_tests/conditional_bad_dupe_hats_1.sd b/parser/tst/simple_tests/conditional_bad_dupe_hats_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_bad_dupe_hats_1.sd
rename to parser/tst/simple_tests/conditional_bad_dupe_hats_1.sd
diff --git a/tests/regression/parser/simple_tests/conditional_bad_dupe_hats_2.sd b/parser/tst/simple_tests/conditional_bad_dupe_hats_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_bad_dupe_hats_2.sd
rename to parser/tst/simple_tests/conditional_bad_dupe_hats_2.sd
diff --git a/tests/regression/parser/simple_tests/conditional_defined_1.sd b/parser/tst/simple_tests/conditional_defined_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_defined_1.sd
rename to parser/tst/simple_tests/conditional_defined_1.sd
diff --git a/tests/regression/parser/simple_tests/conditional_defined_2.sd b/parser/tst/simple_tests/conditional_defined_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_defined_2.sd
rename to parser/tst/simple_tests/conditional_defined_2.sd
diff --git a/tests/regression/parser/simple_tests/conditional_else_1.sd b/parser/tst/simple_tests/conditional_else_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_else_1.sd
rename to parser/tst/simple_tests/conditional_else_1.sd
diff --git a/tests/regression/parser/simple_tests/conditional_else_2.sd b/parser/tst/simple_tests/conditional_else_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_else_2.sd
rename to parser/tst/simple_tests/conditional_else_2.sd
diff --git a/tests/regression/parser/simple_tests/conditional_else_3.sd b/parser/tst/simple_tests/conditional_else_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_else_3.sd
rename to parser/tst/simple_tests/conditional_else_3.sd
diff --git a/tests/regression/parser/simple_tests/conditional_else_bad_1.sd b/parser/tst/simple_tests/conditional_else_bad_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_else_bad_1.sd
rename to parser/tst/simple_tests/conditional_else_bad_1.sd
diff --git a/tests/regression/parser/simple_tests/conditional_else_bad_2.sd b/parser/tst/simple_tests/conditional_else_bad_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_else_bad_2.sd
rename to parser/tst/simple_tests/conditional_else_bad_2.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_1.sd b/parser/tst/simple_tests/conditional_good_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_1.sd
rename to parser/tst/simple_tests/conditional_good_1.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_2.sd b/parser/tst/simple_tests/conditional_good_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_2.sd
rename to parser/tst/simple_tests/conditional_good_2.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_3.sd b/parser/tst/simple_tests/conditional_good_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_3.sd
rename to parser/tst/simple_tests/conditional_good_3.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_4.sd b/parser/tst/simple_tests/conditional_good_4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_4.sd
rename to parser/tst/simple_tests/conditional_good_4.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_5.sd b/parser/tst/simple_tests/conditional_good_5.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_5.sd
rename to parser/tst/simple_tests/conditional_good_5.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_6.sd b/parser/tst/simple_tests/conditional_good_6.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_6.sd
rename to parser/tst/simple_tests/conditional_good_6.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_7.sd b/parser/tst/simple_tests/conditional_good_7.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_7.sd
rename to parser/tst/simple_tests/conditional_good_7.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_8.sd b/parser/tst/simple_tests/conditional_good_8.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_8.sd
rename to parser/tst/simple_tests/conditional_good_8.sd
diff --git a/tests/regression/parser/simple_tests/conditional_good_9.sd b/parser/tst/simple_tests/conditional_good_9.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_good_9.sd
rename to parser/tst/simple_tests/conditional_good_9.sd
diff --git a/tests/regression/parser/simple_tests/conditional_stress_1.sd b/parser/tst/simple_tests/conditional_stress_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/conditional_stress_1.sd
rename to parser/tst/simple_tests/conditional_stress_1.sd
diff --git a/tests/regression/parser/simple_tests/dos_line_endings.sd b/parser/tst/simple_tests/dos_line_endings.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/dos_line_endings.sd
rename to parser/tst/simple_tests/dos_line_endings.sd
diff --git a/tests/regression/parser/simple_tests/flags_bad.sd b/parser/tst/simple_tests/flags_bad.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/flags_bad.sd
rename to parser/tst/simple_tests/flags_bad.sd
diff --git a/tests/regression/parser/simple_tests/flags_bad2.sd b/parser/tst/simple_tests/flags_bad2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/flags_bad2.sd
rename to parser/tst/simple_tests/flags_bad2.sd
diff --git a/tests/regression/parser/simple_tests/flags_bad3.sd b/parser/tst/simple_tests/flags_bad3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/flags_bad3.sd
rename to parser/tst/simple_tests/flags_bad3.sd
diff --git a/tests/regression/parser/simple_tests/flags_bad4.sd b/parser/tst/simple_tests/flags_bad4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/flags_bad4.sd
rename to parser/tst/simple_tests/flags_bad4.sd
diff --git a/tests/regression/parser/simple_tests/flags_hats_ok.sd b/parser/tst/simple_tests/flags_hats_ok.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/flags_hats_ok.sd
rename to parser/tst/simple_tests/flags_hats_ok.sd
diff --git a/tests/regression/parser/simple_tests/flags_ok.sd b/parser/tst/simple_tests/flags_ok.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/flags_ok.sd
rename to parser/tst/simple_tests/flags_ok.sd
diff --git a/tests/regression/parser/simple_tests/flags_ok_whitespace.sd b/parser/tst/simple_tests/flags_ok_whitespace.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/flags_ok_whitespace.sd
rename to parser/tst/simple_tests/flags_ok_whitespace.sd
diff --git a/tests/regression/parser/simple_tests/includes_bad_include.sd b/parser/tst/simple_tests/includes_bad_include.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/includes_bad_include.sd
rename to parser/tst/simple_tests/includes_bad_include.sd
diff --git a/tests/regression/parser/simple_tests/includes_bad_include2.sd b/parser/tst/simple_tests/includes_bad_include2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/includes_bad_include2.sd
rename to parser/tst/simple_tests/includes_bad_include2.sd
diff --git a/tests/regression/parser/simple_tests/includes_bad_include3.sd b/parser/tst/simple_tests/includes_bad_include3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/includes_bad_include3.sd
rename to parser/tst/simple_tests/includes_bad_include3.sd
diff --git a/tests/regression/parser/simple_tests/includes_bad_include4.sd b/parser/tst/simple_tests/includes_bad_include4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/includes_bad_include4.sd
rename to parser/tst/simple_tests/includes_bad_include4.sd
diff --git a/tests/regression/parser/simple_tests/includes_okay.sd b/parser/tst/simple_tests/includes_okay.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/includes_okay.sd
rename to parser/tst/simple_tests/includes_okay.sd
diff --git a/tests/regression/parser/simple_tests/includes_okay_helper.include b/parser/tst/simple_tests/includes_okay_helper.include
similarity index 100%
rename from tests/regression/parser/simple_tests/includes_okay_helper.include
rename to parser/tst/simple_tests/includes_okay_helper.include
diff --git a/tests/regression/parser/simple_tests/includes_recursive.sd b/parser/tst/simple_tests/includes_recursive.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/includes_recursive.sd
rename to parser/tst/simple_tests/includes_recursive.sd
diff --git a/tests/regression/parser/simple_tests/profile_basic_ok1.sd b/parser/tst/simple_tests/profile_basic_ok1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/profile_basic_ok1.sd
rename to parser/tst/simple_tests/profile_basic_ok1.sd
diff --git a/tests/regression/parser/simple_tests/profiles_dupe_1.sd b/parser/tst/simple_tests/profiles_dupe_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/profiles_dupe_1.sd
rename to parser/tst/simple_tests/profiles_dupe_1.sd
diff --git a/tests/regression/parser/simple_tests/profiles_dupe_2.sd b/parser/tst/simple_tests/profiles_dupe_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/profiles_dupe_2.sd
rename to parser/tst/simple_tests/profiles_dupe_2.sd
diff --git a/tests/regression/parser/simple_tests/profiles_dupe_3.sd b/parser/tst/simple_tests/profiles_dupe_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/profiles_dupe_3.sd
rename to parser/tst/simple_tests/profiles_dupe_3.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_embedded_spaces_1.sd b/parser/tst/simple_tests/simple_bad_embedded_spaces_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_embedded_spaces_1.sd
rename to parser/tst/simple_tests/simple_bad_embedded_spaces_1.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_hat_parsing.sd b/parser/tst/simple_tests/simple_bad_hat_parsing.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_hat_parsing.sd
rename to parser/tst/simple_tests/simple_bad_hat_parsing.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_no_bare_x.sd b/parser/tst/simple_tests/simple_bad_no_bare_x.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_no_bare_x.sd
rename to parser/tst/simple_tests/simple_bad_no_bare_x.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_no_close_brace1.sd b/parser/tst/simple_tests/simple_bad_no_close_brace1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_no_close_brace1.sd
rename to parser/tst/simple_tests/simple_bad_no_close_brace1.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_no_close_brace2.sd b/parser/tst/simple_tests/simple_bad_no_close_brace2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_no_close_brace2.sd
rename to parser/tst/simple_tests/simple_bad_no_close_brace2.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_no_close_brace3.sd b/parser/tst/simple_tests/simple_bad_no_close_brace3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_no_close_brace3.sd
rename to parser/tst/simple_tests/simple_bad_no_close_brace3.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_no_close_brace4.sd b/parser/tst/simple_tests/simple_bad_no_close_brace4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_no_close_brace4.sd
rename to parser/tst/simple_tests/simple_bad_no_close_brace4.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_no_opening_brace1.sd b/parser/tst/simple_tests/simple_bad_no_opening_brace1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_no_opening_brace1.sd
rename to parser/tst/simple_tests/simple_bad_no_opening_brace1.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_no_program_name.sd b/parser/tst/simple_tests/simple_bad_no_program_name.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_no_program_name.sd
rename to parser/tst/simple_tests/simple_bad_no_program_name.sd
diff --git a/tests/regression/parser/simple_tests/simple_bad_nomode.sd b/parser/tst/simple_tests/simple_bad_nomode.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_bad_nomode.sd
rename to parser/tst/simple_tests/simple_bad_nomode.sd
diff --git a/tests/regression/parser/simple_tests/simple_ok_embedded_spaces_1.sd b/parser/tst/simple_tests/simple_ok_embedded_spaces_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_ok_embedded_spaces_1.sd
rename to parser/tst/simple_tests/simple_ok_embedded_spaces_1.sd
diff --git a/tests/regression/parser/simple_tests/simple_ok_embedded_spaces_2.sd b/parser/tst/simple_tests/simple_ok_embedded_spaces_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_ok_embedded_spaces_2.sd
rename to parser/tst/simple_tests/simple_ok_embedded_spaces_2.sd
diff --git a/tests/regression/parser/simple_tests/simple_ok_embedded_spaces_3.sd b/parser/tst/simple_tests/simple_ok_embedded_spaces_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_ok_embedded_spaces_3.sd
rename to parser/tst/simple_tests/simple_ok_embedded_spaces_3.sd
diff --git a/tests/regression/parser/simple_tests/simple_ok_no_rules.sd b/parser/tst/simple_tests/simple_ok_no_rules.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/simple_ok_no_rules.sd
rename to parser/tst/simple_tests/simple_ok_no_rules.sd
diff --git a/tests/regression/parser/simple_tests/tcp_bad_interface.sd b/parser/tst/simple_tests/tcp_bad_interface.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_bad_interface.sd
rename to parser/tst/simple_tests/tcp_bad_interface.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_error1.sd b/parser/tst/simple_tests/tcp_client_error1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_error1.sd
rename to parser/tst/simple_tests/tcp_client_error1.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_error2.sd b/parser/tst/simple_tests/tcp_client_error2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_error2.sd
rename to parser/tst/simple_tests/tcp_client_error2.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_error3.sd b/parser/tst/simple_tests/tcp_client_error3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_error3.sd
rename to parser/tst/simple_tests/tcp_client_error3.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_error4.sd b/parser/tst/simple_tests/tcp_client_error4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_error4.sd
rename to parser/tst/simple_tests/tcp_client_error4.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_error5.sd b/parser/tst/simple_tests/tcp_client_error5.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_error5.sd
rename to parser/tst/simple_tests/tcp_client_error5.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_error6.sd b/parser/tst/simple_tests/tcp_client_error6.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_error6.sd
rename to parser/tst/simple_tests/tcp_client_error6.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_error7.sd b/parser/tst/simple_tests/tcp_client_error7.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_error7.sd
rename to parser/tst/simple_tests/tcp_client_error7.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_ok1.sd b/parser/tst/simple_tests/tcp_client_ok1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_ok1.sd
rename to parser/tst/simple_tests/tcp_client_ok1.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_ok2.sd b/parser/tst/simple_tests/tcp_client_ok2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_ok2.sd
rename to parser/tst/simple_tests/tcp_client_ok2.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_ok3.sd b/parser/tst/simple_tests/tcp_client_ok3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_ok3.sd
rename to parser/tst/simple_tests/tcp_client_ok3.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_ok4.sd b/parser/tst/simple_tests/tcp_client_ok4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_ok4.sd
rename to parser/tst/simple_tests/tcp_client_ok4.sd
diff --git a/tests/regression/parser/simple_tests/tcp_client_ok5.sd b/parser/tst/simple_tests/tcp_client_ok5.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_client_ok5.sd
rename to parser/tst/simple_tests/tcp_client_ok5.sd
diff --git a/tests/regression/parser/simple_tests/tcp_server_ok1.sd b/parser/tst/simple_tests/tcp_server_ok1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_server_ok1.sd
rename to parser/tst/simple_tests/tcp_server_ok1.sd
diff --git a/tests/regression/parser/simple_tests/tcp_server_ok2.sd b/parser/tst/simple_tests/tcp_server_ok2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_server_ok2.sd
rename to parser/tst/simple_tests/tcp_server_ok2.sd
diff --git a/tests/regression/parser/simple_tests/tcp_server_ok3.sd b/parser/tst/simple_tests/tcp_server_ok3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_server_ok3.sd
rename to parser/tst/simple_tests/tcp_server_ok3.sd
diff --git a/tests/regression/parser/simple_tests/tcp_server_ok4.sd b/parser/tst/simple_tests/tcp_server_ok4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/tcp_server_ok4.sd
rename to parser/tst/simple_tests/tcp_server_ok4.sd
diff --git a/tests/regression/parser/simple_tests/test1.sd b/parser/tst/simple_tests/test1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/test1.sd
rename to parser/tst/simple_tests/test1.sd
diff --git a/tests/regression/parser/simple_tests/test3.sd b/parser/tst/simple_tests/test3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/test3.sd
rename to parser/tst/simple_tests/test3.sd
diff --git a/tests/regression/parser/simple_tests/vars_assignment_reference_1.sd b/parser/tst/simple_tests/vars_assignment_reference_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_assignment_reference_1.sd
rename to parser/tst/simple_tests/vars_assignment_reference_1.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_1.sd b/parser/tst/simple_tests/vars_file_evaluation_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_1.sd
rename to parser/tst/simple_tests/vars_file_evaluation_1.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_10.sd b/parser/tst/simple_tests/vars_file_evaluation_10.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_10.sd
rename to parser/tst/simple_tests/vars_file_evaluation_10.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_11.sd b/parser/tst/simple_tests/vars_file_evaluation_11.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_11.sd
rename to parser/tst/simple_tests/vars_file_evaluation_11.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_12.sd b/parser/tst/simple_tests/vars_file_evaluation_12.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_12.sd
rename to parser/tst/simple_tests/vars_file_evaluation_12.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_13.sd b/parser/tst/simple_tests/vars_file_evaluation_13.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_13.sd
rename to parser/tst/simple_tests/vars_file_evaluation_13.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_14.sd b/parser/tst/simple_tests/vars_file_evaluation_14.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_14.sd
rename to parser/tst/simple_tests/vars_file_evaluation_14.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_2.sd b/parser/tst/simple_tests/vars_file_evaluation_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_2.sd
rename to parser/tst/simple_tests/vars_file_evaluation_2.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_3.sd b/parser/tst/simple_tests/vars_file_evaluation_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_3.sd
rename to parser/tst/simple_tests/vars_file_evaluation_3.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_4.sd b/parser/tst/simple_tests/vars_file_evaluation_4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_4.sd
rename to parser/tst/simple_tests/vars_file_evaluation_4.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_5.sd b/parser/tst/simple_tests/vars_file_evaluation_5.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_5.sd
rename to parser/tst/simple_tests/vars_file_evaluation_5.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_6.sd b/parser/tst/simple_tests/vars_file_evaluation_6.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_6.sd
rename to parser/tst/simple_tests/vars_file_evaluation_6.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_7.sd b/parser/tst/simple_tests/vars_file_evaluation_7.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_7.sd
rename to parser/tst/simple_tests/vars_file_evaluation_7.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_8.sd b/parser/tst/simple_tests/vars_file_evaluation_8.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_8.sd
rename to parser/tst/simple_tests/vars_file_evaluation_8.sd
diff --git a/tests/regression/parser/simple_tests/vars_file_evaluation_9.sd b/parser/tst/simple_tests/vars_file_evaluation_9.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_file_evaluation_9.sd
rename to parser/tst/simple_tests/vars_file_evaluation_9.sd
diff --git a/tests/regression/parser/simple_tests/vars_reassignment_1.sd b/parser/tst/simple_tests/vars_reassignment_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_reassignment_1.sd
rename to parser/tst/simple_tests/vars_reassignment_1.sd
diff --git a/tests/regression/parser/simple_tests/vars_recursion_1.sd b/parser/tst/simple_tests/vars_recursion_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_recursion_1.sd
rename to parser/tst/simple_tests/vars_recursion_1.sd
diff --git a/tests/regression/parser/simple_tests/vars_recursion_2.sd b/parser/tst/simple_tests/vars_recursion_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_recursion_2.sd
rename to parser/tst/simple_tests/vars_recursion_2.sd
diff --git a/tests/regression/parser/simple_tests/vars_recursion_3.sd b/parser/tst/simple_tests/vars_recursion_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_recursion_3.sd
rename to parser/tst/simple_tests/vars_recursion_3.sd
diff --git a/tests/regression/parser/simple_tests/vars_recursion_4.sd b/parser/tst/simple_tests/vars_recursion_4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_recursion_4.sd
rename to parser/tst/simple_tests/vars_recursion_4.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_1.sd b/parser/tst/simple_tests/vars_simple_assignment_1.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_1.sd
rename to parser/tst/simple_tests/vars_simple_assignment_1.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_10.sd b/parser/tst/simple_tests/vars_simple_assignment_10.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_10.sd
rename to parser/tst/simple_tests/vars_simple_assignment_10.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_11.sd b/parser/tst/simple_tests/vars_simple_assignment_11.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_11.sd
rename to parser/tst/simple_tests/vars_simple_assignment_11.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_12.sd b/parser/tst/simple_tests/vars_simple_assignment_12.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_12.sd
rename to parser/tst/simple_tests/vars_simple_assignment_12.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_2.sd b/parser/tst/simple_tests/vars_simple_assignment_2.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_2.sd
rename to parser/tst/simple_tests/vars_simple_assignment_2.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_3.sd b/parser/tst/simple_tests/vars_simple_assignment_3.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_3.sd
rename to parser/tst/simple_tests/vars_simple_assignment_3.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_4.sd b/parser/tst/simple_tests/vars_simple_assignment_4.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_4.sd
rename to parser/tst/simple_tests/vars_simple_assignment_4.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_5.sd b/parser/tst/simple_tests/vars_simple_assignment_5.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_5.sd
rename to parser/tst/simple_tests/vars_simple_assignment_5.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_6.sd b/parser/tst/simple_tests/vars_simple_assignment_6.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_6.sd
rename to parser/tst/simple_tests/vars_simple_assignment_6.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_7.sd b/parser/tst/simple_tests/vars_simple_assignment_7.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_7.sd
rename to parser/tst/simple_tests/vars_simple_assignment_7.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_8.sd b/parser/tst/simple_tests/vars_simple_assignment_8.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_8.sd
rename to parser/tst/simple_tests/vars_simple_assignment_8.sd
diff --git a/tests/regression/parser/simple_tests/vars_simple_assignment_9.sd b/parser/tst/simple_tests/vars_simple_assignment_9.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_simple_assignment_9.sd
rename to parser/tst/simple_tests/vars_simple_assignment_9.sd
diff --git a/tests/regression/parser/simple_tests/vars_stress_01.sd b/parser/tst/simple_tests/vars_stress_01.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_stress_01.sd
rename to parser/tst/simple_tests/vars_stress_01.sd
diff --git a/tests/regression/parser/simple_tests/vars_stress_02.sd b/parser/tst/simple_tests/vars_stress_02.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_stress_02.sd
rename to parser/tst/simple_tests/vars_stress_02.sd
diff --git a/tests/regression/parser/simple_tests/vars_stress_03.sd b/parser/tst/simple_tests/vars_stress_03.sd
similarity index 100%
rename from tests/regression/parser/simple_tests/vars_stress_03.sd
rename to parser/tst/simple_tests/vars_stress_03.sd
diff --git a/tests/regression/parser/uservars.conf b/parser/tst/uservars.conf
similarity index 100%
rename from tests/regression/parser/uservars.conf
rename to parser/tst/uservars.conf