Move functional test files to new structure

157 files changed, 11 insertions, 11 deletions

diff --git a/tests/functional/a/assign/assign_to_new_keyword.py b/tests/functional/a/assign_to_new_keyword.py
index c5a23ca95..c5a23ca95 100644
--- a/tests/functional/a/assign/assign_to_new_keyword.py
+++ b/tests/functional/a/assign_to_new_keyword.py
diff --git a/tests/functional/a/assign/assign_to_new_keyword.rc b/tests/functional/a/assign_to_new_keyword.rc
index d83e35df8..d83e35df8 100644
--- a/tests/functional/a/assign/assign_to_new_keyword.rc
+++ b/tests/functional/a/assign_to_new_keyword.rc
diff --git a/tests/functional/a/assign/assign_to_new_keyword.txt b/tests/functional/a/assign_to_new_keyword.txt
index c6c92c1dd..c6c92c1dd 100644
--- a/tests/functional/a/assign/assign_to_new_keyword.txt
+++ b/tests/functional/a/assign_to_new_keyword.txt
diff --git a/tests/functional/a/assign/assigning_non_slot.py b/tests/functional/a/assigning/assigning_non_slot.py
index 2cd1483e0..2cd1483e0 100644
--- a/tests/functional/a/assign/assigning_non_slot.py
+++ b/tests/functional/a/assigning/assigning_non_slot.py
diff --git a/tests/functional/a/assign/assigning_non_slot.txt b/tests/functional/a/assigning/assigning_non_slot.txt
index 8b170e088..8b170e088 100644
--- a/tests/functional/a/assign/assigning_non_slot.txt
+++ b/tests/functional/a/assigning/assigning_non_slot.txt
diff --git a/tests/functional/a/assign/assigning_non_slot_4509.py b/tests/functional/a/assigning/assigning_non_slot_4509.py
index 797c6b083..797c6b083 100644
--- a/tests/functional/a/assign/assigning_non_slot_4509.py
+++ b/tests/functional/a/assigning/assigning_non_slot_4509.py
diff --git a/tests/functional/a/assign/assigning_non_slot_4509.rc b/tests/functional/a/assigning/assigning_non_slot_4509.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/a/assign/assigning_non_slot_4509.rc
+++ b/tests/functional/a/assigning/assigning_non_slot_4509.rc
diff --git a/tests/functional/a/assign/assigning_non_slot_4509.txt b/tests/functional/a/assigning/assigning_non_slot_4509.txt
index ff25a141a..ff25a141a 100644
--- a/tests/functional/a/assign/assigning_non_slot_4509.txt
+++ b/tests/functional/a/assigning/assigning_non_slot_4509.txt
diff --git a/tests/functional/a/assign/assignment_expression.py b/tests/functional/a/assignment/assignment_expression.py
index 3bfb5d488..3bfb5d488 100644
--- a/tests/functional/a/assign/assignment_expression.py
+++ b/tests/functional/a/assignment/assignment_expression.py
diff --git a/tests/functional/a/assign/assignment_expression.rc b/tests/functional/a/assignment/assignment_expression.rc
index 85fc502b3..85fc502b3 100644
--- a/tests/functional/a/assign/assignment_expression.rc
+++ b/tests/functional/a/assignment/assignment_expression.rc
diff --git a/tests/functional/a/assign/assignment_expression.txt b/tests/functional/a/assignment/assignment_expression.txt
index 23fb5c394..23fb5c394 100644
--- a/tests/functional/a/assign/assignment_expression.txt
+++ b/tests/functional/a/assignment/assignment_expression.txt
diff --git a/tests/functional/a/assign/assignment_from_no_return.py b/tests/functional/a/assignment/assignment_from_no_return.py
index 5415f6097..5415f6097 100644
--- a/tests/functional/a/assign/assignment_from_no_return.py
+++ b/tests/functional/a/assignment/assignment_from_no_return.py
diff --git a/tests/functional/a/assign/assignment_from_no_return.txt b/tests/functional/a/assignment/assignment_from_no_return.txt
index a48e2b22b..a48e2b22b 100644
--- a/tests/functional/a/assign/assignment_from_no_return.txt
+++ b/tests/functional/a/assignment/assignment_from_no_return.txt
diff --git a/tests/functional/a/assign/assignment_from_no_return_2.py b/tests/functional/a/assignment/assignment_from_no_return_2.py
index fd1489dbc..fd1489dbc 100644
--- a/tests/functional/a/assign/assignment_from_no_return_2.py
+++ b/tests/functional/a/assignment/assignment_from_no_return_2.py
diff --git a/tests/functional/a/assign/assignment_from_no_return_2.txt b/tests/functional/a/assignment/assignment_from_no_return_2.txt
index b6aec14da..b6aec14da 100644
--- a/tests/functional/a/assign/assignment_from_no_return_2.txt
+++ b/tests/functional/a/assignment/assignment_from_no_return_2.txt
diff --git a/tests/functional/a/assign/assignment_from_no_return_py3.py b/tests/functional/a/assignment/assignment_from_no_return_py3.py
index cb6dcd962..cb6dcd962 100644
--- a/tests/functional/a/assign/assignment_from_no_return_py3.py
+++ b/tests/functional/a/assignment/assignment_from_no_return_py3.py
diff --git a/tests/functional/d/deprecated/dataclass_typecheck.py b/tests/functional/d/dataclass_typecheck.py
index 0de6e43b3..0de6e43b3 100644
--- a/tests/functional/d/deprecated/dataclass_typecheck.py
+++ b/tests/functional/d/dataclass_typecheck.py
diff --git a/tests/functional/d/deprecated/dataclass_typecheck.rc b/tests/functional/d/dataclass_typecheck.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/d/deprecated/dataclass_typecheck.rc
+++ b/tests/functional/d/dataclass_typecheck.rc
diff --git a/tests/functional/d/deprecated/dataclass_typecheck.txt b/tests/functional/d/dataclass_typecheck.txt
index e898c85fa..e898c85fa 100644
--- a/tests/functional/d/deprecated/dataclass_typecheck.txt
+++ b/tests/functional/d/dataclass_typecheck.txt
diff --git a/tests/functional/i/import_error.py b/tests/functional/i/import_error.py
index a2183fcfb..2ce63544b 100644
--- a/tests/functional/i/import_error.py
+++ b/tests/functional/i/import_error.py
@@ -30,7 +30,7 @@ except ImportError:
     pass
 
 
-from functional.s.syntax_error import toto  # [no-name-in-module,syntax-error]
+from functional.s.syntax.syntax_error import toto  # [no-name-in-module,syntax-error]
 
 
 # Don't emit `import-error` or `no-name-in-module`
diff --git a/tests/functional/i/import_error.txt b/tests/functional/i/import_error.txt
index 4e7ab2423..28e94dc72 100644
--- a/tests/functional/i/import_error.txt
+++ b/tests/functional/i/import_error.txt
@@ -1,5 +1,5 @@
 import-error:3:0:3:22::Unable to import 'totally_missing':UNDEFINED
 import-error:21:4:21:26::Unable to import 'maybe_missing_2':UNDEFINED
-no-name-in-module:33:0:33:42::No name 'syntax_error' in module 'functional.s':UNDEFINED
-syntax-error:33:0:None:None::Cannot import 'functional.s.syntax_error' due to syntax error 'invalid syntax (<unknown>, line 1)':UNDEFINED
+no-name-in-module:33:0:33:49::No name 'syntax_error' in module 'functional.s.syntax':UNDEFINED
+syntax-error:33:0:None:None::Cannot import 'functional.s.syntax.syntax_error' due to syntax error 'invalid syntax (<unknown>, line 1)':UNDEFINED
 multiple-imports:78:0:78:15::Multiple imports on one line (foo, bar):UNDEFINED
diff --git a/tests/functional/i/invalid/b/invalid_bool_returned.py b/tests/functional/i/invalid/invalid_bool_returned.py
index 0e68ed263..0e68ed263 100644
--- a/tests/functional/i/invalid/b/invalid_bool_returned.py
+++ b/tests/functional/i/invalid/invalid_bool_returned.py
diff --git a/tests/functional/i/invalid/b/invalid_bool_returned.txt b/tests/functional/i/invalid/invalid_bool_returned.txt
index 616209139..616209139 100644
--- a/tests/functional/i/invalid/b/invalid_bool_returned.txt
+++ b/tests/functional/i/invalid/invalid_bool_returned.txt
diff --git a/tests/functional/i/invalid/b/invalid_bytes_returned.py b/tests/functional/i/invalid/invalid_bytes_returned.py
index 703fea278..703fea278 100644
--- a/tests/functional/i/invalid/b/invalid_bytes_returned.py
+++ b/tests/functional/i/invalid/invalid_bytes_returned.py
diff --git a/tests/functional/i/invalid/b/invalid_bytes_returned.txt b/tests/functional/i/invalid/invalid_bytes_returned.txt
index 9d8f0ece6..9d8f0ece6 100644
--- a/tests/functional/i/invalid/b/invalid_bytes_returned.txt
+++ b/tests/functional/i/invalid/invalid_bytes_returned.txt
diff --git a/tests/functional/i/invalid/e/invalid_envvar_value.py b/tests/functional/i/invalid/invalid_envvar_value.py
index 3c1a8882b..3c1a8882b 100644
--- a/tests/functional/i/invalid/e/invalid_envvar_value.py
+++ b/tests/functional/i/invalid/invalid_envvar_value.py
diff --git a/tests/functional/i/invalid/e/invalid_envvar_value.txt b/tests/functional/i/invalid/invalid_envvar_value.txt
index 21a20826e..21a20826e 100644
--- a/tests/functional/i/invalid/e/invalid_envvar_value.txt
+++ b/tests/functional/i/invalid/invalid_envvar_value.txt
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_caught.py b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.py
index c0298a06e..c0298a06e 100644
--- a/tests/functional/i/invalid/e/invalid_exceptions_caught.py
+++ b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.py
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_caught.rc b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.rc
index 6a8ee96ca..6a8ee96ca 100644
--- a/tests/functional/i/invalid/e/invalid_exceptions_caught.rc
+++ b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.rc
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_caught.txt b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.txt
index 3c906b661..3c906b661 100644
--- a/tests/functional/i/invalid/e/invalid_exceptions_caught.txt
+++ b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.txt
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_raised.py b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.py
index 475326545..475326545 100644
--- a/tests/functional/i/invalid/e/invalid_exceptions_raised.py
+++ b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.py
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_raised.txt b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.txt
index 9e8e7ae00..9e8e7ae00 100644
--- a/tests/functional/i/invalid/e/invalid_exceptions_raised.txt
+++ b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.txt
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.py b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.py
index ad94b8805..ad94b8805 100644
--- a/tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.py
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.py
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.txt b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
index 198808e79..198808e79 100644
--- a/tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.txt
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_returned.py b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.py
index ee5305fe8..ee5305fe8 100644
--- a/tests/functional/i/invalid/g/invalid_getnewargs_returned.py
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.py
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_returned.txt b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt
index 1c719317d..1c719317d 100644
--- a/tests/functional/i/invalid/g/invalid_getnewargs_returned.txt
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt
diff --git a/tests/functional/i/invalid/l/invalid_length_hint_returned.py b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.py
index 7696bc9fd..7696bc9fd 100644
--- a/tests/functional/i/invalid/l/invalid_length_hint_returned.py
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.py
diff --git a/tests/functional/i/invalid/l/invalid_length_hint_returned.txt b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
index 2447d0743..2447d0743 100644
--- a/tests/functional/i/invalid/l/invalid_length_hint_returned.txt
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
diff --git a/tests/functional/i/invalid/l/invalid_length_returned.py b/tests/functional/i/invalid/invalid_length/invalid_length_returned.py
index 99af28d1c..99af28d1c 100644
--- a/tests/functional/i/invalid/l/invalid_length_returned.py
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_returned.py
diff --git a/tests/functional/i/invalid/l/invalid_length_returned.txt b/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt
index 776945e34..776945e34 100644
--- a/tests/functional/i/invalid/l/invalid_length_returned.txt
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt
diff --git a/tests/functional/i/invalid/m/invalid_metaclass.py b/tests/functional/i/invalid/invalid_metaclass.py
index ec251e47d..ec251e47d 100644
--- a/tests/functional/i/invalid/m/invalid_metaclass.py
+++ b/tests/functional/i/invalid/invalid_metaclass.py
diff --git a/tests/functional/i/invalid/m/invalid_metaclass.txt b/tests/functional/i/invalid/invalid_metaclass.txt
index c5ca48d76..c5ca48d76 100644
--- a/tests/functional/i/invalid/m/invalid_metaclass.txt
+++ b/tests/functional/i/invalid/invalid_metaclass.txt
diff --git a/tests/functional/i/invalid/m/invalid_metaclass_py3.py b/tests/functional/i/invalid/invalid_metaclass_py3.py
index 2fc458f5c..2fc458f5c 100644
--- a/tests/functional/i/invalid/m/invalid_metaclass_py3.py
+++ b/tests/functional/i/invalid/invalid_metaclass_py3.py
diff --git a/tests/functional/i/invalid/invalid_name_issue_3405.py b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.py
index 9b0dd37cd..9b0dd37cd 100644
--- a/tests/functional/i/invalid/invalid_name_issue_3405.py
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.py
diff --git a/tests/functional/i/invalid/invalid_name_issue_3405.rc b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc
index c8bdd0efd..c8bdd0efd 100644
--- a/tests/functional/i/invalid/invalid_name_issue_3405.rc
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc
diff --git a/tests/functional/i/invalid/invalid_name_issue_3405.txt b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.txt
index c2a936a95..c2a936a95 100644
--- a/tests/functional/i/invalid/invalid_name_issue_3405.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.txt
diff --git a/tests/functional/i/invalid/invalid_name_module_level.py b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.py
index 355969f39..355969f39 100644
--- a/tests/functional/i/invalid/invalid_name_module_level.py
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.py
diff --git a/tests/functional/i/invalid/invalid_name_module_level.txt b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt
index 1d51c6b67..1d51c6b67 100644
--- a/tests/functional/i/invalid/invalid_name_module_level.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt
diff --git a/tests/functional/i/invalid/invalid_name_multinaming_style.py b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.py
index 561a15472..561a15472 100644
--- a/tests/functional/i/invalid/invalid_name_multinaming_style.py
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.py
diff --git a/tests/functional/i/invalid/invalid_name_multinaming_style.rc b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.rc
index d513cfbff..d513cfbff 100644
--- a/tests/functional/i/invalid/invalid_name_multinaming_style.rc
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.rc
diff --git a/tests/functional/i/invalid/invalid_name_multinaming_style.txt b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt
index f948f4815..f948f4815 100644
--- a/tests/functional/i/invalid/invalid_name_multinaming_style.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt
diff --git a/tests/functional/i/invalid/invalid_name_property.py b/tests/functional/i/invalid/invalid_name/invalid_name_property.py
index 9de2378bd..9de2378bd 100644
--- a/tests/functional/i/invalid/invalid_name_property.py
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_property.py
diff --git a/tests/functional/i/invalid/invalid_name_property.rc b/tests/functional/i/invalid/invalid_name/invalid_name_property.rc
index ae806d83b..ae806d83b 100644
--- a/tests/functional/i/invalid/invalid_name_property.rc
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_property.rc
diff --git a/tests/functional/i/invalid/invalid_name_property.txt b/tests/functional/i/invalid/invalid_name/invalid_name_property.txt
index dfbc2f465..dfbc2f465 100644
--- a/tests/functional/i/invalid/invalid_name_property.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_property.txt
diff --git a/tests/functional/i/invalid/s/invalid_sequence_index.py b/tests/functional/i/invalid/invalid_sequence_index.py
index 36a0fae22..36a0fae22 100644
--- a/tests/functional/i/invalid/s/invalid_sequence_index.py
+++ b/tests/functional/i/invalid/invalid_sequence_index.py
diff --git a/tests/functional/i/invalid/s/invalid_sequence_index.txt b/tests/functional/i/invalid/invalid_sequence_index.txt
index dc04046be..dc04046be 100644
--- a/tests/functional/i/invalid/s/invalid_sequence_index.txt
+++ b/tests/functional/i/invalid/invalid_sequence_index.txt
diff --git a/tests/functional/i/invalid/s/invalid_slice_index.py b/tests/functional/i/invalid/invalid_slice_index.py
index 1eb2fda9c..1eb2fda9c 100644
--- a/tests/functional/i/invalid/s/invalid_slice_index.py
+++ b/tests/functional/i/invalid/invalid_slice_index.py
diff --git a/tests/functional/i/invalid/s/invalid_slice_index.txt b/tests/functional/i/invalid/invalid_slice_index.txt
index 97754e840..97754e840 100644
--- a/tests/functional/i/invalid/s/invalid_slice_index.txt
+++ b/tests/functional/i/invalid/invalid_slice_index.txt
diff --git a/tests/functional/i/invalid/s/invalid_star_assignment_target.py b/tests/functional/i/invalid/invalid_star_assignment_target.py
index 452f9a728..452f9a728 100644
--- a/tests/functional/i/invalid/s/invalid_star_assignment_target.py
+++ b/tests/functional/i/invalid/invalid_star_assignment_target.py
diff --git a/tests/functional/i/invalid/s/invalid_star_assignment_target.txt b/tests/functional/i/invalid/invalid_star_assignment_target.txt
index 657bbc3bb..657bbc3bb 100644
--- a/tests/functional/i/invalid/s/invalid_star_assignment_target.txt
+++ b/tests/functional/i/invalid/invalid_star_assignment_target.txt
diff --git a/tests/functional/i/invalid/s/invalid_str_returned.py b/tests/functional/i/invalid/invalid_str_returned.py
index 00ef22046..00ef22046 100644
--- a/tests/functional/i/invalid/s/invalid_str_returned.py
+++ b/tests/functional/i/invalid/invalid_str_returned.py
diff --git a/tests/functional/i/invalid/s/invalid_str_returned.txt b/tests/functional/i/invalid/invalid_str_returned.txt
index 522fdb9bf..522fdb9bf 100644
--- a/tests/functional/i/invalid/s/invalid_str_returned.txt
+++ b/tests/functional/i/invalid/invalid_str_returned.txt
diff --git a/tests/functional/m/member/membership_protocol.py b/tests/functional/m/membership_protocol.py
index e5efc8916..e5efc8916 100644
--- a/tests/functional/m/member/membership_protocol.py
+++ b/tests/functional/m/membership_protocol.py
diff --git a/tests/functional/m/member/membership_protocol.txt b/tests/functional/m/membership_protocol.txt
index 74d83e7ee..74d83e7ee 100644
--- a/tests/functional/m/member/membership_protocol.txt
+++ b/tests/functional/m/membership_protocol.txt
diff --git a/tests/functional/m/member/membership_protocol_py3.py b/tests/functional/m/membership_protocol_py3.py
index 678072354..678072354 100644
--- a/tests/functional/m/member/membership_protocol_py3.py
+++ b/tests/functional/m/membership_protocol_py3.py
diff --git a/tests/functional/m/member/membership_protocol_py3.txt b/tests/functional/m/membership_protocol_py3.txt
index cd64a4d29..cd64a4d29 100644
--- a/tests/functional/m/member/membership_protocol_py3.txt
+++ b/tests/functional/m/membership_protocol_py3.txt
diff --git a/tests/functional/n/name/namePresetCamelCase.py b/tests/functional/n/namePresetCamelCase.py
index e048ec4d8..e048ec4d8 100644
--- a/tests/functional/n/name/namePresetCamelCase.py
+++ b/tests/functional/n/namePresetCamelCase.py
diff --git a/tests/functional/n/name/namePresetCamelCase.rc b/tests/functional/n/namePresetCamelCase.rc
index 29f44504a..29f44504a 100644
--- a/tests/functional/n/name/namePresetCamelCase.rc
+++ b/tests/functional/n/namePresetCamelCase.rc
diff --git a/tests/functional/n/name/namePresetCamelCase.txt b/tests/functional/n/namePresetCamelCase.txt
index 7b9ec8623..7b9ec8623 100644
--- a/tests/functional/n/name/namePresetCamelCase.txt
+++ b/tests/functional/n/namePresetCamelCase.txt
diff --git a/tests/functional/n/name/namedtuple_member_inference.py b/tests/functional/n/namedtuple_member_inference.py
index 4488ceb0a..4488ceb0a 100644
--- a/tests/functional/n/name/namedtuple_member_inference.py
+++ b/tests/functional/n/namedtuple_member_inference.py
diff --git a/tests/functional/n/name/namedtuple_member_inference.txt b/tests/functional/n/namedtuple_member_inference.txt
index c4e778359..c4e778359 100644
--- a/tests/functional/n/name/namedtuple_member_inference.txt
+++ b/tests/functional/n/namedtuple_member_inference.txt
diff --git a/tests/functional/n/name/names_in__all__.py b/tests/functional/n/names_in__all__.py
index c5d17cd80..c5d17cd80 100644
--- a/tests/functional/n/name/names_in__all__.py
+++ b/tests/functional/n/names_in__all__.py
diff --git a/tests/functional/n/name/names_in__all__.txt b/tests/functional/n/names_in__all__.txt
index 72a11c50b..72a11c50b 100644
--- a/tests/functional/n/name/names_in__all__.txt
+++ b/tests/functional/n/names_in__all__.txt
diff --git a/tests/functional/n/non_ascii_import/non_ascii_name_loł.py b/tests/functional/n/non_ascii_name/non_ascii_name_loł.py
index bc59418e1..bc59418e1 100644
--- a/tests/functional/n/non_ascii_import/non_ascii_name_loł.py
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_loł.py
diff --git a/tests/functional/n/non_ascii_import/non_ascii_name_loł.txt b/tests/functional/n/non_ascii_name/non_ascii_name_loł.txt
index eefaa197a..eefaa197a 100644
--- a/tests/functional/n/non_ascii_import/non_ascii_name_loł.txt
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_loł.txt
diff --git a/tests/functional/r/raise/raise_missing_from.py b/tests/functional/r/raise_missing_from.py
index d23cefb5e..d23cefb5e 100644
--- a/tests/functional/r/raise/raise_missing_from.py
+++ b/tests/functional/r/raise_missing_from.py
diff --git a/tests/functional/r/raise/raise_missing_from.txt b/tests/functional/r/raise_missing_from.txt
index 1e163ed56..1e163ed56 100644
--- a/tests/functional/r/raise/raise_missing_from.txt
+++ b/tests/functional/r/raise_missing_from.txt
diff --git a/tests/functional/r/raise/raising_bad_type.py b/tests/functional/r/raising/raising_bad_type.py
index cef109d47..cef109d47 100644
--- a/tests/functional/r/raise/raising_bad_type.py
+++ b/tests/functional/r/raising/raising_bad_type.py
diff --git a/tests/functional/r/raise/raising_bad_type.txt b/tests/functional/r/raising/raising_bad_type.txt
index 28fcfadc6..28fcfadc6 100644
--- a/tests/functional/r/raise/raising_bad_type.txt
+++ b/tests/functional/r/raising/raising_bad_type.txt
diff --git a/tests/functional/r/raise/raising_format_tuple.py b/tests/functional/r/raising/raising_format_tuple.py
index 268d834f4..268d834f4 100644
--- a/tests/functional/r/raise/raising_format_tuple.py
+++ b/tests/functional/r/raising/raising_format_tuple.py
diff --git a/tests/functional/r/raise/raising_format_tuple.txt b/tests/functional/r/raising/raising_format_tuple.txt
index 5f9283bb1..5f9283bb1 100644
--- a/tests/functional/r/raise/raising_format_tuple.txt
+++ b/tests/functional/r/raising/raising_format_tuple.txt
diff --git a/tests/functional/r/raise/raising_non_exception.py b/tests/functional/r/raising/raising_non_exception.py
index 7961c5220..7961c5220 100644
--- a/tests/functional/r/raise/raising_non_exception.py
+++ b/tests/functional/r/raising/raising_non_exception.py
diff --git a/tests/functional/r/raise/raising_non_exception.txt b/tests/functional/r/raising/raising_non_exception.txt
index efa816a5f..efa816a5f 100644
--- a/tests/functional/r/raise/raising_non_exception.txt
+++ b/tests/functional/r/raising/raising_non_exception.txt
diff --git a/tests/functional/r/raise/raising_self.py b/tests/functional/r/raising/raising_self.py
index 16f244ba5..16f244ba5 100644
--- a/tests/functional/r/raise/raising_self.py
+++ b/tests/functional/r/raising/raising_self.py
diff --git a/tests/functional/r/redefined_argument_from_local.py b/tests/functional/r/redefined/redefined_argument_from_local.py
index 7ccff1d18..7ccff1d18 100644
--- a/tests/functional/r/redefined_argument_from_local.py
+++ b/tests/functional/r/redefined/redefined_argument_from_local.py
diff --git a/tests/functional/r/redefined_argument_from_local.txt b/tests/functional/r/redefined/redefined_argument_from_local.txt
index acec66975..acec66975 100644
--- a/tests/functional/r/redefined_argument_from_local.txt
+++ b/tests/functional/r/redefined/redefined_argument_from_local.txt
diff --git a/tests/functional/r/redefined_builtin.py b/tests/functional/r/redefined/redefined_builtin.py
index 47d4e35ba..47d4e35ba 100644
--- a/tests/functional/r/redefined_builtin.py
+++ b/tests/functional/r/redefined/redefined_builtin.py
diff --git a/tests/functional/r/redefined_builtin.rc b/tests/functional/r/redefined/redefined_builtin.rc
index cb6fb1093..cb6fb1093 100644
--- a/tests/functional/r/redefined_builtin.rc
+++ b/tests/functional/r/redefined/redefined_builtin.rc
diff --git a/tests/functional/r/redefined_builtin.txt b/tests/functional/r/redefined/redefined_builtin.txt
index eb4b14101..eb4b14101 100644
--- a/tests/functional/r/redefined_builtin.txt
+++ b/tests/functional/r/redefined/redefined_builtin.txt
diff --git a/tests/functional/r/redefined_builtin_allowed.py b/tests/functional/r/redefined/redefined_builtin_allowed.py
index ec7697dfc..ec7697dfc 100644
--- a/tests/functional/r/redefined_builtin_allowed.py
+++ b/tests/functional/r/redefined/redefined_builtin_allowed.py
diff --git a/tests/functional/r/redefined_builtin_allowed.rc b/tests/functional/r/redefined/redefined_builtin_allowed.rc
index 845729dce..845729dce 100644
--- a/tests/functional/r/redefined_builtin_allowed.rc
+++ b/tests/functional/r/redefined/redefined_builtin_allowed.rc
diff --git a/tests/functional/r/redefined_builtin_allowed.txt b/tests/functional/r/redefined/redefined_builtin_allowed.txt
index a0a049e2f..a0a049e2f 100644
--- a/tests/functional/r/redefined_builtin_allowed.txt
+++ b/tests/functional/r/redefined/redefined_builtin_allowed.txt
diff --git a/tests/functional/r/redefined_except_handler.py b/tests/functional/r/redefined/redefined_except_handler.py
index 47591034a..47591034a 100644
--- a/tests/functional/r/redefined_except_handler.py
+++ b/tests/functional/r/redefined/redefined_except_handler.py
diff --git a/tests/functional/r/redefined_except_handler.txt b/tests/functional/r/redefined/redefined_except_handler.txt
index 1184bdd81..1184bdd81 100644
--- a/tests/functional/r/redefined_except_handler.txt
+++ b/tests/functional/r/redefined/redefined_except_handler.txt
diff --git a/tests/functional/r/redefined_outer_name_type_checking.py b/tests/functional/r/redefined/redefined_outer_name_type_checking.py
index 399fc8cea..399fc8cea 100644
--- a/tests/functional/r/redefined_outer_name_type_checking.py
+++ b/tests/functional/r/redefined/redefined_outer_name_type_checking.py
diff --git a/tests/functional/r/redefined_outer_name_type_checking.rc b/tests/functional/r/redefined/redefined_outer_name_type_checking.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/r/redefined_outer_name_type_checking.rc
+++ b/tests/functional/r/redefined/redefined_outer_name_type_checking.rc
diff --git a/tests/functional/r/redefined_slots.py b/tests/functional/r/redefined/redefined_slots.py
index bd9281e40..bd9281e40 100644
--- a/tests/functional/r/redefined_slots.py
+++ b/tests/functional/r/redefined/redefined_slots.py
diff --git a/tests/functional/r/redefined_slots.txt b/tests/functional/r/redefined/redefined_slots.txt
index f5d7ee262..f5d7ee262 100644
--- a/tests/functional/r/redefined_slots.txt
+++ b/tests/functional/r/redefined/redefined_slots.txt
diff --git a/tests/functional/r/regression/regression_too_many_arguments_2335.py b/tests/functional/r/regression_02/regression_too_many_arguments_2335.py
index d2759adfe..d2759adfe 100644
--- a/tests/functional/r/regression/regression_too_many_arguments_2335.py
+++ b/tests/functional/r/regression_02/regression_too_many_arguments_2335.py
diff --git a/tests/functional/s/simplifiable/simplify_chained_comparison.py b/tests/functional/s/simplify_chained_comparison.py
index 4be9fbe3d..4be9fbe3d 100644
--- a/tests/functional/s/simplifiable/simplify_chained_comparison.py
+++ b/tests/functional/s/simplify_chained_comparison.py
diff --git a/tests/functional/s/simplifiable/simplify_chained_comparison.txt b/tests/functional/s/simplify_chained_comparison.txt
index 52fbb9d9c..52fbb9d9c 100644
--- a/tests/functional/s/simplifiable/simplify_chained_comparison.txt
+++ b/tests/functional/s/simplify_chained_comparison.txt
diff --git a/tests/functional/s/super/superfluous_parens.py b/tests/functional/s/superfluous_parens.py
index 22c4c3ab4..22c4c3ab4 100644
--- a/tests/functional/s/super/superfluous_parens.py
+++ b/tests/functional/s/superfluous_parens.py
diff --git a/tests/functional/s/super/superfluous_parens.txt b/tests/functional/s/superfluous_parens.txt
index f830922bc..f830922bc 100644
--- a/tests/functional/s/super/superfluous_parens.txt
+++ b/tests/functional/s/superfluous_parens.txt
diff --git a/tests/functional/s/super/superfluous_parens_walrus_py38.py b/tests/functional/s/superfluous_parens_walrus_py38.py
index cf155954e..cf155954e 100644
--- a/tests/functional/s/super/superfluous_parens_walrus_py38.py
+++ b/tests/functional/s/superfluous_parens_walrus_py38.py
diff --git a/tests/functional/s/super/superfluous_parens_walrus_py38.rc b/tests/functional/s/superfluous_parens_walrus_py38.rc
index 85fc502b3..85fc502b3 100644
--- a/tests/functional/s/super/superfluous_parens_walrus_py38.rc
+++ b/tests/functional/s/superfluous_parens_walrus_py38.rc
diff --git a/tests/functional/s/super/superfluous_parens_walrus_py38.txt b/tests/functional/s/superfluous_parens_walrus_py38.txt
index 58097f520..58097f520 100644
--- a/tests/functional/s/super/superfluous_parens_walrus_py38.txt
+++ b/tests/functional/s/superfluous_parens_walrus_py38.txt
diff --git a/tests/functional/s/symlink/_binding/__init__.py b/tests/functional/s/symlink/_binding/__init__.py
new file mode 120000
index 000000000..dda2f5dc5
--- /dev/null
+++ b/tests/functional/s/symlink/_binding/__init__.py
@@ -0,0 +1 @@
+../symlink_module/__init__.py
\ No newline at end of file
diff --git a/tests/functional/s/symlink/_binding/symlink_module.py b/tests/functional/s/symlink/_binding/symlink_module.py
new file mode 120000
index 000000000..af65afbc3
--- /dev/null
+++ b/tests/functional/s/symlink/_binding/symlink_module.py
@@ -0,0 +1 @@
+../symlink_module/symlink_module.py
\ No newline at end of file
diff --git a/tests/functional/s/symlink/binding/__init__.py b/tests/functional/s/symlink/binding/__init__.py
deleted file mode 120000
index 70a3e97c5..000000000
--- a/tests/functional/s/symlink/binding/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../module/__init__.py
\ No newline at end of file
diff --git a/tests/functional/s/symlink/binding/symlinked_module.py b/tests/functional/s/symlink/binding/symlinked_module.py
deleted file mode 120000
index 09382e43e..000000000
--- a/tests/functional/s/symlink/binding/symlinked_module.py
+++ /dev/null
@@ -1 +0,0 @@
-../module/symlinked_module.py
\ No newline at end of file
diff --git a/tests/functional/s/symlink/module/__init__.py b/tests/functional/s/symlink/symlink_module/__init__.py
index cc8f6e411..cc8f6e411 100644
--- a/tests/functional/s/symlink/module/__init__.py
+++ b/tests/functional/s/symlink/symlink_module/__init__.py
diff --git a/tests/functional/s/symlink/module/symlinked_module.py b/tests/functional/s/symlink/symlink_module/symlink_module.py
index c28a97a30..c28a97a30 100644
--- a/tests/functional/s/symlink/module/symlinked_module.py
+++ b/tests/functional/s/symlink/symlink_module/symlink_module.py
diff --git a/tests/functional/s/syntax_error.py b/tests/functional/s/syntax/syntax_error.py
index c93df6b05..c93df6b05 100644
--- a/tests/functional/s/syntax_error.py
+++ b/tests/functional/s/syntax/syntax_error.py
diff --git a/tests/functional/s/syntax_error.rc b/tests/functional/s/syntax/syntax_error.rc
index b47a74525..b47a74525 100644
--- a/tests/functional/s/syntax_error.rc
+++ b/tests/functional/s/syntax/syntax_error.rc
diff --git a/tests/functional/s/syntax_error.txt b/tests/functional/s/syntax/syntax_error.txt
index 2dafd9eb3..2dafd9eb3 100644
--- a/tests/functional/s/syntax_error.txt
+++ b/tests/functional/s/syntax/syntax_error.txt
diff --git a/tests/functional/s/syntax_error_jython.py b/tests/functional/s/syntax/syntax_error_jython.py
index c93df6b05..c93df6b05 100644
--- a/tests/functional/s/syntax_error_jython.py
+++ b/tests/functional/s/syntax/syntax_error_jython.py
diff --git a/tests/functional/s/syntax_error_jython.rc b/tests/functional/s/syntax/syntax_error_jython.rc
index 29bd3facf..29bd3facf 100644
--- a/tests/functional/s/syntax_error_jython.rc
+++ b/tests/functional/s/syntax/syntax_error_jython.rc
diff --git a/tests/functional/s/syntax_error_jython.txt b/tests/functional/s/syntax/syntax_error_jython.txt
index 56c75f6f6..56c75f6f6 100644
--- a/tests/functional/s/syntax_error_jython.txt
+++ b/tests/functional/s/syntax/syntax_error_jython.txt
diff --git a/tests/functional/u/unbalanced_tuple_unpacking.py b/tests/functional/u/unbalanced_tuple_unpacking.py
index 20e3c2928..d3816f9a9 100644
--- a/tests/functional/u/unbalanced_tuple_unpacking.py
+++ b/tests/functional/u/unbalanced_tuple_unpacking.py
@@ -1,7 +1,7 @@
 """Check possible unbalanced tuple unpacking """
 from __future__ import absolute_import
 from typing import NamedTuple
-from functional.u.unpacking import unpack
+from functional.u.unpacking.unpacking import unpack
 
 # pylint: disable=missing-class-docstring, missing-function-docstring, using-constant-test, useless-object-inheritance,import-outside-toplevel
 
diff --git a/tests/functional/u/unbalanced_tuple_unpacking.txt b/tests/functional/u/unbalanced_tuple_unpacking.txt
index d2df38cfd..6298dd531 100644
--- a/tests/functional/u/unbalanced_tuple_unpacking.txt
+++ b/tests/functional/u/unbalanced_tuple_unpacking.txt
@@ -1,8 +1,8 @@
 unbalanced-tuple-unpacking:11:4:11:27:do_stuff:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)":UNDEFINED
 unbalanced-tuple-unpacking:17:4:17:29:do_stuff1:"Possible unbalanced tuple unpacking with sequence [1, 2, 3]: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
 unbalanced-tuple-unpacking:23:4:23:29:do_stuff2:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)":UNDEFINED
-unbalanced-tuple-unpacking:82:4:82:28:do_stuff9:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
-unbalanced-tuple-unpacking:96:8:96:33:UnbalancedUnpacking.test:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:82:4:82:28:do_stuff9:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:96:8:96:33:UnbalancedUnpacking.test:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
 unbalanced-tuple-unpacking:140:8:140:43:MyClass.sum_unpack_3_into_4:"Possible unbalanced tuple unpacking with sequence defined at line 128: left side has 4 label(s), right side has 3 value(s)":UNDEFINED
 unbalanced-tuple-unpacking:145:8:145:28:MyClass.sum_unpack_3_into_2:"Possible unbalanced tuple unpacking with sequence defined at line 128: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
 unbalanced-tuple-unpacking:157:0:157:24::"Possible unbalanced tuple unpacking with sequence defined at line 151: left side has 2 label(s), right side has 0 value(s)":UNDEFINED
diff --git a/tests/functional/u/unpacking.py b/tests/functional/u/unpacking/unpacking.py
index 59d9abbe4..59d9abbe4 100644
--- a/tests/functional/u/unpacking.py
+++ b/tests/functional/u/unpacking/unpacking.py
diff --git a/tests/functional/u/unpacking_generalizations.py b/tests/functional/u/unpacking/unpacking_generalizations.py
index 1c5fb16b8..1c5fb16b8 100644
--- a/tests/functional/u/unpacking_generalizations.py
+++ b/tests/functional/u/unpacking/unpacking_generalizations.py
diff --git a/tests/functional/u/unpacking_generalizations.txt b/tests/functional/u/unpacking/unpacking_generalizations.txt
index caecb193e..caecb193e 100644
--- a/tests/functional/u/unpacking_generalizations.txt
+++ b/tests/functional/u/unpacking/unpacking_generalizations.txt
diff --git a/tests/functional/u/unpacking_non_sequence.py b/tests/functional/u/unpacking/unpacking_non_sequence.py
index e9c23b388..0299af762 100644
--- a/tests/functional/u/unpacking_non_sequence.py
+++ b/tests/functional/u/unpacking/unpacking_non_sequence.py
@@ -3,7 +3,7 @@
 # pylint: disable=too-few-public-methods, invalid-name, attribute-defined-outside-init, unused-variable
 # pylint: disable=using-constant-test, no-init, missing-docstring, wrong-import-order,wrong-import-position,no-else-return, useless-object-inheritance
 from os import rename as nonseq_func
-from functional.u.unpacking import nonseq
+from functional.u.unpacking.unpacking import nonseq
 from typing import NamedTuple
 
 __revision__ = 0
diff --git a/tests/functional/u/unpacking_non_sequence.txt b/tests/functional/u/unpacking/unpacking_non_sequence.txt
index d657af177..c3c65050c 100644
--- a/tests/functional/u/unpacking_non_sequence.txt
+++ b/tests/functional/u/unpacking/unpacking_non_sequence.txt
@@ -2,8 +2,8 @@ unpacking-non-sequence:78:0:78:15::Attempting to unpack a non-sequence defined a
 unpacking-non-sequence:79:0:79:17::Attempting to unpack a non-sequence:UNDEFINED
 unpacking-non-sequence:80:0:80:11::Attempting to unpack a non-sequence None:UNDEFINED
 unpacking-non-sequence:81:0:81:8::Attempting to unpack a non-sequence 1:UNDEFINED
-unpacking-non-sequence:82:0:82:13::Attempting to unpack a non-sequence defined at line 9 of functional.u.unpacking:UNDEFINED
-unpacking-non-sequence:83:0:83:15::Attempting to unpack a non-sequence defined at line 11 of functional.u.unpacking:UNDEFINED
+unpacking-non-sequence:82:0:82:13::Attempting to unpack a non-sequence defined at line 9 of functional.u.unpacking.unpacking:UNDEFINED
+unpacking-non-sequence:83:0:83:15::Attempting to unpack a non-sequence defined at line 11 of functional.u.unpacking.unpacking:UNDEFINED
 unpacking-non-sequence:84:0:84:18::Attempting to unpack a non-sequence:UNDEFINED
 unpacking-non-sequence:99:8:99:33:ClassUnpacking.test:Attempting to unpack a non-sequence defined at line 75:UNDEFINED
 unpacking-non-sequence:100:8:100:35:ClassUnpacking.test:Attempting to unpack a non-sequence:UNDEFINED
diff --git a/tests/functional/u/unpacking_non_sequence_py37.py b/tests/functional/u/unpacking/unpacking_non_sequence_py37.py
index dd8af1136..dd8af1136 100644
--- a/tests/functional/u/unpacking_non_sequence_py37.py
+++ b/tests/functional/u/unpacking/unpacking_non_sequence_py37.py
diff --git a/tests/functional/u/unpacking_non_sequence_py37.rc b/tests/functional/u/unpacking/unpacking_non_sequence_py37.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/u/unpacking_non_sequence_py37.rc
+++ b/tests/functional/u/unpacking/unpacking_non_sequence_py37.rc
diff --git a/tests/functional/u/use/used_before_assignment.py b/tests/functional/u/used/used_before_assignment.py
index 5b469041e..5b469041e 100644
--- a/tests/functional/u/use/used_before_assignment.py
+++ b/tests/functional/u/used/used_before_assignment.py
diff --git a/tests/functional/u/use/used_before_assignment.txt b/tests/functional/u/used/used_before_assignment.txt
index 64fee9e55..64fee9e55 100644
--- a/tests/functional/u/use/used_before_assignment.txt
+++ b/tests/functional/u/used/used_before_assignment.txt
diff --git a/tests/functional/u/use/used_before_assignment_488.py b/tests/functional/u/used/used_before_assignment_488.py
index efc133c2b..efc133c2b 100644
--- a/tests/functional/u/use/used_before_assignment_488.py
+++ b/tests/functional/u/used/used_before_assignment_488.py
diff --git a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return.py b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.py
index dc9661380..dc9661380 100644
--- a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return.py
+++ b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.py
diff --git a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return.txt b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.txt
index 55761a411..55761a411 100644
--- a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return.txt
+++ b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.txt
diff --git a/tests/functional/u/use/used_before_assignment_filtered_comprehension.py b/tests/functional/u/used/used_before_assignment_filtered_comprehension.py
index f638b0be9..f638b0be9 100644
--- a/tests/functional/u/use/used_before_assignment_filtered_comprehension.py
+++ b/tests/functional/u/used/used_before_assignment_filtered_comprehension.py
diff --git a/tests/functional/u/use/used_before_assignment_issue1081.py b/tests/functional/u/used/used_before_assignment_issue1081.py
index 0c59ccebe..0c59ccebe 100644
--- a/tests/functional/u/use/used_before_assignment_issue1081.py
+++ b/tests/functional/u/used/used_before_assignment_issue1081.py
diff --git a/tests/functional/u/use/used_before_assignment_issue1081.txt b/tests/functional/u/used/used_before_assignment_issue1081.txt
index 857c4826b..857c4826b 100644
--- a/tests/functional/u/use/used_before_assignment_issue1081.txt
+++ b/tests/functional/u/used/used_before_assignment_issue1081.txt
diff --git a/tests/functional/u/use/used_before_assignment_issue2615.py b/tests/functional/u/used/used_before_assignment_issue2615.py
index bce073bf3..bce073bf3 100644
--- a/tests/functional/u/use/used_before_assignment_issue2615.py
+++ b/tests/functional/u/used/used_before_assignment_issue2615.py
diff --git a/tests/functional/u/use/used_before_assignment_issue2615.txt b/tests/functional/u/used/used_before_assignment_issue2615.txt
index 567f56230..567f56230 100644
--- a/tests/functional/u/use/used_before_assignment_issue2615.txt
+++ b/tests/functional/u/used/used_before_assignment_issue2615.txt
diff --git a/tests/functional/u/use/used_before_assignment_issue4761.py b/tests/functional/u/used/used_before_assignment_issue4761.py
index ad4cca0ba..ad4cca0ba 100644
--- a/tests/functional/u/use/used_before_assignment_issue4761.py
+++ b/tests/functional/u/used/used_before_assignment_issue4761.py
diff --git a/tests/functional/u/use/used_before_assignment_issue4761.txt b/tests/functional/u/used/used_before_assignment_issue4761.txt
index e3251cbd7..e3251cbd7 100644
--- a/tests/functional/u/use/used_before_assignment_issue4761.txt
+++ b/tests/functional/u/used/used_before_assignment_issue4761.txt
diff --git a/tests/functional/u/use/used_before_assignment_issue626.py b/tests/functional/u/used/used_before_assignment_issue626.py
index c98632b7f..c98632b7f 100644
--- a/tests/functional/u/use/used_before_assignment_issue626.py
+++ b/tests/functional/u/used/used_before_assignment_issue626.py
diff --git a/tests/functional/u/use/used_before_assignment_issue626.txt b/tests/functional/u/used/used_before_assignment_issue626.txt
index 1ee575ba3..1ee575ba3 100644
--- a/tests/functional/u/use/used_before_assignment_issue626.txt
+++ b/tests/functional/u/used/used_before_assignment_issue626.txt
diff --git a/tests/functional/u/use/used_before_assignment_issue85.py b/tests/functional/u/used/used_before_assignment_issue85.py
index 367af9dfa..367af9dfa 100644
--- a/tests/functional/u/use/used_before_assignment_issue85.py
+++ b/tests/functional/u/used/used_before_assignment_issue85.py
diff --git a/tests/functional/u/use/used_before_assignment_issue85.txt b/tests/functional/u/used/used_before_assignment_issue85.txt
index 9f405c2c5..9f405c2c5 100644
--- a/tests/functional/u/use/used_before_assignment_issue85.txt
+++ b/tests/functional/u/used/used_before_assignment_issue85.txt
diff --git a/tests/functional/u/use/used_before_assignment_issue853.py b/tests/functional/u/used/used_before_assignment_issue853.py
index 7da9fdd50..7da9fdd50 100644
--- a/tests/functional/u/use/used_before_assignment_issue853.py
+++ b/tests/functional/u/used/used_before_assignment_issue853.py
diff --git a/tests/functional/u/use/used_before_assignment_nonlocal.py b/tests/functional/u/used/used_before_assignment_nonlocal.py
index 5cbdd510c..5cbdd510c 100644
--- a/tests/functional/u/use/used_before_assignment_nonlocal.py
+++ b/tests/functional/u/used/used_before_assignment_nonlocal.py
diff --git a/tests/functional/u/use/used_before_assignment_nonlocal.txt b/tests/functional/u/used/used_before_assignment_nonlocal.txt
index 90525457e..90525457e 100644
--- a/tests/functional/u/use/used_before_assignment_nonlocal.txt
+++ b/tests/functional/u/used/used_before_assignment_nonlocal.txt
diff --git a/tests/functional/u/use/used_before_assignment_py37.py b/tests/functional/u/used/used_before_assignment_py37.py
index 08a585a95..08a585a95 100644
--- a/tests/functional/u/use/used_before_assignment_py37.py
+++ b/tests/functional/u/used/used_before_assignment_py37.py
diff --git a/tests/functional/u/use/used_before_assignment_py37.rc b/tests/functional/u/used/used_before_assignment_py37.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/u/use/used_before_assignment_py37.rc
+++ b/tests/functional/u/used/used_before_assignment_py37.rc
diff --git a/tests/functional/u/use/used_before_assignment_py37.txt b/tests/functional/u/used/used_before_assignment_py37.txt
index ad06560e2..ad06560e2 100644
--- a/tests/functional/u/use/used_before_assignment_py37.txt
+++ b/tests/functional/u/used/used_before_assignment_py37.txt
diff --git a/tests/functional/u/use/used_before_assignment_type_annotations.py b/tests/functional/u/used/used_before_assignment_type_annotations.py
index 1a03050c3..1a03050c3 100644
--- a/tests/functional/u/use/used_before_assignment_type_annotations.py
+++ b/tests/functional/u/used/used_before_assignment_type_annotations.py
diff --git a/tests/functional/u/use/used_before_assignment_type_annotations.txt b/tests/functional/u/used/used_before_assignment_type_annotations.txt
index 81e1646da..81e1646da 100644
--- a/tests/functional/u/use/used_before_assignment_type_annotations.txt
+++ b/tests/functional/u/used/used_before_assignment_type_annotations.txt
diff --git a/tests/functional/u/use/used_before_assignment_typing.py b/tests/functional/u/used/used_before_assignment_typing.py
index 9be01d770..9be01d770 100644
--- a/tests/functional/u/use/used_before_assignment_typing.py
+++ b/tests/functional/u/used/used_before_assignment_typing.py
diff --git a/tests/functional/u/use/used_before_assignment_typing.txt b/tests/functional/u/used/used_before_assignment_typing.txt
index ae05b23f3..ae05b23f3 100644
--- a/tests/functional/u/use/used_before_assignment_typing.txt
+++ b/tests/functional/u/used/used_before_assignment_typing.txt
diff --git a/tests/functional/u/use/used_prior_global_declaration.py b/tests/functional/u/used/used_prior_global_declaration.py
index 079501022..079501022 100644
--- a/tests/functional/u/use/used_prior_global_declaration.py
+++ b/tests/functional/u/used/used_prior_global_declaration.py
diff --git a/tests/functional/u/use/used_prior_global_declaration.txt b/tests/functional/u/used/used_prior_global_declaration.txt
index 314d85234..314d85234 100644
--- a/tests/functional/u/use/used_prior_global_declaration.txt
+++ b/tests/functional/u/used/used_prior_global_declaration.txt
diff --git a/tests/functional/u/use/using_constant_test.py b/tests/functional/u/using_constant_test.py
index ca1ce013c..ca1ce013c 100644
--- a/tests/functional/u/use/using_constant_test.py
+++ b/tests/functional/u/using_constant_test.py
diff --git a/tests/functional/u/use/using_constant_test.txt b/tests/functional/u/using_constant_test.txt
index df53a28a4..df53a28a4 100644
--- a/tests/functional/u/use/using_constant_test.txt
+++ b/tests/functional/u/using_constant_test.txt