diff --git a/Content.Tests/DMProject/Broken Tests/Const/ConstProc.dm b/Content.Tests/DMProject/BrokenTests/Const/ConstProc.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Const/ConstProc.dm
rename to Content.Tests/DMProject/BrokenTests/Const/ConstProc.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Const/ConstSort.dm b/Content.Tests/DMProject/BrokenTests/Const/ConstSort.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Const/ConstSort.dm
rename to Content.Tests/DMProject/BrokenTests/Const/ConstSort.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Expression/Modified Type/basic.dm b/Content.Tests/DMProject/BrokenTests/Expression/ModifiedType/basic.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Expression/Modified Type/basic.dm
rename to Content.Tests/DMProject/BrokenTests/Expression/ModifiedType/basic.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Expression/Modified Type/multi.dm b/Content.Tests/DMProject/BrokenTests/Expression/ModifiedType/multi.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Expression/Modified Type/multi.dm
rename to Content.Tests/DMProject/BrokenTests/Expression/ModifiedType/multi.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Expression/Modified Type/space_before_brace.dm b/Content.Tests/DMProject/BrokenTests/Expression/ModifiedType/space_before_brace.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Expression/Modified Type/space_before_brace.dm
rename to Content.Tests/DMProject/BrokenTests/Expression/ModifiedType/space_before_brace.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Expression/String/raw2.dm b/Content.Tests/DMProject/BrokenTests/Expression/String/raw2.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Expression/String/raw2.dm
rename to Content.Tests/DMProject/BrokenTests/Expression/String/raw2.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Expression/escape_identifier.dm b/Content.Tests/DMProject/BrokenTests/Expression/escape_identifier.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Expression/escape_identifier.dm
rename to Content.Tests/DMProject/BrokenTests/Expression/escape_identifier.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Indent/closing_brace.dm b/Content.Tests/DMProject/BrokenTests/Indent/closing_brace.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Indent/closing_brace.dm
rename to Content.Tests/DMProject/BrokenTests/Indent/closing_brace.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Indent/ignore_close_bracket_indent.dm b/Content.Tests/DMProject/BrokenTests/Indent/ignore_close_bracket_indent.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Indent/ignore_close_bracket_indent.dm
rename to Content.Tests/DMProject/BrokenTests/Indent/ignore_close_bracket_indent.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Indent/whitespace_before_var.dm b/Content.Tests/DMProject/BrokenTests/Indent/whitespace_before_var.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Indent/whitespace_before_var.dm
rename to Content.Tests/DMProject/BrokenTests/Indent/whitespace_before_var.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Operators/ninto.dm b/Content.Tests/DMProject/BrokenTests/Operators/ninto.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Operators/ninto.dm
rename to Content.Tests/DMProject/BrokenTests/Operators/ninto.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Operators/valid_and_null.dm b/Content.Tests/DMProject/BrokenTests/Operators/valid_and_null.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Operators/valid_and_null.dm
rename to Content.Tests/DMProject/BrokenTests/Operators/valid_and_null.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Operators/valid_and_null_assign.dm b/Content.Tests/DMProject/BrokenTests/Operators/valid_and_null_assign.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Operators/valid_and_null_assign.dm
rename to Content.Tests/DMProject/BrokenTests/Operators/valid_and_null_assign.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Preprocessor/define_var_clash1.dm b/Content.Tests/DMProject/BrokenTests/Preprocessor/define_var_clash1.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Preprocessor/define_var_clash1.dm
rename to Content.Tests/DMProject/BrokenTests/Preprocessor/define_var_clash1.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Procs/Filter/outline.dm b/Content.Tests/DMProject/BrokenTests/Procs/Filter/outline.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Procs/Filter/outline.dm
rename to Content.Tests/DMProject/BrokenTests/Procs/Filter/outline.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Procs/allow_null_argname.dm b/Content.Tests/DMProject/BrokenTests/Procs/allow_null_argname.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Procs/allow_null_argname.dm
rename to Content.Tests/DMProject/BrokenTests/Procs/allow_null_argname.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Procs/indeterminate_assoc_arg.dm b/Content.Tests/DMProject/BrokenTests/Procs/indeterminate_assoc_arg.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Procs/indeterminate_assoc_arg.dm
rename to Content.Tests/DMProject/BrokenTests/Procs/indeterminate_assoc_arg.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Special Procs/new/atom_bad_loc.dm b/Content.Tests/DMProject/BrokenTests/SpecialProcs/new/atom_bad_loc.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Special Procs/new/atom_bad_loc.dm
rename to Content.Tests/DMProject/BrokenTests/SpecialProcs/new/atom_bad_loc.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/Assign/to_src.dm b/Content.Tests/DMProject/BrokenTests/Statements/Assign/to_src.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/Assign/to_src.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/Assign/to_src.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/Control Flow/sleep/no_paren.dm b/Content.Tests/DMProject/BrokenTests/Statements/ControlFlow/sleep/no_paren.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/Control Flow/sleep/no_paren.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/ControlFlow/sleep/no_paren.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/expr_only.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/expr_only.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/expr_only.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/expr_only.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/expr_only_decl.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/expr_only_decl.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/expr_only_decl.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/expr_only_decl.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/fakeout4.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/fakeout4.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/fakeout4.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/fakeout4.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/incr_multi_expr.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/incr_multi_expr.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/incr_multi_expr.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/incr_multi_expr.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/init_multi_expr.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/init_multi_expr.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/init_multi_expr.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/init_multi_expr.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/var_only.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/var_only.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/var_only.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/var_only.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/var_only_as.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/var_only_as.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/var_only_as.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/var_only_as.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Statements/For/var_only_typed.dm b/Content.Tests/DMProject/BrokenTests/Statements/For/var_only_typed.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Statements/For/var_only_typed.dm
rename to Content.Tests/DMProject/BrokenTests/Statements/For/var_only_typed.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Stdlib/List/bitwise_ops.dm b/Content.Tests/DMProject/BrokenTests/Stdlib/List/bitwise_ops.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Stdlib/List/bitwise_ops.dm
rename to Content.Tests/DMProject/BrokenTests/Stdlib/List/bitwise_ops.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero1.dm b/Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero1.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero1.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero1.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero3.dm b/Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero3.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero3.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero3.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero4.dm b/Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero4.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero4.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero4.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero6.dm b/Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero6.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero6.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Const/Div_Zero/div_zero6.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/const_fn.dm b/Content.Tests/DMProject/BrokenTests/Tree/Const/const_fn.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Const/const_fn.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Const/const_fn.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Global/Static Scope/no_objproc_in_static.dm b/Content.Tests/DMProject/BrokenTests/Tree/Global/StaticScope/no_objproc_in_static.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Global/Static Scope/no_objproc_in_static.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Global/StaticScope/no_objproc_in_static.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Global/Static Scope/scope2.dm b/Content.Tests/DMProject/BrokenTests/Tree/Global/StaticScope/scope2.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Global/Static Scope/scope2.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Global/StaticScope/scope2.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Global/Static Scope/scope5.dm b/Content.Tests/DMProject/BrokenTests/Tree/Global/StaticScope/scope5.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Global/Static Scope/scope5.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Global/StaticScope/scope5.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Global/Var/vars_field.dm b/Content.Tests/DMProject/BrokenTests/Tree/Global/Var/vars_field.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Global/Var/vars_field.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Global/Var/vars_field.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Override/override_toplevel_nonexist.dm b/Content.Tests/DMProject/BrokenTests/Tree/Override/override_toplevel_nonexist.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Override/override_toplevel_nonexist.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Override/override_toplevel_nonexist.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Override/override_x.dm b/Content.Tests/DMProject/BrokenTests/Tree/Override/override_x.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Tree/Override/override_x.dm
rename to Content.Tests/DMProject/BrokenTests/Tree/Override/override_x.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Type Inference/parent_loop.dm b/Content.Tests/DMProject/BrokenTests/TypeInference/parent_loop.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Type Inference/parent_loop.dm
rename to Content.Tests/DMProject/BrokenTests/TypeInference/parent_loop.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Type Inference/paths.dm b/Content.Tests/DMProject/BrokenTests/TypeInference/paths.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Type Inference/paths.dm
rename to Content.Tests/DMProject/BrokenTests/TypeInference/paths.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Typemaker/arg_implicit_null.dm b/Content.Tests/DMProject/BrokenTests/Typemaker/arg_implicit_null.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Typemaker/arg_implicit_null.dm
rename to Content.Tests/DMProject/BrokenTests/Typemaker/arg_implicit_null.dm
diff --git a/Content.Tests/DMProject/Broken Tests/Typemaker/proc_path_error.dm b/Content.Tests/DMProject/BrokenTests/Typemaker/proc_path_error.dm
similarity index 100%
rename from Content.Tests/DMProject/Broken Tests/Typemaker/proc_path_error.dm
rename to Content.Tests/DMProject/BrokenTests/Typemaker/proc_path_error.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_global_var.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_global_var.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_global_var.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_global_var.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_list_idx.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_list_idx.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_list_idx.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_list_idx.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_null.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_null.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_null.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_null.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_parent_type.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_parent_type.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_parent_type.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_parent_type.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_path.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_path.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_path.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_path.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_proc_args.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_proc_args.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_proc_args.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_proc_args.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_type.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_type.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_type.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_type.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/initial/initial_vars_index.dm b/Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_vars_index.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/initial/initial_vars_index.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/initial/initial_vars_index.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/issaved/issaved_list_idx.dm b/Content.Tests/DMProject/Tests/SpecialProcs/issaved/issaved_list_idx.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/issaved/issaved_list_idx.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/issaved/issaved_list_idx.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/issaved/issaved_vars_index.dm b/Content.Tests/DMProject/Tests/SpecialProcs/issaved/issaved_vars_index.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/issaved/issaved_vars_index.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/issaved/issaved_vars_index.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/locate/tag_deleted_obj.dm b/Content.Tests/DMProject/Tests/SpecialProcs/locate/tag_deleted_obj.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/locate/tag_deleted_obj.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/locate/tag_deleted_obj.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/locate/tag_empty_string.dm b/Content.Tests/DMProject/Tests/SpecialProcs/locate/tag_empty_string.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/locate/tag_empty_string.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/locate/tag_empty_string.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/locate/tag_nulled.dm b/Content.Tests/DMProject/Tests/SpecialProcs/locate/tag_nulled.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/locate/tag_nulled.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/locate/tag_nulled.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/nameof/nameof.dm b/Content.Tests/DMProject/Tests/SpecialProcs/nameof/nameof.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/nameof/nameof.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/nameof/nameof.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/nameof/nameof_error.dm b/Content.Tests/DMProject/Tests/SpecialProcs/nameof/nameof_error.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/nameof/nameof_error.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/nameof/nameof_error.dm
diff --git a/Content.Tests/DMProject/Tests/Special Procs/new/newlist.dm b/Content.Tests/DMProject/Tests/SpecialProcs/new/newlist.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Special Procs/new/newlist.dm
rename to Content.Tests/DMProject/Tests/SpecialProcs/new/newlist.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/blocks_1.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/blocks_1.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/blocks_1.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/blocks_1.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/empty_blocks.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/empty_blocks.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/empty_blocks.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/empty_blocks.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/empty_proc.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/empty_proc.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/empty_proc.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/empty_proc.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/goto_inside_loop.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/goto_inside_loop.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/goto_inside_loop.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/goto_inside_loop.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/label_before_var.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/label_before_var.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/label_before_var.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/label_before_var.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labelled_loop_1.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labelled_loop_1.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labelled_loop_1.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labelled_loop_1.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labelled_loop_2.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labelled_loop_2.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labelled_loop_2.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labelled_loop_2.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labelled_loop_3.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labelled_loop_3.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labelled_loop_3.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labelled_loop_3.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_1.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_1.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_1.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_1.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_2.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_2.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_2.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_2.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_3.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_3.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_3.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_3.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_bad_jump.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_bad_jump.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_bad_jump.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_bad_jump.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_bad_link.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_bad_link.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_bad_link.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_bad_link.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_order.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_order.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_order.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_order.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_order_bad.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_order_bad.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_order_bad.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_order_bad.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/labels_scoped.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_scoped.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/labels_scoped.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/labels_scoped.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/sleep/negative.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/sleep/negative.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/sleep/negative.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/sleep/negative.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/spawn_oneliner.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/spawn_oneliner.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/spawn_oneliner.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/spawn_oneliner.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/spawn_self_test.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/spawn_self_test.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/spawn_self_test.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/spawn_self_test.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/spawn_while_enumerating.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/spawn_while_enumerating.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/spawn_while_enumerating.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/spawn_while_enumerating.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch1.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch1.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch1.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch1.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch2.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch2.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch2.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch2.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch3.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch3.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch3.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch3.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch4.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch4.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch4.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch4.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch5.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch5.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch5.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch5.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch_nested.dm b/Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch_nested.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Control Flow/try_catch_nested.dm
rename to Content.Tests/DMProject/Tests/Statements/ControlFlow/try_catch_nested.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Var Decl/as_in_decl.dm b/Content.Tests/DMProject/Tests/Statements/VarDecl/as_in_decl.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Var Decl/as_in_decl.dm
rename to Content.Tests/DMProject/Tests/Statements/VarDecl/as_in_decl.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Var Decl/var_decl_expr.dm b/Content.Tests/DMProject/Tests/Statements/VarDecl/var_decl_expr.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Var Decl/var_decl_expr.dm
rename to Content.Tests/DMProject/Tests/Statements/VarDecl/var_decl_expr.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Var Decl/var_decl_multi.dm b/Content.Tests/DMProject/Tests/Statements/VarDecl/var_decl_multi.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Var Decl/var_decl_multi.dm
rename to Content.Tests/DMProject/Tests/Statements/VarDecl/var_decl_multi.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Var Decl/var_name_keyword1.dm b/Content.Tests/DMProject/Tests/Statements/VarDecl/var_name_keyword1.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Var Decl/var_name_keyword1.dm
rename to Content.Tests/DMProject/Tests/Statements/VarDecl/var_name_keyword1.dm
diff --git a/Content.Tests/DMProject/Tests/Statements/Var Decl/var_name_keyword2.dm b/Content.Tests/DMProject/Tests/Statements/VarDecl/var_name_keyword2.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Statements/Var Decl/var_name_keyword2.dm
rename to Content.Tests/DMProject/Tests/Statements/VarDecl/var_name_keyword2.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/assign_global_to_global.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/assign_global_to_global.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/assign_global_to_global.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/assign_global_to_global.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope1.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope1.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope1.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope1.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope3.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope3.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope3.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope3.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope4.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope4.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope4.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope4.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope_in_assoc_list.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope_in_assoc_list.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/scope_in_assoc_list.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/scope_in_assoc_list.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/static_list.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/static_list.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/static_list.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/static_list.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/static_proc.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/static_proc.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/static_proc.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/static_proc.dm
diff --git a/Content.Tests/DMProject/Tests/Tree/Global/Static Scope/static_vars.dm b/Content.Tests/DMProject/Tests/Tree/Global/StaticScope/static_vars.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Tree/Global/Static Scope/static_vars.dm
rename to Content.Tests/DMProject/Tests/Tree/Global/StaticScope/static_vars.dm
diff --git a/Content.Tests/DMProject/Tests/Type Inference/infer_override.dm b/Content.Tests/DMProject/Tests/TypeInference/infer_override.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Type Inference/infer_override.dm
rename to Content.Tests/DMProject/Tests/TypeInference/infer_override.dm
diff --git a/Content.Tests/DMProject/Tests/Type Inference/nestedinference.dm b/Content.Tests/DMProject/Tests/TypeInference/nestedinference.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Type Inference/nestedinference.dm
rename to Content.Tests/DMProject/Tests/TypeInference/nestedinference.dm
diff --git a/Content.Tests/DMProject/Tests/Type Inference/pointless_upcasting.dm b/Content.Tests/DMProject/Tests/TypeInference/pointless_upcasting.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Type Inference/pointless_upcasting.dm
rename to Content.Tests/DMProject/Tests/TypeInference/pointless_upcasting.dm
diff --git a/Content.Tests/DMProject/Tests/Type Inference/ternary_op.dm b/Content.Tests/DMProject/Tests/TypeInference/ternary_op.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Type Inference/ternary_op.dm
rename to Content.Tests/DMProject/Tests/TypeInference/ternary_op.dm
diff --git a/Content.Tests/DMProject/Tests/Type Inference/type_var_clash.dm b/Content.Tests/DMProject/Tests/TypeInference/type_var_clash.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Type Inference/type_var_clash.dm
rename to Content.Tests/DMProject/Tests/TypeInference/type_var_clash.dm
diff --git a/Content.Tests/DMProject/Tests/Type Inference/unknown_type.dm b/Content.Tests/DMProject/Tests/TypeInference/unknown_type.dm
similarity index 100%
rename from Content.Tests/DMProject/Tests/Type Inference/unknown_type.dm
rename to Content.Tests/DMProject/Tests/TypeInference/unknown_type.dm