diff --git a/test/intl402/10.1.1_1.js b/test/intl402/Collator/10.1.1_1.js
similarity index 100%
rename from test/intl402/10.1.1_1.js
rename to test/intl402/Collator/10.1.1_1.js
diff --git a/test/intl402/10.1.1_10.js b/test/intl402/Collator/10.1.1_10.js
similarity index 100%
rename from test/intl402/10.1.1_10.js
rename to test/intl402/Collator/10.1.1_10.js
diff --git a/test/intl402/10.1.1_11.js b/test/intl402/Collator/10.1.1_11.js
similarity index 100%
rename from test/intl402/10.1.1_11.js
rename to test/intl402/Collator/10.1.1_11.js
diff --git a/test/intl402/10.1.1_13.js b/test/intl402/Collator/10.1.1_13.js
similarity index 100%
rename from test/intl402/10.1.1_13.js
rename to test/intl402/Collator/10.1.1_13.js
diff --git a/test/intl402/10.1.1_19_b.js b/test/intl402/Collator/10.1.1_19_b.js
similarity index 100%
rename from test/intl402/10.1.1_19_b.js
rename to test/intl402/Collator/10.1.1_19_b.js
diff --git a/test/intl402/10.1.1_19_c.js b/test/intl402/Collator/10.1.1_19_c.js
similarity index 100%
rename from test/intl402/10.1.1_19_c.js
rename to test/intl402/Collator/10.1.1_19_c.js
diff --git a/test/intl402/10.1.1_20.js b/test/intl402/Collator/10.1.1_20.js
similarity index 100%
rename from test/intl402/10.1.1_20.js
rename to test/intl402/Collator/10.1.1_20.js
diff --git a/test/intl402/10.1.1_23.js b/test/intl402/Collator/10.1.1_23.js
similarity index 100%
rename from test/intl402/10.1.1_23.js
rename to test/intl402/Collator/10.1.1_23.js
diff --git a/test/intl402/10.1.1_6.js b/test/intl402/Collator/10.1.1_6.js
similarity index 100%
rename from test/intl402/10.1.1_6.js
rename to test/intl402/Collator/10.1.1_6.js
diff --git a/test/intl402/10.1.1_a.js b/test/intl402/Collator/10.1.1_a.js
similarity index 100%
rename from test/intl402/10.1.1_a.js
rename to test/intl402/Collator/10.1.1_a.js
diff --git a/test/intl402/10.1.2.1_4.js b/test/intl402/Collator/10.1.2.1_4.js
similarity index 100%
rename from test/intl402/10.1.2.1_4.js
rename to test/intl402/Collator/10.1.2.1_4.js
diff --git a/test/intl402/10.1.2_a.js b/test/intl402/Collator/10.1.2_a.js
similarity index 100%
rename from test/intl402/10.1.2_a.js
rename to test/intl402/Collator/10.1.2_a.js
diff --git a/test/intl402/10.1.3.js b/test/intl402/Collator/10.1.3.js
similarity index 100%
rename from test/intl402/10.1.3.js
rename to test/intl402/Collator/10.1.3.js
diff --git a/test/intl402/10.1_L15.js b/test/intl402/Collator/10.1_L15.js
similarity index 100%
rename from test/intl402/10.1_L15.js
rename to test/intl402/Collator/10.1_L15.js
diff --git a/test/intl402/10.2.3_b.js b/test/intl402/Collator/10.2.3_b.js
similarity index 100%
rename from test/intl402/10.2.3_b.js
rename to test/intl402/Collator/10.2.3_b.js
diff --git a/test/intl402/10.4_a.js b/test/intl402/Collator/10.4_a.js
similarity index 100%
rename from test/intl402/10.4_a.js
rename to test/intl402/Collator/10.4_a.js
diff --git a/test/intl402/9.2.5_11_g_ii_2.js b/test/intl402/Collator/9.2.5_11_g_ii_2.js
similarity index 100%
rename from test/intl402/9.2.5_11_g_ii_2.js
rename to test/intl402/Collator/9.2.5_11_g_ii_2.js
diff --git a/test/intl402/10.2.1.js b/test/intl402/Collator/prototype/10.2.1.js
similarity index 100%
rename from test/intl402/10.2.1.js
rename to test/intl402/Collator/prototype/10.2.1.js
diff --git a/test/intl402/10.3_L15.js b/test/intl402/Collator/prototype/10.3_L15.js
similarity index 100%
rename from test/intl402/10.3_L15.js
rename to test/intl402/Collator/prototype/10.3_L15.js
diff --git a/test/intl402/10.3_a.js b/test/intl402/Collator/prototype/10.3_a.js
similarity index 100%
rename from test/intl402/10.3_a.js
rename to test/intl402/Collator/prototype/10.3_a.js
diff --git a/test/intl402/10.3_b.js b/test/intl402/Collator/prototype/10.3_b.js
similarity index 100%
rename from test/intl402/10.3_b.js
rename to test/intl402/Collator/prototype/10.3_b.js
diff --git a/test/intl402/10.3.2_1_a_L15.js b/test/intl402/Collator/prototype/compare/10.3.2_1_a_L15.js
similarity index 100%
rename from test/intl402/10.3.2_1_a_L15.js
rename to test/intl402/Collator/prototype/compare/10.3.2_1_a_L15.js
diff --git a/test/intl402/10.3.2_1_c.js b/test/intl402/Collator/prototype/compare/10.3.2_1_c.js
similarity index 100%
rename from test/intl402/10.3.2_1_c.js
rename to test/intl402/Collator/prototype/compare/10.3.2_1_c.js
diff --git a/test/intl402/10.3.2_CS_a.js b/test/intl402/Collator/prototype/compare/10.3.2_CS_a.js
similarity index 100%
rename from test/intl402/10.3.2_CS_a.js
rename to test/intl402/Collator/prototype/compare/10.3.2_CS_a.js
diff --git a/test/intl402/10.3.2_CS_b_NN.js b/test/intl402/Collator/prototype/compare/10.3.2_CS_b_NN.js
similarity index 100%
rename from test/intl402/10.3.2_CS_b_NN.js
rename to test/intl402/Collator/prototype/compare/10.3.2_CS_b_NN.js
diff --git a/test/intl402/10.3.2_CS_c_NN.js b/test/intl402/Collator/prototype/compare/10.3.2_CS_c_NN.js
similarity index 100%
rename from test/intl402/10.3.2_CS_c_NN.js
rename to test/intl402/Collator/prototype/compare/10.3.2_CS_c_NN.js
diff --git a/test/intl402/10.3.2_CS_d_NN.js b/test/intl402/Collator/prototype/compare/10.3.2_CS_d_NN.js
similarity index 100%
rename from test/intl402/10.3.2_CS_d_NN.js
rename to test/intl402/Collator/prototype/compare/10.3.2_CS_d_NN.js
diff --git a/test/intl402/10.3.2_L15.js b/test/intl402/Collator/prototype/compare/10.3.2_L15.js
similarity index 100%
rename from test/intl402/10.3.2_L15.js
rename to test/intl402/Collator/prototype/compare/10.3.2_L15.js
diff --git a/test/intl402/10.3.1.js b/test/intl402/Collator/prototype/constructor/10.3.1.js
similarity index 100%
rename from test/intl402/10.3.1.js
rename to test/intl402/Collator/prototype/constructor/10.3.1.js
diff --git a/test/intl402/10.3.3.js b/test/intl402/Collator/prototype/resolvedOptions/10.3.3.js
similarity index 100%
rename from test/intl402/10.3.3.js
rename to test/intl402/Collator/prototype/resolvedOptions/10.3.3.js
diff --git a/test/intl402/10.3.3_L15.js b/test/intl402/Collator/prototype/resolvedOptions/10.3.3_L15.js
similarity index 100%
rename from test/intl402/10.3.3_L15.js
rename to test/intl402/Collator/prototype/resolvedOptions/10.3.3_L15.js
diff --git a/test/intl402/10.2.2_L15.js b/test/intl402/Collator/supportedLocalesOf/10.2.2_L15.js
similarity index 100%
rename from test/intl402/10.2.2_L15.js
rename to test/intl402/Collator/supportedLocalesOf/10.2.2_L15.js
diff --git a/test/intl402/10.2.2_a.js b/test/intl402/Collator/supportedLocalesOf/10.2.2_a.js
similarity index 100%
rename from test/intl402/10.2.2_a.js
rename to test/intl402/Collator/supportedLocalesOf/10.2.2_a.js
diff --git a/test/intl402/10.2.2_b.js b/test/intl402/Collator/supportedLocalesOf/10.2.2_b.js
similarity index 100%
rename from test/intl402/10.2.2_b.js
rename to test/intl402/Collator/supportedLocalesOf/10.2.2_b.js
diff --git a/test/intl402/13.3.0_1.js b/test/intl402/Date/prototype/13.3.0_1.js
similarity index 100%
rename from test/intl402/13.3.0_1.js
rename to test/intl402/Date/prototype/13.3.0_1.js
diff --git a/test/intl402/13.3.0_2.js b/test/intl402/Date/prototype/13.3.0_2.js
similarity index 100%
rename from test/intl402/13.3.0_2.js
rename to test/intl402/Date/prototype/13.3.0_2.js
diff --git a/test/intl402/13.3.0_6_1.js b/test/intl402/Date/prototype/13.3.0_6_1.js
similarity index 100%
rename from test/intl402/13.3.0_6_1.js
rename to test/intl402/Date/prototype/13.3.0_6_1.js
diff --git a/test/intl402/13.3.0_6_2.js b/test/intl402/Date/prototype/13.3.0_6_2.js
similarity index 100%
rename from test/intl402/13.3.0_6_2.js
rename to test/intl402/Date/prototype/13.3.0_6_2.js
diff --git a/test/intl402/13.3.0_7.js b/test/intl402/Date/prototype/13.3.0_7.js
similarity index 100%
rename from test/intl402/13.3.0_7.js
rename to test/intl402/Date/prototype/13.3.0_7.js
diff --git a/test/intl402/13.3.2_L15.js b/test/intl402/Date/prototype/toLocaleDateString/13.3.2_L15.js
similarity index 100%
rename from test/intl402/13.3.2_L15.js
rename to test/intl402/Date/prototype/toLocaleDateString/13.3.2_L15.js
diff --git a/test/intl402/13.3.1_L15.js b/test/intl402/Date/prototype/toLocaleString/13.3.1_L15.js
similarity index 100%
rename from test/intl402/13.3.1_L15.js
rename to test/intl402/Date/prototype/toLocaleString/13.3.1_L15.js
diff --git a/test/intl402/13.3.3_L15.js b/test/intl402/Date/prototype/toLocaleTimeString/13.3.3_L15.js
similarity index 100%
rename from test/intl402/13.3.3_L15.js
rename to test/intl402/Date/prototype/toLocaleTimeString/13.3.3_L15.js
diff --git a/test/intl402/12.1.1_1.js b/test/intl402/DateTimeFormat/12.1.1_1.js
similarity index 100%
rename from test/intl402/12.1.1_1.js
rename to test/intl402/DateTimeFormat/12.1.1_1.js
diff --git a/test/intl402/12.1.1_18.js b/test/intl402/DateTimeFormat/12.1.1_18.js
similarity index 100%
rename from test/intl402/12.1.1_18.js
rename to test/intl402/DateTimeFormat/12.1.1_18.js
diff --git a/test/intl402/12.1.1_22.js b/test/intl402/DateTimeFormat/12.1.1_22.js
similarity index 100%
rename from test/intl402/12.1.1_22.js
rename to test/intl402/DateTimeFormat/12.1.1_22.js
diff --git a/test/intl402/12.1.1_23.js b/test/intl402/DateTimeFormat/12.1.1_23.js
similarity index 100%
rename from test/intl402/12.1.1_23.js
rename to test/intl402/DateTimeFormat/12.1.1_23.js
diff --git a/test/intl402/12.1.1_25.js b/test/intl402/DateTimeFormat/12.1.1_25.js
similarity index 100%
rename from test/intl402/12.1.1_25.js
rename to test/intl402/DateTimeFormat/12.1.1_25.js
diff --git a/test/intl402/12.1.1_5.js b/test/intl402/DateTimeFormat/12.1.1_5.js
similarity index 100%
rename from test/intl402/12.1.1_5.js
rename to test/intl402/DateTimeFormat/12.1.1_5.js
diff --git a/test/intl402/12.1.1_6.js b/test/intl402/DateTimeFormat/12.1.1_6.js
similarity index 100%
rename from test/intl402/12.1.1_6.js
rename to test/intl402/DateTimeFormat/12.1.1_6.js
diff --git a/test/intl402/12.1.1_TDTO.js b/test/intl402/DateTimeFormat/12.1.1_TDTO.js
similarity index 100%
rename from test/intl402/12.1.1_TDTO.js
rename to test/intl402/DateTimeFormat/12.1.1_TDTO.js
diff --git a/test/intl402/12.1.1_a.js b/test/intl402/DateTimeFormat/12.1.1_a.js
similarity index 100%
rename from test/intl402/12.1.1_a.js
rename to test/intl402/DateTimeFormat/12.1.1_a.js
diff --git a/test/intl402/12.1.2.1_4.js b/test/intl402/DateTimeFormat/12.1.2.1_4.js
similarity index 100%
rename from test/intl402/12.1.2.1_4.js
rename to test/intl402/DateTimeFormat/12.1.2.1_4.js
diff --git a/test/intl402/12.1.2.js b/test/intl402/DateTimeFormat/12.1.2.js
similarity index 100%
rename from test/intl402/12.1.2.js
rename to test/intl402/DateTimeFormat/12.1.2.js
diff --git a/test/intl402/12.1.3.js b/test/intl402/DateTimeFormat/12.1.3.js
similarity index 100%
rename from test/intl402/12.1.3.js
rename to test/intl402/DateTimeFormat/12.1.3.js
diff --git a/test/intl402/12.1_L15.js b/test/intl402/DateTimeFormat/12.1_L15.js
similarity index 100%
rename from test/intl402/12.1_L15.js
rename to test/intl402/DateTimeFormat/12.1_L15.js
diff --git a/test/intl402/12.2.3_b.js b/test/intl402/DateTimeFormat/12.2.3_b.js
similarity index 100%
rename from test/intl402/12.2.3_b.js
rename to test/intl402/DateTimeFormat/12.2.3_b.js
diff --git a/test/intl402/12.2.3_c.js b/test/intl402/DateTimeFormat/12.2.3_c.js
similarity index 100%
rename from test/intl402/12.2.3_c.js
rename to test/intl402/DateTimeFormat/12.2.3_c.js
diff --git a/test/intl402/12.4_a.js b/test/intl402/DateTimeFormat/12.4_a.js
similarity index 100%
rename from test/intl402/12.4_a.js
rename to test/intl402/DateTimeFormat/12.4_a.js
diff --git a/test/intl402/6.4_a.js b/test/intl402/DateTimeFormat/6.4_a.js
similarity index 100%
rename from test/intl402/6.4_a.js
rename to test/intl402/DateTimeFormat/6.4_a.js
diff --git a/test/intl402/6.4_b.js b/test/intl402/DateTimeFormat/6.4_b.js
similarity index 100%
rename from test/intl402/6.4_b.js
rename to test/intl402/DateTimeFormat/6.4_b.js
diff --git a/test/intl402/6.4_c.js b/test/intl402/DateTimeFormat/6.4_c.js
similarity index 100%
rename from test/intl402/6.4_c.js
rename to test/intl402/DateTimeFormat/6.4_c.js
diff --git a/test/intl402/12.2.1.js b/test/intl402/DateTimeFormat/prototype/12.2.1.js
similarity index 100%
rename from test/intl402/12.2.1.js
rename to test/intl402/DateTimeFormat/prototype/12.2.1.js
diff --git a/test/intl402/12.3_L15.js b/test/intl402/DateTimeFormat/prototype/12.3_L15.js
similarity index 100%
rename from test/intl402/12.3_L15.js
rename to test/intl402/DateTimeFormat/prototype/12.3_L15.js
diff --git a/test/intl402/12.3_a.js b/test/intl402/DateTimeFormat/prototype/12.3_a.js
similarity index 100%
rename from test/intl402/12.3_a.js
rename to test/intl402/DateTimeFormat/prototype/12.3_a.js
diff --git a/test/intl402/12.3_b.js b/test/intl402/DateTimeFormat/prototype/12.3_b.js
similarity index 100%
rename from test/intl402/12.3_b.js
rename to test/intl402/DateTimeFormat/prototype/12.3_b.js
diff --git a/test/intl402/12.3.1.js b/test/intl402/DateTimeFormat/prototype/constructor/12.3.1.js
similarity index 100%
rename from test/intl402/12.3.1.js
rename to test/intl402/DateTimeFormat/prototype/constructor/12.3.1.js
diff --git a/test/intl402/12.3.2_1_a_L15.js b/test/intl402/DateTimeFormat/prototype/format/12.3.2_1_a_L15.js
similarity index 100%
rename from test/intl402/12.3.2_1_a_L15.js
rename to test/intl402/DateTimeFormat/prototype/format/12.3.2_1_a_L15.js
diff --git a/test/intl402/12.3.2_1_c.js b/test/intl402/DateTimeFormat/prototype/format/12.3.2_1_c.js
similarity index 100%
rename from test/intl402/12.3.2_1_c.js
rename to test/intl402/DateTimeFormat/prototype/format/12.3.2_1_c.js
diff --git a/test/intl402/12.3.2_FDT_1.js b/test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_1.js
similarity index 100%
rename from test/intl402/12.3.2_FDT_1.js
rename to test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_1.js
diff --git a/test/intl402/12.3.2_FDT_7_a_iv.js b/test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_7_a_iv.js
similarity index 100%
rename from test/intl402/12.3.2_FDT_7_a_iv.js
rename to test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_7_a_iv.js
diff --git a/test/intl402/12.3.2_L15.js b/test/intl402/DateTimeFormat/prototype/format/12.3.2_L15.js
similarity index 100%
rename from test/intl402/12.3.2_L15.js
rename to test/intl402/DateTimeFormat/prototype/format/12.3.2_L15.js
diff --git a/test/intl402/12.3.2_TLT_2.js b/test/intl402/DateTimeFormat/prototype/format/12.3.2_TLT_2.js
similarity index 100%
rename from test/intl402/12.3.2_TLT_2.js
rename to test/intl402/DateTimeFormat/prototype/format/12.3.2_TLT_2.js
diff --git a/test/intl402/12.3.3.js b/test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3.js
similarity index 100%
rename from test/intl402/12.3.3.js
rename to test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3.js
diff --git a/test/intl402/12.3.3_L15.js b/test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3_L15.js
similarity index 100%
rename from test/intl402/12.3.3_L15.js
rename to test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3_L15.js
diff --git a/test/intl402/12.2.2_L15.js b/test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_L15.js
similarity index 100%
rename from test/intl402/12.2.2_L15.js
rename to test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_L15.js
diff --git a/test/intl402/12.2.2_a.js b/test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_a.js
similarity index 100%
rename from test/intl402/12.2.2_a.js
rename to test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_a.js
diff --git a/test/intl402/12.2.2_b.js b/test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_b.js
similarity index 100%
rename from test/intl402/12.2.2_b.js
rename to test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_b.js
diff --git a/test/intl402/8.0.js b/test/intl402/Intl/8.0.js
similarity index 100%
rename from test/intl402/8.0.js
rename to test/intl402/Intl/8.0.js
diff --git a/test/intl402/8.0_L15.js b/test/intl402/Intl/8.0_L15.js
similarity index 100%
rename from test/intl402/8.0_L15.js
rename to test/intl402/Intl/8.0_L15.js
diff --git a/test/intl402/13.2.1_1.js b/test/intl402/Number/prototype/toLocaleString/13.2.1_1.js
similarity index 100%
rename from test/intl402/13.2.1_1.js
rename to test/intl402/Number/prototype/toLocaleString/13.2.1_1.js
diff --git a/test/intl402/13.2.1_4_1.js b/test/intl402/Number/prototype/toLocaleString/13.2.1_4_1.js
similarity index 100%
rename from test/intl402/13.2.1_4_1.js
rename to test/intl402/Number/prototype/toLocaleString/13.2.1_4_1.js
diff --git a/test/intl402/13.2.1_4_2.js b/test/intl402/Number/prototype/toLocaleString/13.2.1_4_2.js
similarity index 100%
rename from test/intl402/13.2.1_4_2.js
rename to test/intl402/Number/prototype/toLocaleString/13.2.1_4_2.js
diff --git a/test/intl402/13.2.1_5.js b/test/intl402/Number/prototype/toLocaleString/13.2.1_5.js
similarity index 100%
rename from test/intl402/13.2.1_5.js
rename to test/intl402/Number/prototype/toLocaleString/13.2.1_5.js
diff --git a/test/intl402/13.2.1_L15.js b/test/intl402/Number/prototype/toLocaleString/13.2.1_L15.js
similarity index 100%
rename from test/intl402/13.2.1_L15.js
rename to test/intl402/Number/prototype/toLocaleString/13.2.1_L15.js
diff --git a/test/intl402/11.1.1_1.js b/test/intl402/NumberFormat/11.1.1_1.js
similarity index 100%
rename from test/intl402/11.1.1_1.js
rename to test/intl402/NumberFormat/11.1.1_1.js
diff --git a/test/intl402/11.1.1_15.js b/test/intl402/NumberFormat/11.1.1_15.js
similarity index 100%
rename from test/intl402/11.1.1_15.js
rename to test/intl402/NumberFormat/11.1.1_15.js
diff --git a/test/intl402/11.1.1_17.js b/test/intl402/NumberFormat/11.1.1_17.js
similarity index 100%
rename from test/intl402/11.1.1_17.js
rename to test/intl402/NumberFormat/11.1.1_17.js
diff --git a/test/intl402/11.1.1_19.js b/test/intl402/NumberFormat/11.1.1_19.js
similarity index 100%
rename from test/intl402/11.1.1_19.js
rename to test/intl402/NumberFormat/11.1.1_19.js
diff --git a/test/intl402/11.1.1_20_c.js b/test/intl402/NumberFormat/11.1.1_20_c.js
similarity index 100%
rename from test/intl402/11.1.1_20_c.js
rename to test/intl402/NumberFormat/11.1.1_20_c.js
diff --git a/test/intl402/11.1.1_21.js b/test/intl402/NumberFormat/11.1.1_21.js
similarity index 100%
rename from test/intl402/11.1.1_21.js
rename to test/intl402/NumberFormat/11.1.1_21.js
diff --git a/test/intl402/11.1.1_32.js b/test/intl402/NumberFormat/11.1.1_32.js
similarity index 100%
rename from test/intl402/11.1.1_32.js
rename to test/intl402/NumberFormat/11.1.1_32.js
diff --git a/test/intl402/11.1.1_34.js b/test/intl402/NumberFormat/11.1.1_34.js
similarity index 100%
rename from test/intl402/11.1.1_34.js
rename to test/intl402/NumberFormat/11.1.1_34.js
diff --git a/test/intl402/11.1.1_6.js b/test/intl402/NumberFormat/11.1.1_6.js
similarity index 100%
rename from test/intl402/11.1.1_6.js
rename to test/intl402/NumberFormat/11.1.1_6.js
diff --git a/test/intl402/11.1.1_7.js b/test/intl402/NumberFormat/11.1.1_7.js
similarity index 100%
rename from test/intl402/11.1.1_7.js
rename to test/intl402/NumberFormat/11.1.1_7.js
diff --git a/test/intl402/11.1.1_a.js b/test/intl402/NumberFormat/11.1.1_a.js
similarity index 100%
rename from test/intl402/11.1.1_a.js
rename to test/intl402/NumberFormat/11.1.1_a.js
diff --git a/test/intl402/11.1.2.1_4.js b/test/intl402/NumberFormat/11.1.2.1_4.js
similarity index 100%
rename from test/intl402/11.1.2.1_4.js
rename to test/intl402/NumberFormat/11.1.2.1_4.js
diff --git a/test/intl402/11.1.2.js b/test/intl402/NumberFormat/11.1.2.js
similarity index 100%
rename from test/intl402/11.1.2.js
rename to test/intl402/NumberFormat/11.1.2.js
diff --git a/test/intl402/11.1.3.js b/test/intl402/NumberFormat/11.1.3.js
similarity index 100%
rename from test/intl402/11.1.3.js
rename to test/intl402/NumberFormat/11.1.3.js
diff --git a/test/intl402/11.1_L15.js b/test/intl402/NumberFormat/11.1_L15.js
similarity index 100%
rename from test/intl402/11.1_L15.js
rename to test/intl402/NumberFormat/11.1_L15.js
diff --git a/test/intl402/11.2.3_b.js b/test/intl402/NumberFormat/11.2.3_b.js
similarity index 100%
rename from test/intl402/11.2.3_b.js
rename to test/intl402/NumberFormat/11.2.3_b.js
diff --git a/test/intl402/11.4_a.js b/test/intl402/NumberFormat/11.4_a.js
similarity index 100%
rename from test/intl402/11.4_a.js
rename to test/intl402/NumberFormat/11.4_a.js
diff --git a/test/intl402/6.3.1_a.js b/test/intl402/NumberFormat/6.3.1_a.js
similarity index 100%
rename from test/intl402/6.3.1_a.js
rename to test/intl402/NumberFormat/6.3.1_a.js
diff --git a/test/intl402/6.3.1_b.js b/test/intl402/NumberFormat/6.3.1_b.js
similarity index 100%
rename from test/intl402/6.3.1_b.js
rename to test/intl402/NumberFormat/6.3.1_b.js
diff --git a/test/intl402/11.2.1.js b/test/intl402/NumberFormat/prototype/11.2.1.js
similarity index 100%
rename from test/intl402/11.2.1.js
rename to test/intl402/NumberFormat/prototype/11.2.1.js
diff --git a/test/intl402/11.3_L15.js b/test/intl402/NumberFormat/prototype/11.3_L15.js
similarity index 100%
rename from test/intl402/11.3_L15.js
rename to test/intl402/NumberFormat/prototype/11.3_L15.js
diff --git a/test/intl402/11.3_a.js b/test/intl402/NumberFormat/prototype/11.3_a.js
similarity index 100%
rename from test/intl402/11.3_a.js
rename to test/intl402/NumberFormat/prototype/11.3_a.js
diff --git a/test/intl402/11.3_b.js b/test/intl402/NumberFormat/prototype/11.3_b.js
similarity index 100%
rename from test/intl402/11.3_b.js
rename to test/intl402/NumberFormat/prototype/11.3_b.js
diff --git a/test/intl402/11.3.1.js b/test/intl402/NumberFormat/prototype/constructor/11.3.1.js
similarity index 100%
rename from test/intl402/11.3.1.js
rename to test/intl402/NumberFormat/prototype/constructor/11.3.1.js
diff --git a/test/intl402/11.3.2_1_a_L15.js b/test/intl402/NumberFormat/prototype/format/11.3.2_1_a_L15.js
similarity index 100%
rename from test/intl402/11.3.2_1_a_L15.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_1_a_L15.js
diff --git a/test/intl402/11.3.2_1_a_ii.js b/test/intl402/NumberFormat/prototype/format/11.3.2_1_a_ii.js
similarity index 100%
rename from test/intl402/11.3.2_1_a_ii.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_1_a_ii.js
diff --git a/test/intl402/11.3.2_1_c.js b/test/intl402/NumberFormat/prototype/format/11.3.2_1_c.js
similarity index 100%
rename from test/intl402/11.3.2_1_c.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_1_c.js
diff --git a/test/intl402/11.3.2_FN_1.js b/test/intl402/NumberFormat/prototype/format/11.3.2_FN_1.js
similarity index 100%
rename from test/intl402/11.3.2_FN_1.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_FN_1.js
diff --git a/test/intl402/11.3.2_FN_2.js b/test/intl402/NumberFormat/prototype/format/11.3.2_FN_2.js
similarity index 100%
rename from test/intl402/11.3.2_FN_2.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_FN_2.js
diff --git a/test/intl402/11.3.2_FN_3_b.js b/test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_b.js
similarity index 100%
rename from test/intl402/11.3.2_FN_3_b.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_b.js
diff --git a/test/intl402/11.3.2_FN_3_e.js b/test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_e.js
similarity index 100%
rename from test/intl402/11.3.2_FN_3_e.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_e.js
diff --git a/test/intl402/11.3.2_L15.js b/test/intl402/NumberFormat/prototype/format/11.3.2_L15.js
similarity index 100%
rename from test/intl402/11.3.2_L15.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_L15.js
diff --git a/test/intl402/11.3.2_TRF.js b/test/intl402/NumberFormat/prototype/format/11.3.2_TRF.js
similarity index 100%
rename from test/intl402/11.3.2_TRF.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_TRF.js
diff --git a/test/intl402/11.3.2_TRP.js b/test/intl402/NumberFormat/prototype/format/11.3.2_TRP.js
similarity index 100%
rename from test/intl402/11.3.2_TRP.js
rename to test/intl402/NumberFormat/prototype/format/11.3.2_TRP.js
diff --git a/test/intl402/11.3.3.js b/test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3.js
similarity index 100%
rename from test/intl402/11.3.3.js
rename to test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3.js
diff --git a/test/intl402/11.3.3_L15.js b/test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3_L15.js
similarity index 100%
rename from test/intl402/11.3.3_L15.js
rename to test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3_L15.js
diff --git a/test/intl402/11.2.2_L15.js b/test/intl402/NumberFormat/supportedLocalesOf/11.2.2_L15.js
similarity index 100%
rename from test/intl402/11.2.2_L15.js
rename to test/intl402/NumberFormat/supportedLocalesOf/11.2.2_L15.js
diff --git a/test/intl402/11.2.2_a.js b/test/intl402/NumberFormat/supportedLocalesOf/11.2.2_a.js
similarity index 100%
rename from test/intl402/11.2.2_a.js
rename to test/intl402/NumberFormat/supportedLocalesOf/11.2.2_a.js
diff --git a/test/intl402/11.2.2_b.js b/test/intl402/NumberFormat/supportedLocalesOf/11.2.2_b.js
similarity index 100%
rename from test/intl402/11.2.2_b.js
rename to test/intl402/NumberFormat/supportedLocalesOf/11.2.2_b.js
diff --git a/test/intl402/13.1.1_1.js b/test/intl402/String/prototype/localeCompare/13.1.1_1.js
similarity index 100%
rename from test/intl402/13.1.1_1.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_1.js
diff --git a/test/intl402/13.1.1_2.js b/test/intl402/String/prototype/localeCompare/13.1.1_2.js
similarity index 100%
rename from test/intl402/13.1.1_2.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_2.js
diff --git a/test/intl402/13.1.1_3_1.js b/test/intl402/String/prototype/localeCompare/13.1.1_3_1.js
similarity index 100%
rename from test/intl402/13.1.1_3_1.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_3_1.js
diff --git a/test/intl402/13.1.1_3_2.js b/test/intl402/String/prototype/localeCompare/13.1.1_3_2.js
similarity index 100%
rename from test/intl402/13.1.1_3_2.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_3_2.js
diff --git a/test/intl402/13.1.1_6_1.js b/test/intl402/String/prototype/localeCompare/13.1.1_6_1.js
similarity index 100%
rename from test/intl402/13.1.1_6_1.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_6_1.js
diff --git a/test/intl402/13.1.1_6_2.js b/test/intl402/String/prototype/localeCompare/13.1.1_6_2.js
similarity index 100%
rename from test/intl402/13.1.1_6_2.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_6_2.js
diff --git a/test/intl402/13.1.1_7.js b/test/intl402/String/prototype/localeCompare/13.1.1_7.js
similarity index 100%
rename from test/intl402/13.1.1_7.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_7.js
diff --git a/test/intl402/13.1.1_L15.js b/test/intl402/String/prototype/localeCompare/13.1.1_L15.js
similarity index 100%
rename from test/intl402/13.1.1_L15.js
rename to test/intl402/String/prototype/localeCompare/13.1.1_L15.js