From: Florian Ragwitz Date: Mon, 14 Mar 2011 03:58:21 +0000 (+0100) Subject: Remove numbers from our tests X-Git-Tag: 1.9905~16 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=829433c47061dd70a608bfcd940113c4172b6950;p=gitmo%2FMoose.git Remove numbers from our tests --- diff --git a/.gitignore b/.gitignore index 7245007..14165c3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ /MANIFEST.bak /blib/ /pm_to_blib -/t/002_recipes/* +/t/recipes/* /.build .* !.gitignore diff --git a/author/extract-inline-tests b/author/extract-inline-tests index 9a186d9..5fea6a9 100755 --- a/author/extract-inline-tests +++ b/author/extract-inline-tests @@ -39,7 +39,7 @@ $inline->save; $name =~ s/^moose_cookbook_//; - write_file( "t/002_recipes/$name", $content ); + write_file( "t/recipes/$name", $content ); return 1; } diff --git a/inc/ExtractInlineTests.pm b/inc/ExtractInlineTests.pm index bf0f547..89b39a1 100644 --- a/inc/ExtractInlineTests.pm +++ b/inc/ExtractInlineTests.pm @@ -49,7 +49,7 @@ sub gather_files { $self->{dzil}->add_file( Dist::Zilla::File::InMemory->new( - name => "t/002_recipes/$name", + name => "t/recipes/$name", content => $content, ) ); diff --git a/t/020_attributes/029_accessor_context.t b/t/attributes/accessor_context.t similarity index 100% rename from t/020_attributes/029_accessor_context.t rename to t/attributes/accessor_context.t diff --git a/t/020_attributes/033_accessor_inlining.t b/t/attributes/accessor_inlining.t similarity index 100% rename from t/020_attributes/033_accessor_inlining.t rename to t/attributes/accessor_inlining.t diff --git a/t/020_attributes/027_accessor_override_method.t b/t/attributes/accessor_override_method.t similarity index 100% rename from t/020_attributes/027_accessor_override_method.t rename to t/attributes/accessor_override_method.t diff --git a/t/020_attributes/039_accessor_overwrite_warning.t b/t/attributes/accessor_overwrite_warning.t similarity index 100% rename from t/020_attributes/039_accessor_overwrite_warning.t rename to t/attributes/accessor_overwrite_warning.t diff --git a/t/020_attributes/013_attr_dereference_test.t b/t/attributes/attr_dereference_test.t similarity index 100% rename from t/020_attributes/013_attr_dereference_test.t rename to t/attributes/attr_dereference_test.t diff --git a/t/020_attributes/003_attribute_accessor_generation.t b/t/attributes/attribute_accessor_generation.t similarity index 100% rename from t/020_attributes/003_attribute_accessor_generation.t rename to t/attributes/attribute_accessor_generation.t diff --git a/t/020_attributes/007_attribute_custom_metaclass.t b/t/attributes/attribute_custom_metaclass.t similarity index 100% rename from t/020_attributes/007_attribute_custom_metaclass.t rename to t/attributes/attribute_custom_metaclass.t diff --git a/t/020_attributes/010_attribute_delegation.t b/t/attributes/attribute_delegation.t similarity index 100% rename from t/020_attributes/010_attribute_delegation.t rename to t/attributes/attribute_delegation.t diff --git a/t/020_attributes/005_attribute_does.t b/t/attributes/attribute_does.t similarity index 100% rename from t/020_attributes/005_attribute_does.t rename to t/attributes/attribute_does.t diff --git a/t/020_attributes/009_attribute_inherited_slot_specs.t b/t/attributes/attribute_inherited_slot_specs.t similarity index 100% rename from t/020_attributes/009_attribute_inherited_slot_specs.t rename to t/attributes/attribute_inherited_slot_specs.t diff --git a/t/020_attributes/019_attribute_lazy_initializer.t b/t/attributes/attribute_lazy_initializer.t similarity index 100% rename from t/020_attributes/019_attribute_lazy_initializer.t rename to t/attributes/attribute_lazy_initializer.t diff --git a/t/020_attributes/023_attribute_names.t b/t/attributes/attribute_names.t similarity index 100% rename from t/020_attributes/023_attribute_names.t rename to t/attributes/attribute_names.t diff --git a/t/020_attributes/001_attribute_reader_generation.t b/t/attributes/attribute_reader_generation.t similarity index 100% rename from t/020_attributes/001_attribute_reader_generation.t rename to t/attributes/attribute_reader_generation.t diff --git a/t/020_attributes/006_attribute_required.t b/t/attributes/attribute_required.t similarity index 100% rename from t/020_attributes/006_attribute_required.t rename to t/attributes/attribute_required.t diff --git a/t/020_attributes/015_attribute_traits.t b/t/attributes/attribute_traits.t similarity index 100% rename from t/020_attributes/015_attribute_traits.t rename to t/attributes/attribute_traits.t diff --git a/t/020_attributes/017_attribute_traits_n_meta.t b/t/attributes/attribute_traits_n_meta.t similarity index 100% rename from t/020_attributes/017_attribute_traits_n_meta.t rename to t/attributes/attribute_traits_n_meta.t diff --git a/t/020_attributes/024_attribute_traits_parameterized.t b/t/attributes/attribute_traits_parameterized.t similarity index 100% rename from t/020_attributes/024_attribute_traits_parameterized.t rename to t/attributes/attribute_traits_parameterized.t diff --git a/t/020_attributes/016_attribute_traits_registered.t b/t/attributes/attribute_traits_registered.t similarity index 100% rename from t/020_attributes/016_attribute_traits_registered.t rename to t/attributes/attribute_traits_registered.t diff --git a/t/020_attributes/004_attribute_triggers.t b/t/attributes/attribute_triggers.t similarity index 100% rename from t/020_attributes/004_attribute_triggers.t rename to t/attributes/attribute_triggers.t diff --git a/t/020_attributes/008_attribute_type_unions.t b/t/attributes/attribute_type_unions.t similarity index 100% rename from t/020_attributes/008_attribute_type_unions.t rename to t/attributes/attribute_type_unions.t diff --git a/t/020_attributes/026_attribute_without_any_methods.t b/t/attributes/attribute_without_any_methods.t similarity index 100% rename from t/020_attributes/026_attribute_without_any_methods.t rename to t/attributes/attribute_without_any_methods.t diff --git a/t/020_attributes/002_attribute_writer_generation.t b/t/attributes/attribute_writer_generation.t similarity index 100% rename from t/020_attributes/002_attribute_writer_generation.t rename to t/attributes/attribute_writer_generation.t diff --git a/t/020_attributes/034_bad_coerce.t b/t/attributes/bad_coerce.t similarity index 100% rename from t/020_attributes/034_bad_coerce.t rename to t/attributes/bad_coerce.t diff --git a/t/020_attributes/025_chained_coercion.t b/t/attributes/chained_coercion.t similarity index 100% rename from t/020_attributes/025_chained_coercion.t rename to t/attributes/chained_coercion.t diff --git a/t/020_attributes/035_default_undef.t b/t/attributes/default_undef.t similarity index 100% rename from t/020_attributes/035_default_undef.t rename to t/attributes/default_undef.t diff --git a/t/020_attributes/031_delegation_and_modifiers.t b/t/attributes/delegation_and_modifiers.t similarity index 100% rename from t/020_attributes/031_delegation_and_modifiers.t rename to t/attributes/delegation_and_modifiers.t diff --git a/t/020_attributes/032_delegation_arg_aliasing.t b/t/attributes/delegation_arg_aliasing.t similarity index 100% rename from t/020_attributes/032_delegation_arg_aliasing.t rename to t/attributes/delegation_arg_aliasing.t diff --git a/t/020_attributes/038_delegation_target_not_loaded.t b/t/attributes/delegation_target_not_loaded.t similarity index 100% rename from t/020_attributes/038_delegation_target_not_loaded.t rename to t/attributes/delegation_target_not_loaded.t diff --git a/t/020_attributes/022_illegal_options_for_inheritance.t b/t/attributes/illegal_options_for_inheritance.t similarity index 100% rename from t/020_attributes/022_illegal_options_for_inheritance.t rename to t/attributes/illegal_options_for_inheritance.t diff --git a/t/020_attributes/037_inherit_lazy_build.t b/t/attributes/inherit_lazy_build.t similarity index 100% rename from t/020_attributes/037_inherit_lazy_build.t rename to t/attributes/inherit_lazy_build.t diff --git a/t/020_attributes/040_lazy_no_default.t b/t/attributes/lazy_no_default.t similarity index 100% rename from t/020_attributes/040_lazy_no_default.t rename to t/attributes/lazy_no_default.t diff --git a/t/020_attributes/021_method_generation_rules.t b/t/attributes/method_generation_rules.t similarity index 100% rename from t/020_attributes/021_method_generation_rules.t rename to t/attributes/method_generation_rules.t diff --git a/t/020_attributes/014_misc_attribute_coerce_lazy.t b/t/attributes/misc_attribute_coerce_lazy.t similarity index 100% rename from t/020_attributes/014_misc_attribute_coerce_lazy.t rename to t/attributes/misc_attribute_coerce_lazy.t diff --git a/t/020_attributes/012_misc_attribute_tests.t b/t/attributes/misc_attribute_tests.t similarity index 100% rename from t/020_attributes/012_misc_attribute_tests.t rename to t/attributes/misc_attribute_tests.t diff --git a/t/020_attributes/011_more_attr_delegation.t b/t/attributes/more_attr_delegation.t similarity index 100% rename from t/020_attributes/011_more_attr_delegation.t rename to t/attributes/more_attr_delegation.t diff --git a/t/020_attributes/018_no_init_arg.t b/t/attributes/no_init_arg.t similarity index 100% rename from t/020_attributes/018_no_init_arg.t rename to t/attributes/no_init_arg.t diff --git a/t/020_attributes/028_no_slot_access.t b/t/attributes/no_slot_access.t similarity index 100% rename from t/020_attributes/028_no_slot_access.t rename to t/attributes/no_slot_access.t diff --git a/t/020_attributes/030_non_alpha_attr_names.t b/t/attributes/non_alpha_attr_names.t similarity index 100% rename from t/020_attributes/030_non_alpha_attr_names.t rename to t/attributes/non_alpha_attr_names.t diff --git a/t/020_attributes/036_numeric_defaults.t b/t/attributes/numeric_defaults.t similarity index 100% rename from t/020_attributes/036_numeric_defaults.t rename to t/attributes/numeric_defaults.t diff --git a/t/020_attributes/020_trigger_and_coerce.t b/t/attributes/trigger_and_coerce.t similarity index 100% rename from t/020_attributes/020_trigger_and_coerce.t rename to t/attributes/trigger_and_coerce.t diff --git a/t/010_basics/007_always_strict_warnings.t b/t/basics/always_strict_warnings.t similarity index 100% rename from t/010_basics/007_always_strict_warnings.t rename to t/basics/always_strict_warnings.t diff --git a/t/010_basics/001_basic_class_setup.t b/t/basics/basic_class_setup.t similarity index 100% rename from t/010_basics/001_basic_class_setup.t rename to t/basics/basic_class_setup.t diff --git a/t/010_basics/015_buildargs.t b/t/basics/buildargs.t similarity index 100% rename from t/010_basics/015_buildargs.t rename to t/basics/buildargs.t diff --git a/t/010_basics/022_buildargs_warning.t b/t/basics/buildargs_warning.t similarity index 100% rename from t/010_basics/022_buildargs_warning.t rename to t/basics/buildargs_warning.t diff --git a/t/010_basics/013_create.t b/t/basics/create.t similarity index 100% rename from t/010_basics/013_create.t rename to t/basics/create.t diff --git a/t/010_basics/014_create_anon.t b/t/basics/create_anon.t similarity index 100% rename from t/010_basics/014_create_anon.t rename to t/basics/create_anon.t diff --git a/t/010_basics/030_deprecations.t b/t/basics/deprecations.t similarity index 100% rename from t/010_basics/030_deprecations.t rename to t/basics/deprecations.t diff --git a/t/010_basics/019_destruction.t b/t/basics/destruction.t similarity index 100% rename from t/010_basics/019_destruction.t rename to t/basics/destruction.t diff --git a/t/010_basics/017_error_handling.t b/t/basics/error_handling.t similarity index 100% rename from t/010_basics/017_error_handling.t rename to t/basics/error_handling.t diff --git a/t/010_basics/020-global-destruction-helper.pl b/t/basics/global-destruction-helper.pl similarity index 100% rename from t/010_basics/020-global-destruction-helper.pl rename to t/basics/global-destruction-helper.pl diff --git a/t/010_basics/020_global_destruction.t b/t/basics/global_destruction.t similarity index 91% rename from t/010_basics/020_global_destruction.t rename to t/basics/global_destruction.t index 9811319..58838c6 100644 --- a/t/010_basics/020_global_destruction.t +++ b/t/basics/global_destruction.t @@ -46,6 +46,6 @@ use Test::More; ok( $_, 'in_global_destruction state is passed to DEMOLISH properly (true)' -) for split //, `$^X t/010_basics/020-global-destruction-helper.pl`; +) for split //, `$^X t/basics/global-destruction-helper.pl`; done_testing; diff --git a/t/010_basics/009_import_unimport.t b/t/basics/import_unimport.t similarity index 100% rename from t/010_basics/009_import_unimport.t rename to t/basics/import_unimport.t diff --git a/t/010_basics/004_inner_and_augment.t b/t/basics/inner_and_augment.t similarity index 100% rename from t/010_basics/004_inner_and_augment.t rename to t/basics/inner_and_augment.t diff --git a/t/010_basics/016_load_into_main.t b/t/basics/load_into_main.t similarity index 100% rename from t/010_basics/016_load_into_main.t rename to t/basics/load_into_main.t diff --git a/t/010_basics/010_method_modifier_with_regexp.t b/t/basics/method_modifier_with_regexp.t similarity index 100% rename from t/010_basics/010_method_modifier_with_regexp.t rename to t/basics/method_modifier_with_regexp.t diff --git a/t/010_basics/018_methods.t b/t/basics/methods.t similarity index 100% rename from t/010_basics/018_methods.t rename to t/basics/methods.t diff --git a/t/010_basics/021_moose_object_does.t b/t/basics/moose_object_does.t similarity index 100% rename from t/010_basics/021_moose_object_does.t rename to t/basics/moose_object_does.t diff --git a/t/010_basics/011_moose_respects_type_constraints.t b/t/basics/moose_respects_type_constraints.t similarity index 100% rename from t/010_basics/011_moose_respects_type_constraints.t rename to t/basics/moose_respects_type_constraints.t diff --git a/t/010_basics/006_override_and_foreign_classes.t b/t/basics/override_and_foreign_classes.t similarity index 100% rename from t/010_basics/006_override_and_foreign_classes.t rename to t/basics/override_and_foreign_classes.t diff --git a/t/010_basics/005_override_augment_inner_super.t b/t/basics/override_augment_inner_super.t similarity index 100% rename from t/010_basics/005_override_augment_inner_super.t rename to t/basics/override_augment_inner_super.t diff --git a/t/010_basics/012_rebless.t b/t/basics/rebless.t similarity index 100% rename from t/010_basics/012_rebless.t rename to t/basics/rebless.t diff --git a/t/010_basics/002_require_superclasses.t b/t/basics/require_superclasses.t similarity index 100% rename from t/010_basics/002_require_superclasses.t rename to t/basics/require_superclasses.t diff --git a/t/010_basics/003_super_and_override.t b/t/basics/super_and_override.t similarity index 100% rename from t/010_basics/003_super_and_override.t rename to t/basics/super_and_override.t diff --git a/t/010_basics/008_wrapped_method_cxt_propagation.t b/t/basics/wrapped_method_cxt_propagation.t similarity index 100% rename from t/010_basics/008_wrapped_method_cxt_propagation.t rename to t/basics/wrapped_method_cxt_propagation.t diff --git a/t/100_bugs/014_DEMOLISHALL.t b/t/bugs/DEMOLISHALL.t similarity index 100% rename from t/100_bugs/014_DEMOLISHALL.t rename to t/bugs/DEMOLISHALL.t diff --git a/t/100_bugs/021_DEMOLISHALL_shortcutted.t b/t/bugs/DEMOLISHALL_shortcutted.t similarity index 100% rename from t/100_bugs/021_DEMOLISHALL_shortcutted.t rename to t/bugs/DEMOLISHALL_shortcutted.t diff --git a/t/100_bugs/011_DEMOLISH_eats_exceptions.t b/t/bugs/DEMOLISH_eats_exceptions.t similarity index 100% rename from t/100_bugs/011_DEMOLISH_eats_exceptions.t rename to t/bugs/DEMOLISH_eats_exceptions.t diff --git a/t/100_bugs/012_DEMOLISH_eats_mini.t b/t/bugs/DEMOLISH_eats_mini.t similarity index 100% rename from t/100_bugs/012_DEMOLISH_eats_mini.t rename to t/bugs/DEMOLISH_eats_mini.t diff --git a/t/100_bugs/023_DEMOLISH_fails_without_metaclass.t b/t/bugs/DEMOLISH_fails_without_metaclass.t similarity index 100% rename from t/100_bugs/023_DEMOLISH_fails_without_metaclass.t rename to t/bugs/DEMOLISH_fails_without_metaclass.t diff --git a/t/100_bugs/003_Moose_Object_error.t b/t/bugs/Moose_Object_error.t similarity index 100% rename from t/100_bugs/003_Moose_Object_error.t rename to t/bugs/Moose_Object_error.t diff --git a/t/100_bugs/024_anon_method_metaclass.t b/t/bugs/anon_method_metaclass.t similarity index 100% rename from t/100_bugs/024_anon_method_metaclass.t rename to t/bugs/anon_method_metaclass.t diff --git a/t/100_bugs/031_application_metarole_compat.t b/t/bugs/application_metarole_compat.t similarity index 100% rename from t/100_bugs/031_application_metarole_compat.t rename to t/bugs/application_metarole_compat.t diff --git a/t/100_bugs/028_apply_role_to_one_instance_only.t b/t/bugs/apply_role_to_one_instance_only.t similarity index 100% rename from t/100_bugs/028_apply_role_to_one_instance_only.t rename to t/bugs/apply_role_to_one_instance_only.t diff --git a/t/100_bugs/009_augment_recursion_bug.t b/t/bugs/augment_recursion_bug.t similarity index 100% rename from t/100_bugs/009_augment_recursion_bug.t rename to t/bugs/augment_recursion_bug.t diff --git a/t/100_bugs/030_coerce_without_coercion.t b/t/bugs/coerce_without_coercion.t similarity index 100% rename from t/100_bugs/030_coerce_without_coercion.t rename to t/bugs/coerce_without_coercion.t diff --git a/t/100_bugs/027_constructor_object_overload.t b/t/bugs/constructor_object_overload.t similarity index 100% rename from t/100_bugs/027_constructor_object_overload.t rename to t/bugs/constructor_object_overload.t diff --git a/t/100_bugs/026_create_anon_recursion.t b/t/bugs/create_anon_recursion.t similarity index 100% rename from t/100_bugs/026_create_anon_recursion.t rename to t/bugs/create_anon_recursion.t diff --git a/t/100_bugs/006_handles_foreign_class_bug.t b/t/bugs/handles_foreign_class_bug.t similarity index 100% rename from t/100_bugs/006_handles_foreign_class_bug.t rename to t/bugs/handles_foreign_class_bug.t diff --git a/t/100_bugs/018_immutable_metaclass_does_role.t b/t/bugs/immutable_metaclass_does_role.t similarity index 100% rename from t/100_bugs/018_immutable_metaclass_does_role.t rename to t/bugs/immutable_metaclass_does_role.t diff --git a/t/100_bugs/010_immutable_n_default_x2.t b/t/bugs/immutable_n_default_x2.t similarity index 100% rename from t/100_bugs/010_immutable_n_default_x2.t rename to t/bugs/immutable_n_default_x2.t diff --git a/t/100_bugs/016_inheriting_from_roles.t b/t/bugs/inheriting_from_roles.t similarity index 100% rename from t/100_bugs/016_inheriting_from_roles.t rename to t/bugs/inheriting_from_roles.t diff --git a/t/100_bugs/005_inline_reader_bug.t b/t/bugs/inline_reader_bug.t similarity index 100% rename from t/100_bugs/005_inline_reader_bug.t rename to t/bugs/inline_reader_bug.t diff --git a/t/100_bugs/029_instance_application_role_args.t b/t/bugs/instance_application_role_args.t similarity index 100% rename from t/100_bugs/029_instance_application_role_args.t rename to t/bugs/instance_application_role_args.t diff --git a/t/100_bugs/013_lazybuild_required_undef.t b/t/bugs/lazybuild_required_undef.t similarity index 100% rename from t/100_bugs/013_lazybuild_required_undef.t rename to t/bugs/lazybuild_required_undef.t diff --git a/t/100_bugs/019_moose_octal_defaults.t b/t/bugs/moose_octal_defaults.t similarity index 100% rename from t/100_bugs/019_moose_octal_defaults.t rename to t/bugs/moose_octal_defaults.t diff --git a/t/100_bugs/007_reader_precedence_bug.t b/t/bugs/reader_precedence_bug.t similarity index 100% rename from t/100_bugs/007_reader_precedence_bug.t rename to t/bugs/reader_precedence_bug.t diff --git a/t/100_bugs/022_role_caller.t b/t/bugs/role_caller.t similarity index 100% rename from t/100_bugs/022_role_caller.t rename to t/bugs/role_caller.t diff --git a/t/100_bugs/004_subclass_use_base_bug.t b/t/bugs/subclass_use_base_bug.t similarity index 100% rename from t/100_bugs/004_subclass_use_base_bug.t rename to t/bugs/subclass_use_base_bug.t diff --git a/t/100_bugs/002_subtype_conflict_bug.t b/t/bugs/subtype_conflict_bug.t similarity index 100% rename from t/100_bugs/002_subtype_conflict_bug.t rename to t/bugs/subtype_conflict_bug.t diff --git a/t/100_bugs/001_subtype_quote_bug.t b/t/bugs/subtype_quote_bug.t similarity index 100% rename from t/100_bugs/001_subtype_quote_bug.t rename to t/bugs/subtype_quote_bug.t diff --git a/t/100_bugs/020_super_recursion.t b/t/bugs/super_recursion.t similarity index 100% rename from t/100_bugs/020_super_recursion.t rename to t/bugs/super_recursion.t diff --git a/t/100_bugs/017_type_constraint_messages.t b/t/bugs/type_constraint_messages.t similarity index 100% rename from t/100_bugs/017_type_constraint_messages.t rename to t/bugs/type_constraint_messages.t diff --git a/t/100_bugs/025_universal_methods_wrappable.t b/t/bugs/universal_methods_wrappable.t similarity index 100% rename from t/100_bugs/025_universal_methods_wrappable.t rename to t/bugs/universal_methods_wrappable.t diff --git a/t/001_cmop/108_ArrayBasedStorage_test.t b/t/cmop/ArrayBasedStorage_test.t similarity index 100% rename from t/001_cmop/108_ArrayBasedStorage_test.t rename to t/cmop/ArrayBasedStorage_test.t diff --git a/t/001_cmop/104_AttributesWithHistory_test.t b/t/cmop/AttributesWithHistory_test.t similarity index 100% rename from t/001_cmop/104_AttributesWithHistory_test.t rename to t/cmop/AttributesWithHistory_test.t diff --git a/t/001_cmop/100_BinaryTree_test.t b/t/cmop/BinaryTree_test.t similarity index 100% rename from t/001_cmop/100_BinaryTree_test.t rename to t/cmop/BinaryTree_test.t diff --git a/t/001_cmop/107_C3MethodDispatchOrder_test.t b/t/cmop/C3MethodDispatchOrder_test.t similarity index 100% rename from t/001_cmop/107_C3MethodDispatchOrder_test.t rename to t/cmop/C3MethodDispatchOrder_test.t diff --git a/t/001_cmop/105_ClassEncapsulatedAttributes_test.t b/t/cmop/ClassEncapsulatedAttributes_test.t similarity index 100% rename from t/001_cmop/105_ClassEncapsulatedAttributes_test.t rename to t/cmop/ClassEncapsulatedAttributes_test.t diff --git a/t/001_cmop/200_Class_C3_compatibility.t b/t/cmop/Class_C3_compatibility.t similarity index 100% rename from t/001_cmop/200_Class_C3_compatibility.t rename to t/cmop/Class_C3_compatibility.t diff --git a/t/001_cmop/102_InsideOutClass_test.t b/t/cmop/InsideOutClass_test.t similarity index 100% rename from t/001_cmop/102_InsideOutClass_test.t rename to t/cmop/InsideOutClass_test.t diff --git a/t/001_cmop/101_InstanceCountingClass_test.t b/t/cmop/InstanceCountingClass_test.t similarity index 100% rename from t/001_cmop/101_InstanceCountingClass_test.t rename to t/cmop/InstanceCountingClass_test.t diff --git a/t/001_cmop/106_LazyClass_test.t b/t/cmop/LazyClass_test.t similarity index 100% rename from t/001_cmop/106_LazyClass_test.t rename to t/cmop/LazyClass_test.t diff --git a/t/001_cmop/103_Perl6Attribute_test.t b/t/cmop/Perl6Attribute_test.t similarity index 100% rename from t/001_cmop/103_Perl6Attribute_test.t rename to t/cmop/Perl6Attribute_test.t diff --git a/t/001_cmop/301_RT_27329_fix.t b/t/cmop/RT_27329_fix.t similarity index 100% rename from t/001_cmop/301_RT_27329_fix.t rename to t/cmop/RT_27329_fix.t diff --git a/t/001_cmop/303_RT_39001_fix.t b/t/cmop/RT_39001_fix.t similarity index 100% rename from t/001_cmop/303_RT_39001_fix.t rename to t/cmop/RT_39001_fix.t diff --git a/t/001_cmop/305_RT_41255.t b/t/cmop/RT_41255.t similarity index 100% rename from t/001_cmop/305_RT_41255.t rename to t/cmop/RT_41255.t diff --git a/t/001_cmop/013_add_attribute_alternate.t b/t/cmop/add_attribute_alternate.t similarity index 100% rename from t/001_cmop/013_add_attribute_alternate.t rename to t/cmop/add_attribute_alternate.t diff --git a/t/001_cmop/017_add_method_modifier.t b/t/cmop/add_method_modifier.t similarity index 100% rename from t/001_cmop/017_add_method_modifier.t rename to t/cmop/add_method_modifier.t diff --git a/t/001_cmop/004_advanced_methods.t b/t/cmop/advanced_methods.t similarity index 100% rename from t/001_cmop/004_advanced_methods.t rename to t/cmop/advanced_methods.t diff --git a/t/001_cmop/018_anon_class.t b/t/cmop/anon_class.t similarity index 100% rename from t/001_cmop/018_anon_class.t rename to t/cmop/anon_class.t diff --git a/t/001_cmop/048_anon_class_create_init.t b/t/cmop/anon_class_create_init.t similarity index 100% rename from t/001_cmop/048_anon_class_create_init.t rename to t/cmop/anon_class_create_init.t diff --git a/t/001_cmop/019_anon_class_keep_alive.t b/t/cmop/anon_class_keep_alive.t similarity index 100% rename from t/001_cmop/019_anon_class_keep_alive.t rename to t/cmop/anon_class_keep_alive.t diff --git a/t/001_cmop/312_anon_class_leak.t b/t/cmop/anon_class_leak.t similarity index 100% rename from t/001_cmop/312_anon_class_leak.t rename to t/cmop/anon_class_leak.t diff --git a/t/001_cmop/020_attribute.t b/t/cmop/attribute.t similarity index 100% rename from t/001_cmop/020_attribute.t rename to t/cmop/attribute.t diff --git a/t/001_cmop/022_attribute_duplication.t b/t/cmop/attribute_duplication.t similarity index 100% rename from t/001_cmop/022_attribute_duplication.t rename to t/cmop/attribute_duplication.t diff --git a/t/001_cmop/021_attribute_errors_and_edge_cases.t b/t/cmop/attribute_errors_and_edge_cases.t similarity index 100% rename from t/001_cmop/021_attribute_errors_and_edge_cases.t rename to t/cmop/attribute_errors_and_edge_cases.t diff --git a/t/001_cmop/023_attribute_get_read_write.t b/t/cmop/attribute_get_read_write.t similarity index 100% rename from t/001_cmop/023_attribute_get_read_write.t rename to t/cmop/attribute_get_read_write.t diff --git a/t/001_cmop/024_attribute_initializer.t b/t/cmop/attribute_initializer.t similarity index 100% rename from t/001_cmop/024_attribute_initializer.t rename to t/cmop/attribute_initializer.t diff --git a/t/001_cmop/014_attribute_introspection.t b/t/cmop/attribute_introspection.t similarity index 100% rename from t/001_cmop/014_attribute_introspection.t rename to t/cmop/attribute_introspection.t diff --git a/t/001_cmop/025_attribute_non_alpha_name.t b/t/cmop/attribute_non_alpha_name.t similarity index 100% rename from t/001_cmop/025_attribute_non_alpha_name.t rename to t/cmop/attribute_non_alpha_name.t diff --git a/t/001_cmop/005_attributes.t b/t/cmop/attributes.t similarity index 100% rename from t/001_cmop/005_attributes.t rename to t/cmop/attributes.t diff --git a/t/001_cmop/001_basic.t b/t/cmop/basic.t similarity index 100% rename from t/001_cmop/001_basic.t rename to t/cmop/basic.t diff --git a/t/001_cmop/313_before_after_dollar_under.t b/t/cmop/before_after_dollar_under.t similarity index 100% rename from t/001_cmop/313_before_after_dollar_under.t rename to t/cmop/before_after_dollar_under.t diff --git a/t/001_cmop/016_class_errors_and_edge_cases.t b/t/cmop/class_errors_and_edge_cases.t similarity index 100% rename from t/001_cmop/016_class_errors_and_edge_cases.t rename to t/cmop/class_errors_and_edge_cases.t diff --git a/t/001_cmop/314_class_is_pristine.t b/t/cmop/class_is_pristine.t similarity index 100% rename from t/001_cmop/314_class_is_pristine.t rename to t/cmop/class_is_pristine.t diff --git a/t/001_cmop/002_class_precedence_list.t b/t/cmop/class_precedence_list.t similarity index 100% rename from t/001_cmop/002_class_precedence_list.t rename to t/cmop/class_precedence_list.t diff --git a/t/001_cmop/304_constant_codeinfo.t b/t/cmop/constant_codeinfo.t similarity index 100% rename from t/001_cmop/304_constant_codeinfo.t rename to t/cmop/constant_codeinfo.t diff --git a/t/001_cmop/011_create_class.t b/t/cmop/create_class.t similarity index 100% rename from t/001_cmop/011_create_class.t rename to t/cmop/create_class.t diff --git a/t/001_cmop/062_custom_instance.t b/t/cmop/custom_instance.t similarity index 100% rename from t/001_cmop/062_custom_instance.t rename to t/cmop/custom_instance.t diff --git a/t/001_cmop/500_deprecated.t b/t/cmop/deprecated.t similarity index 100% rename from t/001_cmop/500_deprecated.t rename to t/cmop/deprecated.t diff --git a/t/001_cmop/082_get_code_info.t b/t/cmop/get_code_info.t similarity index 100% rename from t/001_cmop/082_get_code_info.t rename to t/cmop/get_code_info.t diff --git a/t/001_cmop/074_immutable_custom_trait.t b/t/cmop/immutable_custom_trait.t similarity index 100% rename from t/001_cmop/074_immutable_custom_trait.t rename to t/cmop/immutable_custom_trait.t diff --git a/t/001_cmop/070_immutable_metaclass.t b/t/cmop/immutable_metaclass.t similarity index 100% rename from t/001_cmop/070_immutable_metaclass.t rename to t/cmop/immutable_metaclass.t diff --git a/t/001_cmop/072_immutable_w_constructors.t b/t/cmop/immutable_w_constructors.t similarity index 100% rename from t/001_cmop/072_immutable_w_constructors.t rename to t/cmop/immutable_w_constructors.t diff --git a/t/001_cmop/071_immutable_w_custom_metaclass.t b/t/cmop/immutable_w_custom_metaclass.t similarity index 100% rename from t/001_cmop/071_immutable_w_custom_metaclass.t rename to t/cmop/immutable_w_custom_metaclass.t diff --git a/t/001_cmop/311_inline_and_dollar_at.t b/t/cmop/inline_and_dollar_at.t similarity index 100% rename from t/001_cmop/311_inline_and_dollar_at.t rename to t/cmop/inline_and_dollar_at.t diff --git a/t/001_cmop/310_inline_structor.t b/t/cmop/inline_structor.t similarity index 100% rename from t/001_cmop/310_inline_structor.t rename to t/cmop/inline_structor.t diff --git a/t/001_cmop/308_insertion_order.t b/t/cmop/insertion_order.t similarity index 100% rename from t/001_cmop/308_insertion_order.t rename to t/cmop/insertion_order.t diff --git a/t/001_cmop/060_instance.t b/t/cmop/instance.t similarity index 100% rename from t/001_cmop/060_instance.t rename to t/cmop/instance.t diff --git a/t/001_cmop/061_instance_inline.t b/t/cmop/instance_inline.t similarity index 100% rename from t/001_cmop/061_instance_inline.t rename to t/cmop/instance_inline.t diff --git a/t/001_cmop/043_instance_metaclass_incompat.t b/t/cmop/instance_metaclass_incompat.t similarity index 100% rename from t/001_cmop/043_instance_metaclass_incompat.t rename to t/cmop/instance_metaclass_incompat.t diff --git a/t/001_cmop/044_instance_metaclass_incompat_dyn.t b/t/cmop/instance_metaclass_incompat_dyn.t similarity index 100% rename from t/001_cmop/044_instance_metaclass_incompat_dyn.t rename to t/cmop/instance_metaclass_incompat_dyn.t diff --git a/t/001_cmop/lib/BinaryTree.pm b/t/cmop/lib/BinaryTree.pm similarity index 100% rename from t/001_cmop/lib/BinaryTree.pm rename to t/cmop/lib/BinaryTree.pm diff --git a/t/001_cmop/lib/MyMetaClass.pm b/t/cmop/lib/MyMetaClass.pm similarity index 100% rename from t/001_cmop/lib/MyMetaClass.pm rename to t/cmop/lib/MyMetaClass.pm diff --git a/t/001_cmop/lib/MyMetaClass/Attribute.pm b/t/cmop/lib/MyMetaClass/Attribute.pm similarity index 100% rename from t/001_cmop/lib/MyMetaClass/Attribute.pm rename to t/cmop/lib/MyMetaClass/Attribute.pm diff --git a/t/001_cmop/lib/MyMetaClass/Instance.pm b/t/cmop/lib/MyMetaClass/Instance.pm similarity index 100% rename from t/001_cmop/lib/MyMetaClass/Instance.pm rename to t/cmop/lib/MyMetaClass/Instance.pm diff --git a/t/001_cmop/lib/MyMetaClass/Method.pm b/t/cmop/lib/MyMetaClass/Method.pm similarity index 100% rename from t/001_cmop/lib/MyMetaClass/Method.pm rename to t/cmop/lib/MyMetaClass/Method.pm diff --git a/t/001_cmop/lib/MyMetaClass/Random.pm b/t/cmop/lib/MyMetaClass/Random.pm similarity index 100% rename from t/001_cmop/lib/MyMetaClass/Random.pm rename to t/cmop/lib/MyMetaClass/Random.pm diff --git a/t/001_cmop/lib/SyntaxError.pm b/t/cmop/lib/SyntaxError.pm similarity index 100% rename from t/001_cmop/lib/SyntaxError.pm rename to t/cmop/lib/SyntaxError.pm diff --git a/t/001_cmop/lib/TestClassLoaded.pm b/t/cmop/lib/TestClassLoaded.pm similarity index 100% rename from t/001_cmop/lib/TestClassLoaded.pm rename to t/cmop/lib/TestClassLoaded.pm diff --git a/t/001_cmop/lib/TestClassLoaded/Sub.pm b/t/cmop/lib/TestClassLoaded/Sub.pm similarity index 100% rename from t/001_cmop/lib/TestClassLoaded/Sub.pm rename to t/cmop/lib/TestClassLoaded/Sub.pm diff --git a/t/001_cmop/lib/TestClassLoaded2.pm b/t/cmop/lib/TestClassLoaded2.pm similarity index 100% rename from t/001_cmop/lib/TestClassLoaded2.pm rename to t/cmop/lib/TestClassLoaded2.pm diff --git a/t/001_cmop/lib/TestClassLoaded3.pm b/t/cmop/lib/TestClassLoaded3.pm similarity index 100% rename from t/001_cmop/lib/TestClassLoaded3.pm rename to t/cmop/lib/TestClassLoaded3.pm diff --git a/t/001_cmop/000_load.t b/t/cmop/load.t similarity index 100% rename from t/001_cmop/000_load.t rename to t/cmop/load.t diff --git a/t/001_cmop/083_load_class.t b/t/cmop/load_class.t similarity index 100% rename from t/001_cmop/083_load_class.t rename to t/cmop/load_class.t diff --git a/t/001_cmop/085_load_class_gvstash_detect_bug.t b/t/cmop/load_class_gvstash_detect_bug.t similarity index 100% rename from t/001_cmop/085_load_class_gvstash_detect_bug.t rename to t/cmop/load_class_gvstash_detect_bug.t diff --git a/t/001_cmop/315_magic.t b/t/cmop/magic.t similarity index 100% rename from t/001_cmop/315_magic.t rename to t/cmop/magic.t diff --git a/t/001_cmop/073_make_mutable.t b/t/cmop/make_mutable.t similarity index 100% rename from t/001_cmop/073_make_mutable.t rename to t/cmop/make_mutable.t diff --git a/t/001_cmop/090_meta_method.t b/t/cmop/meta_method.t similarity index 100% rename from t/001_cmop/090_meta_method.t rename to t/cmop/meta_method.t diff --git a/t/001_cmop/080_meta_package.t b/t/cmop/meta_package.t similarity index 100% rename from t/001_cmop/080_meta_package.t rename to t/cmop/meta_package.t diff --git a/t/001_cmop/081_meta_package_extension.t b/t/cmop/meta_package_extension.t similarity index 100% rename from t/001_cmop/081_meta_package_extension.t rename to t/cmop/meta_package_extension.t diff --git a/t/001_cmop/040_metaclass.t b/t/cmop/metaclass.t similarity index 100% rename from t/001_cmop/040_metaclass.t rename to t/cmop/metaclass.t diff --git a/t/001_cmop/041_metaclass_incompatibility.t b/t/cmop/metaclass_incompatibility.t similarity index 100% rename from t/001_cmop/041_metaclass_incompatibility.t rename to t/cmop/metaclass_incompatibility.t diff --git a/t/001_cmop/042_metaclass_incompatibility_dyn.t b/t/cmop/metaclass_incompatibility_dyn.t similarity index 100% rename from t/001_cmop/042_metaclass_incompatibility_dyn.t rename to t/cmop/metaclass_incompatibility_dyn.t diff --git a/t/001_cmop/015_metaclass_inheritance.t b/t/cmop/metaclass_inheritance.t similarity index 100% rename from t/001_cmop/015_metaclass_inheritance.t rename to t/cmop/metaclass_inheritance.t diff --git a/t/001_cmop/045_metaclass_loads_classes.t b/t/cmop/metaclass_loads_classes.t similarity index 100% rename from t/001_cmop/045_metaclass_loads_classes.t rename to t/cmop/metaclass_loads_classes.t diff --git a/t/001_cmop/049_metaclass_reinitialize.t b/t/cmop/metaclass_reinitialize.t similarity index 100% rename from t/001_cmop/049_metaclass_reinitialize.t rename to t/cmop/metaclass_reinitialize.t diff --git a/t/001_cmop/030_method.t b/t/cmop/method.t similarity index 100% rename from t/001_cmop/030_method.t rename to t/cmop/method.t diff --git a/t/001_cmop/031_method_modifiers.t b/t/cmop/method_modifiers.t similarity index 100% rename from t/001_cmop/031_method_modifiers.t rename to t/cmop/method_modifiers.t diff --git a/t/001_cmop/003_methods.t b/t/cmop/methods.t similarity index 100% rename from t/001_cmop/003_methods.t rename to t/cmop/methods.t diff --git a/t/001_cmop/302_modify_parent_method.t b/t/cmop/modify_parent_method.t similarity index 100% rename from t/001_cmop/302_modify_parent_method.t rename to t/cmop/modify_parent_method.t diff --git a/t/001_cmop/006_new_and_clone_metaclasses.t b/t/cmop/new_and_clone_metaclasses.t similarity index 100% rename from t/001_cmop/006_new_and_clone_metaclasses.t rename to t/cmop/new_and_clone_metaclasses.t diff --git a/t/001_cmop/307_null_stash.t b/t/cmop/null_stash.t similarity index 100% rename from t/001_cmop/307_null_stash.t rename to t/cmop/null_stash.t diff --git a/t/001_cmop/316_numeric_defaults.t b/t/cmop/numeric_defaults.t similarity index 100% rename from t/001_cmop/316_numeric_defaults.t rename to t/cmop/numeric_defaults.t diff --git a/t/001_cmop/012_package_variables.t b/t/cmop/package_variables.t similarity index 100% rename from t/001_cmop/012_package_variables.t rename to t/cmop/package_variables.t diff --git a/t/001_cmop/300_random_eval_bug.t b/t/cmop/random_eval_bug.t similarity index 100% rename from t/001_cmop/300_random_eval_bug.t rename to t/cmop/random_eval_bug.t diff --git a/t/001_cmop/046_rebless_instance.t b/t/cmop/rebless_instance.t similarity index 100% rename from t/001_cmop/046_rebless_instance.t rename to t/cmop/rebless_instance.t diff --git a/t/001_cmop/086_rebless_instance_away.t b/t/cmop/rebless_instance_away.t similarity index 100% rename from t/001_cmop/086_rebless_instance_away.t rename to t/cmop/rebless_instance_away.t diff --git a/t/001_cmop/306_rebless_overload.t b/t/cmop/rebless_overload.t similarity index 100% rename from t/001_cmop/306_rebless_overload.t rename to t/cmop/rebless_overload.t diff --git a/t/001_cmop/047_rebless_with_extra_params.t b/t/cmop/rebless_with_extra_params.t similarity index 100% rename from t/001_cmop/047_rebless_with_extra_params.t rename to t/cmop/rebless_with_extra_params.t diff --git a/t/001_cmop/050_scala_style_mixin_composition.t b/t/cmop/scala_style_mixin_composition.t similarity index 100% rename from t/001_cmop/050_scala_style_mixin_composition.t rename to t/cmop/scala_style_mixin_composition.t diff --git a/t/001_cmop/010_self_introspection.t b/t/cmop/self_introspection.t similarity index 100% rename from t/001_cmop/010_self_introspection.t rename to t/cmop/self_introspection.t diff --git a/t/001_cmop/087_subclasses.t b/t/cmop/subclasses.t similarity index 100% rename from t/001_cmop/087_subclasses.t rename to t/cmop/subclasses.t diff --git a/t/001_cmop/309_subname.t b/t/cmop/subname.t similarity index 100% rename from t/001_cmop/309_subname.t rename to t/cmop/subname.t diff --git a/t/001_cmop/032_universal_methods.t b/t/cmop/universal_methods.t similarity index 100% rename from t/001_cmop/032_universal_methods.t rename to t/cmop/universal_methods.t diff --git a/t/060_compat/005_composite_metaroles.t b/t/compat/composite_metaroles.t similarity index 100% rename from t/060_compat/005_composite_metaroles.t rename to t/compat/composite_metaroles.t diff --git a/t/060_compat/004_extends_nonmoose_that_isa_moose_with_metarole.t b/t/compat/extends_nonmoose_that_isa_moose_with_metarole.t similarity index 100% rename from t/060_compat/004_extends_nonmoose_that_isa_moose_with_metarole.t rename to t/compat/extends_nonmoose_that_isa_moose_with_metarole.t diff --git a/t/060_compat/003_foreign_inheritence.t b/t/compat/foreign_inheritence.t similarity index 100% rename from t/060_compat/003_foreign_inheritence.t rename to t/compat/foreign_inheritence.t diff --git a/t/060_compat/001_module_refresh_compat.t b/t/compat/module_refresh_compat.t similarity index 100% rename from t/060_compat/001_module_refresh_compat.t rename to t/compat/module_refresh_compat.t diff --git a/t/060_compat/002_moose_respects_base.t b/t/compat/moose_respects_base.t similarity index 100% rename from t/060_compat/002_moose_respects_base.t rename to t/compat/moose_respects_base.t diff --git a/t/200_examples/007_Child_Parent_attr_inherit.t b/t/examples/Child_Parent_attr_inherit.t similarity index 100% rename from t/200_examples/007_Child_Parent_attr_inherit.t rename to t/examples/Child_Parent_attr_inherit.t diff --git a/t/200_examples/001_example.t b/t/examples/example1.t similarity index 100% rename from t/200_examples/001_example.t rename to t/examples/example1.t diff --git a/t/200_examples/003_example.t b/t/examples/example2.t similarity index 100% rename from t/200_examples/003_example.t rename to t/examples/example2.t diff --git a/t/200_examples/002_example_Moose_POOP.t b/t/examples/example_Moose_POOP.t similarity index 100% rename from t/200_examples/002_example_Moose_POOP.t rename to t/examples/example_Moose_POOP.t diff --git a/t/200_examples/006_example_Protomoose.t b/t/examples/example_Protomoose.t similarity index 100% rename from t/200_examples/006_example_Protomoose.t rename to t/examples/example_Protomoose.t diff --git a/t/200_examples/004_example_w_DCS.t b/t/examples/example_w_DCS.t similarity index 100% rename from t/200_examples/004_example_w_DCS.t rename to t/examples/example_w_DCS.t diff --git a/t/200_examples/005_example_w_TestDeep.t b/t/examples/example_w_TestDeep.t similarity index 100% rename from t/200_examples/005_example_w_TestDeep.t rename to t/examples/example_w_TestDeep.t diff --git a/t/200_examples/008_record_set_iterator.t b/t/examples/record_set_iterator.t similarity index 100% rename from t/200_examples/008_record_set_iterator.t rename to t/examples/record_set_iterator.t diff --git a/t/300_immutable/002_apply_roles_to_immutable.t b/t/immutable/apply_roles_to_immutable.t similarity index 100% rename from t/300_immutable/002_apply_roles_to_immutable.t rename to t/immutable/apply_roles_to_immutable.t diff --git a/t/300_immutable/009_buildargs.t b/t/immutable/buildargs.t similarity index 100% rename from t/300_immutable/009_buildargs.t rename to t/immutable/buildargs.t diff --git a/t/300_immutable/010_constructor_is_not_moose.t b/t/immutable/constructor_is_not_moose.t similarity index 100% rename from t/300_immutable/010_constructor_is_not_moose.t rename to t/immutable/constructor_is_not_moose.t diff --git a/t/300_immutable/011_constructor_is_wrapped.t b/t/immutable/constructor_is_wrapped.t similarity index 100% rename from t/300_immutable/011_constructor_is_wrapped.t rename to t/immutable/constructor_is_wrapped.t diff --git a/t/300_immutable/012_default_values.t b/t/immutable/default_values.t similarity index 100% rename from t/300_immutable/012_default_values.t rename to t/immutable/default_values.t diff --git a/t/300_immutable/008_immutable_constructor_error.t b/t/immutable/immutable_constructor_error.t similarity index 100% rename from t/300_immutable/008_immutable_constructor_error.t rename to t/immutable/immutable_constructor_error.t diff --git a/t/300_immutable/015_immutable_destroy.t b/t/immutable/immutable_destroy.t similarity index 100% rename from t/300_immutable/015_immutable_destroy.t rename to t/immutable/immutable_destroy.t diff --git a/t/300_immutable/003_immutable_meta_class.t b/t/immutable/immutable_meta_class.t similarity index 100% rename from t/300_immutable/003_immutable_meta_class.t rename to t/immutable/immutable_meta_class.t diff --git a/t/300_immutable/014_immutable_metaclass_with_traits.t b/t/immutable/immutable_metaclass_with_traits.t similarity index 100% rename from t/300_immutable/014_immutable_metaclass_with_traits.t rename to t/immutable/immutable_metaclass_with_traits.t diff --git a/t/300_immutable/001_immutable_moose.t b/t/immutable/immutable_moose.t similarity index 100% rename from t/300_immutable/001_immutable_moose.t rename to t/immutable/immutable_moose.t diff --git a/t/300_immutable/013_immutable_roundtrip.t b/t/immutable/immutable_roundtrip.t similarity index 100% rename from t/300_immutable/013_immutable_roundtrip.t rename to t/immutable/immutable_roundtrip.t diff --git a/t/300_immutable/007_immutable_trigger_from_constructor.t b/t/immutable/immutable_trigger_from_constructor.t similarity index 100% rename from t/300_immutable/007_immutable_trigger_from_constructor.t rename to t/immutable/immutable_trigger_from_constructor.t diff --git a/t/300_immutable/016_inline_fallbacks.t b/t/immutable/inline_fallbacks.t similarity index 100% rename from t/300_immutable/016_inline_fallbacks.t rename to t/immutable/inline_fallbacks.t diff --git a/t/300_immutable/004_inlined_constructors_n_types.t b/t/immutable/inlined_constructors_n_types.t similarity index 100% rename from t/300_immutable/004_inlined_constructors_n_types.t rename to t/immutable/inlined_constructors_n_types.t diff --git a/t/300_immutable/005_multiple_demolish_inline.t b/t/immutable/multiple_demolish_inline.t similarity index 100% rename from t/300_immutable/005_multiple_demolish_inline.t rename to t/immutable/multiple_demolish_inline.t diff --git a/t/050_metaclasses/019_create_anon_with_required_attr.t b/t/metaclasses/create_anon_with_required_attr.t similarity index 100% rename from t/050_metaclasses/019_create_anon_with_required_attr.t rename to t/metaclasses/create_anon_with_required_attr.t diff --git a/t/050_metaclasses/002_custom_attr_meta_as_role.t b/t/metaclasses/custom_attr_meta_as_role.t similarity index 100% rename from t/050_metaclasses/002_custom_attr_meta_as_role.t rename to t/metaclasses/custom_attr_meta_as_role.t diff --git a/t/050_metaclasses/001_custom_attr_meta_with_roles.t b/t/metaclasses/custom_attr_meta_with_roles.t similarity index 100% rename from t/050_metaclasses/001_custom_attr_meta_with_roles.t rename to t/metaclasses/custom_attr_meta_with_roles.t diff --git a/t/050_metaclasses/023_easy_init_meta.t b/t/metaclasses/easy_init_meta.t similarity index 100% rename from t/050_metaclasses/023_easy_init_meta.t rename to t/metaclasses/easy_init_meta.t diff --git a/t/050_metaclasses/021_export_with_prototype.t b/t/metaclasses/export_with_prototype.t similarity index 100% rename from t/050_metaclasses/021_export_with_prototype.t rename to t/metaclasses/export_with_prototype.t diff --git a/t/050_metaclasses/010_extending_and_embedding_back_compat.t b/t/metaclasses/extending_and_embedding_back_compat.t similarity index 100% rename from t/050_metaclasses/010_extending_and_embedding_back_compat.t rename to t/metaclasses/extending_and_embedding_back_compat.t diff --git a/t/050_metaclasses/014_goto_moose_import.t b/t/metaclasses/goto_moose_import.t similarity index 100% rename from t/050_metaclasses/014_goto_moose_import.t rename to t/metaclasses/goto_moose_import.t diff --git a/t/050_metaclasses/053_immutable_metaclass_compat_bug.t b/t/metaclasses/immutable_metaclass_compat_bug.t similarity index 100% rename from t/050_metaclasses/053_immutable_metaclass_compat_bug.t rename to t/metaclasses/immutable_metaclass_compat_bug.t diff --git a/t/050_metaclasses/062_meta_name.t b/t/metaclasses/meta_name.t similarity index 100% rename from t/050_metaclasses/062_meta_name.t rename to t/metaclasses/meta_name.t diff --git a/t/050_metaclasses/052_metaclass_compat.t b/t/metaclasses/metaclass_compat.t similarity index 100% rename from t/050_metaclasses/052_metaclass_compat.t rename to t/metaclasses/metaclass_compat.t diff --git a/t/050_metaclasses/054_metaclass_compat_no_fixing_bug.t b/t/metaclasses/metaclass_compat_no_fixing_bug.t similarity index 100% rename from t/050_metaclasses/054_metaclass_compat_no_fixing_bug.t rename to t/metaclasses/metaclass_compat_no_fixing_bug.t diff --git a/t/050_metaclasses/020_metaclass_parameterized_traits.t b/t/metaclasses/metaclass_parameterized_traits.t similarity index 100% rename from t/050_metaclasses/020_metaclass_parameterized_traits.t rename to t/metaclasses/metaclass_parameterized_traits.t diff --git a/t/050_metaclasses/013_metaclass_traits.t b/t/metaclasses/metaclass_traits.t similarity index 100% rename from t/050_metaclasses/013_metaclass_traits.t rename to t/metaclasses/metaclass_traits.t diff --git a/t/050_metaclasses/015_metarole.t b/t/metaclasses/metarole.t similarity index 100% rename from t/050_metaclasses/015_metarole.t rename to t/metaclasses/metarole.t diff --git a/t/050_metaclasses/050_metarole_backcompat.t b/t/metaclasses/metarole_backcompat.t similarity index 100% rename from t/050_metaclasses/050_metarole_backcompat.t rename to t/metaclasses/metarole_backcompat.t diff --git a/t/050_metaclasses/030_metarole_combination.t b/t/metaclasses/metarole_combination.t similarity index 100% rename from t/050_metaclasses/030_metarole_combination.t rename to t/metaclasses/metarole_combination.t diff --git a/t/050_metaclasses/051_metarole_on_anon.t b/t/metaclasses/metarole_on_anon.t similarity index 100% rename from t/050_metaclasses/051_metarole_on_anon.t rename to t/metaclasses/metarole_on_anon.t diff --git a/t/050_metaclasses/016_metarole_w_metaclass_pm.t b/t/metaclasses/metarole_w_metaclass_pm.t similarity index 100% rename from t/050_metaclasses/016_metarole_w_metaclass_pm.t rename to t/metaclasses/metarole_w_metaclass_pm.t diff --git a/t/050_metaclasses/070_metaroles_of_metaroles.t b/t/metaclasses/metaroles_of_metaroles.t similarity index 100% rename from t/050_metaclasses/070_metaroles_of_metaroles.t rename to t/metaclasses/metaroles_of_metaroles.t diff --git a/t/050_metaclasses/012_moose_exporter.t b/t/metaclasses/moose_exporter.t similarity index 100% rename from t/050_metaclasses/012_moose_exporter.t rename to t/metaclasses/moose_exporter.t diff --git a/t/050_metaclasses/061_moose_exporter_trait_aliases.t b/t/metaclasses/moose_exporter_trait_aliases.t similarity index 100% rename from t/050_metaclasses/061_moose_exporter_trait_aliases.t rename to t/metaclasses/moose_exporter_trait_aliases.t diff --git a/t/050_metaclasses/004_moose_for_meta.t b/t/metaclasses/moose_for_meta.t similarity index 100% rename from t/050_metaclasses/004_moose_for_meta.t rename to t/metaclasses/moose_for_meta.t diff --git a/t/050_metaclasses/040_moose_nonmoose_metatrait_init_order.t b/t/metaclasses/moose_nonmoose_metatrait_init_order.t similarity index 100% rename from t/050_metaclasses/040_moose_nonmoose_metatrait_init_order.t rename to t/metaclasses/moose_nonmoose_metatrait_init_order.t diff --git a/t/050_metaclasses/041_moose_nonmoose_moose_chain_init_meta.t b/t/metaclasses/moose_nonmoose_moose_chain_init_meta.t similarity index 100% rename from t/050_metaclasses/041_moose_nonmoose_moose_chain_init_meta.t rename to t/metaclasses/moose_nonmoose_moose_chain_init_meta.t diff --git a/t/050_metaclasses/003_moose_w_metaclass.t b/t/metaclasses/moose_w_metaclass.t similarity index 100% rename from t/050_metaclasses/003_moose_w_metaclass.t rename to t/metaclasses/moose_w_metaclass.t diff --git a/t/050_metaclasses/022_new_metaclass.t b/t/metaclasses/new_metaclass.t similarity index 100% rename from t/050_metaclasses/022_new_metaclass.t rename to t/metaclasses/new_metaclass.t diff --git a/t/050_metaclasses/055_new_object_BUILD.t b/t/metaclasses/new_object_BUILD.t similarity index 100% rename from t/050_metaclasses/055_new_object_BUILD.t rename to t/metaclasses/new_object_BUILD.t diff --git a/t/050_metaclasses/060_reinitialize.t b/t/metaclasses/reinitialize.t similarity index 100% rename from t/050_metaclasses/060_reinitialize.t rename to t/metaclasses/reinitialize.t diff --git a/t/050_metaclasses/018_throw_error.t b/t/metaclasses/throw_error.t similarity index 100% rename from t/050_metaclasses/018_throw_error.t rename to t/metaclasses/throw_error.t diff --git a/t/050_metaclasses/017_use_base_of_moose.t b/t/metaclasses/use_base_of_moose.t similarity index 100% rename from t/050_metaclasses/017_use_base_of_moose.t rename to t/metaclasses/use_base_of_moose.t diff --git a/t/400_moose_util/007_apply_roles.t b/t/moose_util/apply_roles.t similarity index 100% rename from t/400_moose_util/007_apply_roles.t rename to t/moose_util/apply_roles.t diff --git a/t/400_moose_util/006_create_alias.t b/t/moose_util/create_alias.t similarity index 100% rename from t/400_moose_util/006_create_alias.t rename to t/moose_util/create_alias.t diff --git a/t/400_moose_util/005_ensure_all_roles.t b/t/moose_util/ensure_all_roles.t similarity index 100% rename from t/400_moose_util/005_ensure_all_roles.t rename to t/moose_util/ensure_all_roles.t diff --git a/t/400_moose_util/008_method_mod_args.t b/t/moose_util/method_mod_args.t similarity index 100% rename from t/400_moose_util/008_method_mod_args.t rename to t/moose_util/method_mod_args.t diff --git a/t/400_moose_util/001_moose_util.t b/t/moose_util/moose_util.t similarity index 100% rename from t/400_moose_util/001_moose_util.t rename to t/moose_util/moose_util.t diff --git a/t/400_moose_util/002_moose_util_does_role.t b/t/moose_util/moose_util_does_role.t similarity index 100% rename from t/400_moose_util/002_moose_util_does_role.t rename to t/moose_util/moose_util_does_role.t diff --git a/t/400_moose_util/003_moose_util_search_class_by_role.t b/t/moose_util/moose_util_search_class_by_role.t similarity index 100% rename from t/400_moose_util/003_moose_util_search_class_by_role.t rename to t/moose_util/moose_util_search_class_by_role.t diff --git a/t/400_moose_util/004_resolve_alias.t b/t/moose_util/resolve_alias.t similarity index 100% rename from t/400_moose_util/004_resolve_alias.t rename to t/moose_util/resolve_alias.t diff --git a/t/400_moose_util/009_with_traits.t b/t/moose_util/with_traits.t similarity index 100% rename from t/400_moose_util/009_with_traits.t rename to t/moose_util/with_traits.t diff --git a/t/070_native_traits/013_array_coerce.t b/t/native_traits/array_coerce.t similarity index 100% rename from t/070_native_traits/013_array_coerce.t rename to t/native_traits/array_coerce.t diff --git a/t/070_native_traits/100_array_from_role.t b/t/native_traits/array_from_role.t similarity index 100% rename from t/070_native_traits/100_array_from_role.t rename to t/native_traits/array_from_role.t diff --git a/t/070_native_traits/011_array_subtypes.t b/t/native_traits/array_subtypes.t similarity index 100% rename from t/070_native_traits/011_array_subtypes.t rename to t/native_traits/array_subtypes.t diff --git a/t/070_native_traits/012_array_trigger.t b/t/native_traits/array_trigger.t similarity index 100% rename from t/070_native_traits/012_array_trigger.t rename to t/native_traits/array_trigger.t diff --git a/t/070_native_traits/102_collection_with_roles.t b/t/native_traits/collection_with_roles.t similarity index 100% rename from t/070_native_traits/102_collection_with_roles.t rename to t/native_traits/collection_with_roles.t diff --git a/t/070_native_traits/103_custom_instance.t b/t/native_traits/custom_instance.t similarity index 100% rename from t/070_native_traits/103_custom_instance.t rename to t/native_traits/custom_instance.t diff --git a/t/070_native_traits/053_hash_coerce.t b/t/native_traits/hash_coerce.t similarity index 100% rename from t/070_native_traits/053_hash_coerce.t rename to t/native_traits/hash_coerce.t diff --git a/t/070_native_traits/051_hash_subtypes.t b/t/native_traits/hash_subtypes.t similarity index 100% rename from t/070_native_traits/051_hash_subtypes.t rename to t/native_traits/hash_subtypes.t diff --git a/t/070_native_traits/052_hash_trigger.t b/t/native_traits/hash_trigger.t similarity index 100% rename from t/070_native_traits/052_hash_trigger.t rename to t/native_traits/hash_trigger.t diff --git a/t/070_native_traits/101_remove_attribute.t b/t/native_traits/remove_attribute.t similarity index 100% rename from t/070_native_traits/101_remove_attribute.t rename to t/native_traits/remove_attribute.t diff --git a/t/070_native_traits/010_trait_array.t b/t/native_traits/trait_array.t similarity index 100% rename from t/070_native_traits/010_trait_array.t rename to t/native_traits/trait_array.t diff --git a/t/070_native_traits/020_trait_bool.t b/t/native_traits/trait_bool.t similarity index 100% rename from t/070_native_traits/020_trait_bool.t rename to t/native_traits/trait_bool.t diff --git a/t/070_native_traits/030_trait_code.t b/t/native_traits/trait_code.t similarity index 100% rename from t/070_native_traits/030_trait_code.t rename to t/native_traits/trait_code.t diff --git a/t/070_native_traits/040_trait_counter.t b/t/native_traits/trait_counter.t similarity index 100% rename from t/070_native_traits/040_trait_counter.t rename to t/native_traits/trait_counter.t diff --git a/t/070_native_traits/050_trait_hash.t b/t/native_traits/trait_hash.t similarity index 100% rename from t/070_native_traits/050_trait_hash.t rename to t/native_traits/trait_hash.t diff --git a/t/070_native_traits/060_trait_number.t b/t/native_traits/trait_number.t similarity index 100% rename from t/070_native_traits/060_trait_number.t rename to t/native_traits/trait_number.t diff --git a/t/070_native_traits/070_trait_string.t b/t/native_traits/trait_string.t similarity index 100% rename from t/070_native_traits/070_trait_string.t rename to t/native_traits/trait_string.t diff --git a/t/002_recipes/basics_recipe10.t b/t/recipes/basics_recipe10.t similarity index 100% rename from t/002_recipes/basics_recipe10.t rename to t/recipes/basics_recipe10.t diff --git a/t/030_roles/035_anonymous_roles.t b/t/roles/anonymous_roles.t similarity index 100% rename from t/030_roles/035_anonymous_roles.t rename to t/roles/anonymous_roles.t diff --git a/t/030_roles/039_application_toclass.t b/t/roles/application_toclass.t similarity index 100% rename from t/030_roles/039_application_toclass.t rename to t/roles/application_toclass.t diff --git a/t/030_roles/003_apply_role.t b/t/roles/apply_role.t similarity index 100% rename from t/030_roles/003_apply_role.t rename to t/roles/apply_role.t diff --git a/t/030_roles/019_build.t b/t/roles/build.t similarity index 100% rename from t/030_roles/019_build.t rename to t/roles/build.t diff --git a/t/030_roles/042_compose_overloading.t b/t/roles/compose_overloading.t similarity index 100% rename from t/030_roles/042_compose_overloading.t rename to t/roles/compose_overloading.t diff --git a/t/030_roles/043_conflict_many_methods.t b/t/roles/conflict_many_methods.t similarity index 100% rename from t/030_roles/043_conflict_many_methods.t rename to t/roles/conflict_many_methods.t diff --git a/t/030_roles/034_create_role.t b/t/roles/create_role.t similarity index 100% rename from t/030_roles/034_create_role.t rename to t/roles/create_role.t diff --git a/t/030_roles/037_create_role_subclass.t b/t/roles/create_role_subclass.t similarity index 100% rename from t/030_roles/037_create_role_subclass.t rename to t/roles/create_role_subclass.t diff --git a/t/030_roles/041_empty_method_modifiers_meta_bug.t b/t/roles/empty_method_modifiers_meta_bug.t similarity index 100% rename from t/030_roles/041_empty_method_modifiers_meta_bug.t rename to t/roles/empty_method_modifiers_meta_bug.t diff --git a/t/030_roles/017_extending_role_attrs.t b/t/roles/extending_role_attrs.t similarity index 100% rename from t/030_roles/017_extending_role_attrs.t rename to t/roles/extending_role_attrs.t diff --git a/t/030_roles/036_free_anonymous_roles.t b/t/roles/free_anonymous_roles.t similarity index 100% rename from t/030_roles/036_free_anonymous_roles.t rename to t/roles/free_anonymous_roles.t diff --git a/t/030_roles/001_meta_role.t b/t/roles/meta_role.t similarity index 100% rename from t/030_roles/001_meta_role.t rename to t/roles/meta_role.t diff --git a/t/030_roles/013_method_aliasing_in_composition.t b/t/roles/method_aliasing_in_composition.t similarity index 100% rename from t/030_roles/013_method_aliasing_in_composition.t rename to t/roles/method_aliasing_in_composition.t diff --git a/t/030_roles/012_method_exclusion_in_composition.t b/t/roles/method_exclusion_in_composition.t similarity index 100% rename from t/030_roles/012_method_exclusion_in_composition.t rename to t/roles/method_exclusion_in_composition.t diff --git a/t/030_roles/048_method_modifiers.t b/t/roles/method_modifiers.t similarity index 100% rename from t/030_roles/048_method_modifiers.t rename to t/roles/method_modifiers.t diff --git a/t/030_roles/014_more_alias_and_exclude.t b/t/roles/more_alias_and_exclude.t similarity index 100% rename from t/030_roles/014_more_alias_and_exclude.t rename to t/roles/more_alias_and_exclude.t diff --git a/t/030_roles/009_more_role_edge_cases.t b/t/roles/more_role_edge_cases.t similarity index 100% rename from t/030_roles/009_more_role_edge_cases.t rename to t/roles/more_role_edge_cases.t diff --git a/t/030_roles/038_new_meta_role.t b/t/roles/new_meta_role.t similarity index 100% rename from t/030_roles/038_new_meta_role.t rename to t/roles/new_meta_role.t diff --git a/t/030_roles/011_overriding.t b/t/roles/overriding.t similarity index 100% rename from t/030_roles/011_overriding.t rename to t/roles/overriding.t diff --git a/t/030_roles/049_reinitialize_anon_role.t b/t/roles/reinitialize_anon_role.t similarity index 100% rename from t/030_roles/049_reinitialize_anon_role.t rename to t/roles/reinitialize_anon_role.t diff --git a/t/030_roles/002_role.t b/t/roles/role.t similarity index 100% rename from t/030_roles/002_role.t rename to t/roles/role.t diff --git a/t/030_roles/046_role_attr_application.t b/t/roles/role_attr_application.t similarity index 100% rename from t/030_roles/046_role_attr_application.t rename to t/roles/role_attr_application.t diff --git a/t/030_roles/047_role_attribute_conflict.t b/t/roles/role_attribute_conflict.t similarity index 100% rename from t/030_roles/047_role_attribute_conflict.t rename to t/roles/role_attribute_conflict.t diff --git a/t/030_roles/044_role_attrs.t b/t/roles/role_attrs.t similarity index 100% rename from t/030_roles/044_role_attrs.t rename to t/roles/role_attrs.t diff --git a/t/030_roles/045_role_compose_requires.t b/t/roles/role_compose_requires.t similarity index 100% rename from t/030_roles/045_role_compose_requires.t rename to t/roles/role_compose_requires.t diff --git a/t/030_roles/020_role_composite.t b/t/roles/role_composite.t similarity index 100% rename from t/030_roles/020_role_composite.t rename to t/roles/role_composite.t diff --git a/t/030_roles/021_role_composite_exclusion.t b/t/roles/role_composite_exclusion.t similarity index 100% rename from t/030_roles/021_role_composite_exclusion.t rename to t/roles/role_composite_exclusion.t diff --git a/t/030_roles/023_role_composition_attributes.t b/t/roles/role_composition_attributes.t similarity index 100% rename from t/030_roles/023_role_composition_attributes.t rename to t/roles/role_composition_attributes.t diff --git a/t/030_roles/004_role_composition_errors.t b/t/roles/role_composition_errors.t similarity index 100% rename from t/030_roles/004_role_composition_errors.t rename to t/roles/role_composition_errors.t diff --git a/t/030_roles/026_role_composition_method_mods.t b/t/roles/role_composition_method_mods.t similarity index 100% rename from t/030_roles/026_role_composition_method_mods.t rename to t/roles/role_composition_method_mods.t diff --git a/t/030_roles/024_role_composition_methods.t b/t/roles/role_composition_methods.t similarity index 100% rename from t/030_roles/024_role_composition_methods.t rename to t/roles/role_composition_methods.t diff --git a/t/030_roles/025_role_composition_override.t b/t/roles/role_composition_override.t similarity index 100% rename from t/030_roles/025_role_composition_override.t rename to t/roles/role_composition_override.t diff --git a/t/030_roles/022_role_composition_req_methods.t b/t/roles/role_composition_req_methods.t similarity index 100% rename from t/030_roles/022_role_composition_req_methods.t rename to t/roles/role_composition_req_methods.t diff --git a/t/030_roles/005_role_conflict_detection.t b/t/roles/role_conflict_detection.t similarity index 100% rename from t/030_roles/005_role_conflict_detection.t rename to t/roles/role_conflict_detection.t diff --git a/t/030_roles/008_role_conflict_edge_cases.t b/t/roles/role_conflict_edge_cases.t similarity index 100% rename from t/030_roles/008_role_conflict_edge_cases.t rename to t/roles/role_conflict_edge_cases.t diff --git a/t/030_roles/050_role_consumers.t b/t/roles/role_consumers.t similarity index 100% rename from t/030_roles/050_role_consumers.t rename to t/roles/role_consumers.t diff --git a/t/030_roles/006_role_exclusion.t b/t/roles/role_exclusion.t similarity index 100% rename from t/030_roles/006_role_exclusion.t rename to t/roles/role_exclusion.t diff --git a/t/030_roles/033_role_exclusion_and_alias_bug.t b/t/roles/role_exclusion_and_alias_bug.t similarity index 100% rename from t/030_roles/033_role_exclusion_and_alias_bug.t rename to t/roles/role_exclusion_and_alias_bug.t diff --git a/t/030_roles/040_role_for_combination.t b/t/roles/role_for_combination.t similarity index 100% rename from t/030_roles/040_role_for_combination.t rename to t/roles/role_for_combination.t diff --git a/t/030_roles/032_roles_and_method_cloning.t b/t/roles/roles_and_method_cloning.t similarity index 100% rename from t/030_roles/032_roles_and_method_cloning.t rename to t/roles/roles_and_method_cloning.t diff --git a/t/030_roles/007_roles_and_req_method_edge_cases.t b/t/roles/roles_and_req_method_edge_cases.t similarity index 100% rename from t/030_roles/007_roles_and_req_method_edge_cases.t rename to t/roles/roles_and_req_method_edge_cases.t diff --git a/t/030_roles/031_roles_applied_in_create.t b/t/roles/roles_applied_in_create.t similarity index 100% rename from t/030_roles/031_roles_applied_in_create.t rename to t/roles/roles_applied_in_create.t diff --git a/t/030_roles/010_run_time_role_composition.t b/t/roles/run_time_role_composition.t similarity index 100% rename from t/030_roles/010_run_time_role_composition.t rename to t/roles/run_time_role_composition.t diff --git a/t/030_roles/015_runtime_roles_and_attrs.t b/t/roles/runtime_roles_and_attrs.t similarity index 100% rename from t/030_roles/015_runtime_roles_and_attrs.t rename to t/roles/runtime_roles_and_attrs.t diff --git a/t/030_roles/016_runtime_roles_and_nonmoose.t b/t/roles/runtime_roles_and_nonmoose.t similarity index 100% rename from t/030_roles/016_runtime_roles_and_nonmoose.t rename to t/roles/runtime_roles_and_nonmoose.t diff --git a/t/030_roles/018_runtime_roles_w_params.t b/t/roles/runtime_roles_w_params.t similarity index 100% rename from t/030_roles/018_runtime_roles_w_params.t rename to t/roles/runtime_roles_w_params.t diff --git a/t/500_test_moose/001_test_moose.t b/t/test_moose/test_moose.t similarity index 100% rename from t/500_test_moose/001_test_moose.t rename to t/test_moose/test_moose.t diff --git a/t/500_test_moose/002_test_moose_does_ok.t b/t/test_moose/test_moose_does_ok.t similarity index 100% rename from t/500_test_moose/002_test_moose_does_ok.t rename to t/test_moose/test_moose_does_ok.t diff --git a/t/500_test_moose/003_test_moose_has_attribute_ok.t b/t/test_moose/test_moose_has_attribute_ok.t similarity index 100% rename from t/500_test_moose/003_test_moose_has_attribute_ok.t rename to t/test_moose/test_moose_has_attribute_ok.t diff --git a/t/500_test_moose/004_test_moose_meta_ok.t b/t/test_moose/test_moose_meta_ok.t similarity index 100% rename from t/500_test_moose/004_test_moose_meta_ok.t rename to t/test_moose/test_moose_meta_ok.t diff --git a/t/500_test_moose/005_with_immutable.t b/t/test_moose/with_immutable.t similarity index 100% rename from t/500_test_moose/005_with_immutable.t rename to t/test_moose/with_immutable.t diff --git a/t/600_todo_tests/001_exception_reflects_failed_constraint.t b/t/todo_tests/exception_reflects_failed_constraint.t similarity index 100% rename from t/600_todo_tests/001_exception_reflects_failed_constraint.t rename to t/todo_tests/exception_reflects_failed_constraint.t diff --git a/t/600_todo_tests/003_immutable_n_around.t b/t/todo_tests/immutable_n_around.t similarity index 100% rename from t/600_todo_tests/003_immutable_n_around.t rename to t/todo_tests/immutable_n_around.t diff --git a/t/600_todo_tests/005_moose_and_threads.t b/t/todo_tests/moose_and_threads.t similarity index 100% rename from t/600_todo_tests/005_moose_and_threads.t rename to t/todo_tests/moose_and_threads.t diff --git a/t/600_todo_tests/008_replacing_super_methods.t b/t/todo_tests/replacing_super_methods.t similarity index 100% rename from t/600_todo_tests/008_replacing_super_methods.t rename to t/todo_tests/replacing_super_methods.t diff --git a/t/600_todo_tests/006_required_role_accessors.t b/t/todo_tests/required_role_accessors.t similarity index 100% rename from t/600_todo_tests/006_required_role_accessors.t rename to t/todo_tests/required_role_accessors.t diff --git a/t/600_todo_tests/004_role_insertion_order.t b/t/todo_tests/role_insertion_order.t similarity index 100% rename from t/600_todo_tests/004_role_insertion_order.t rename to t/todo_tests/role_insertion_order.t diff --git a/t/600_todo_tests/002_various_role_features.t b/t/todo_tests/various_role_features.t similarity index 100% rename from t/600_todo_tests/002_various_role_features.t rename to t/todo_tests/various_role_features.t diff --git a/t/040_type_constraints/013_advanced_type_creation.t b/t/type_constraints/advanced_type_creation.t similarity index 100% rename from t/040_type_constraints/013_advanced_type_creation.t rename to t/type_constraints/advanced_type_creation.t diff --git a/t/040_type_constraints/030_class_subtypes.t b/t/type_constraints/class_subtypes.t similarity index 100% rename from t/040_type_constraints/030_class_subtypes.t rename to t/type_constraints/class_subtypes.t diff --git a/t/040_type_constraints/020_class_type_constraint.t b/t/type_constraints/class_type_constraint.t similarity index 100% rename from t/040_type_constraints/020_class_type_constraint.t rename to t/type_constraints/class_type_constraint.t diff --git a/t/040_type_constraints/019_coerced_parameterized_types.t b/t/type_constraints/coerced_parameterized_types.t similarity index 100% rename from t/040_type_constraints/019_coerced_parameterized_types.t rename to t/type_constraints/coerced_parameterized_types.t diff --git a/t/040_type_constraints/012_container_type_coercion.t b/t/type_constraints/container_type_coercion.t similarity index 100% rename from t/040_type_constraints/012_container_type_coercion.t rename to t/type_constraints/container_type_coercion.t diff --git a/t/040_type_constraints/011_container_type_constraint.t b/t/type_constraints/container_type_constraint.t similarity index 100% rename from t/040_type_constraints/011_container_type_constraint.t rename to t/type_constraints/container_type_constraint.t diff --git a/t/040_type_constraints/018_custom_parameterized_types.t b/t/type_constraints/custom_parameterized_types.t similarity index 100% rename from t/040_type_constraints/018_custom_parameterized_types.t rename to t/type_constraints/custom_parameterized_types.t diff --git a/t/040_type_constraints/022_custom_type_errors.t b/t/type_constraints/custom_type_errors.t similarity index 100% rename from t/040_type_constraints/022_custom_type_errors.t rename to t/type_constraints/custom_type_errors.t diff --git a/t/040_type_constraints/029_define_type_twice_throws.t b/t/type_constraints/define_type_twice_throws.t similarity index 100% rename from t/040_type_constraints/029_define_type_twice_throws.t rename to t/type_constraints/define_type_twice_throws.t diff --git a/t/040_type_constraints/035_duck_type_handles.t b/t/type_constraints/duck_type_handles.t similarity index 100% rename from t/040_type_constraints/035_duck_type_handles.t rename to t/type_constraints/duck_type_handles.t diff --git a/t/040_type_constraints/034_duck_types.t b/t/type_constraints/duck_types.t similarity index 100% rename from t/040_type_constraints/034_duck_types.t rename to t/type_constraints/duck_types.t diff --git a/t/040_type_constraints/015_enum.t b/t/type_constraints/enum.t similarity index 100% rename from t/040_type_constraints/015_enum.t rename to t/type_constraints/enum.t diff --git a/t/040_type_constraints/036_match_type_operator.t b/t/type_constraints/match_type_operator.t similarity index 100% rename from t/040_type_constraints/036_match_type_operator.t rename to t/type_constraints/match_type_operator.t diff --git a/t/040_type_constraints/021_maybe_type_constraint.t b/t/type_constraints/maybe_type_constraint.t similarity index 100% rename from t/040_type_constraints/021_maybe_type_constraint.t rename to t/type_constraints/maybe_type_constraint.t diff --git a/t/040_type_constraints/010_misc_type_tests.t b/t/type_constraints/misc_type_tests.t similarity index 100% rename from t/040_type_constraints/010_misc_type_tests.t rename to t/type_constraints/misc_type_tests.t diff --git a/t/040_type_constraints/026_normalize_type_name.t b/t/type_constraints/normalize_type_name.t similarity index 100% rename from t/040_type_constraints/026_normalize_type_name.t rename to t/type_constraints/normalize_type_name.t diff --git a/t/040_type_constraints/027_parameterize_from.t b/t/type_constraints/parameterize_from.t similarity index 100% rename from t/040_type_constraints/027_parameterize_from.t rename to t/type_constraints/parameterize_from.t diff --git a/t/040_type_constraints/024_role_type_constraint.t b/t/type_constraints/role_type_constraint.t similarity index 100% rename from t/040_type_constraints/024_role_type_constraint.t rename to t/type_constraints/role_type_constraint.t diff --git a/t/040_type_constraints/031_subtype_auto_vivify_parent.t b/t/type_constraints/subtype_auto_vivify_parent.t similarity index 100% rename from t/040_type_constraints/031_subtype_auto_vivify_parent.t rename to t/type_constraints/subtype_auto_vivify_parent.t diff --git a/t/040_type_constraints/016_subtyping_parameterized_types.t b/t/type_constraints/subtyping_parameterized_types.t similarity index 100% rename from t/040_type_constraints/016_subtyping_parameterized_types.t rename to t/type_constraints/subtyping_parameterized_types.t diff --git a/t/040_type_constraints/017_subtyping_union_types.t b/t/type_constraints/subtyping_union_types.t similarity index 100% rename from t/040_type_constraints/017_subtyping_union_types.t rename to t/type_constraints/subtyping_union_types.t diff --git a/t/040_type_constraints/032_throw_error.t b/t/type_constraints/throw_error.t similarity index 100% rename from t/040_type_constraints/032_throw_error.t rename to t/type_constraints/throw_error.t diff --git a/t/040_type_constraints/025_type_coersion_on_lazy_attributes.t b/t/type_constraints/type_coersion_on_lazy_attributes.t similarity index 100% rename from t/040_type_constraints/025_type_coersion_on_lazy_attributes.t rename to t/type_constraints/type_coersion_on_lazy_attributes.t diff --git a/t/040_type_constraints/033_type_names.t b/t/type_constraints/type_names.t similarity index 100% rename from t/040_type_constraints/033_type_names.t rename to t/type_constraints/type_names.t diff --git a/t/040_type_constraints/014_type_notation_parser.t b/t/type_constraints/type_notation_parser.t similarity index 100% rename from t/040_type_constraints/014_type_notation_parser.t rename to t/type_constraints/type_notation_parser.t diff --git a/t/040_type_constraints/023_types_and_undef.t b/t/type_constraints/types_and_undef.t similarity index 100% rename from t/040_type_constraints/023_types_and_undef.t rename to t/type_constraints/types_and_undef.t diff --git a/t/040_type_constraints/008_union_types.t b/t/type_constraints/union_types.t similarity index 100% rename from t/040_type_constraints/008_union_types.t rename to t/type_constraints/union_types.t diff --git a/t/040_type_constraints/009_union_types_and_coercions.t b/t/type_constraints/union_types_and_coercions.t similarity index 100% rename from t/040_type_constraints/009_union_types_and_coercions.t rename to t/type_constraints/union_types_and_coercions.t diff --git a/t/040_type_constraints/004_util_find_type_constraint.t b/t/type_constraints/util_find_type_constraint.t similarity index 100% rename from t/040_type_constraints/004_util_find_type_constraint.t rename to t/type_constraints/util_find_type_constraint.t diff --git a/t/040_type_constraints/007_util_more_type_coercion.t b/t/type_constraints/util_more_type_coercion.t similarity index 100% rename from t/040_type_constraints/007_util_more_type_coercion.t rename to t/type_constraints/util_more_type_coercion.t diff --git a/t/040_type_constraints/003_util_std_type_constraints.t b/t/type_constraints/util_std_type_constraints.t similarity index 100% rename from t/040_type_constraints/003_util_std_type_constraints.t rename to t/type_constraints/util_std_type_constraints.t diff --git a/t/040_type_constraints/005_util_type_coercion.t b/t/type_constraints/util_type_coercion.t similarity index 100% rename from t/040_type_constraints/005_util_type_coercion.t rename to t/type_constraints/util_type_coercion.t diff --git a/t/040_type_constraints/001_util_type_constraints.t b/t/type_constraints/util_type_constraints.t similarity index 100% rename from t/040_type_constraints/001_util_type_constraints.t rename to t/type_constraints/util_type_constraints.t diff --git a/t/040_type_constraints/002_util_type_constraints_export.t b/t/type_constraints/util_type_constraints_export.t similarity index 100% rename from t/040_type_constraints/002_util_type_constraints_export.t rename to t/type_constraints/util_type_constraints_export.t diff --git a/t/040_type_constraints/006_util_type_reloading.t b/t/type_constraints/util_type_reloading.t similarity index 100% rename from t/040_type_constraints/006_util_type_reloading.t rename to t/type_constraints/util_type_reloading.t