diff --git a/libcxx/test/libcxx/utilities/time/version.pass.cpp b/libcxx/test/libcxx/time/version.pass.cpp
rename from libcxx/test/libcxx/utilities/time/version.pass.cpp
rename to libcxx/test/libcxx/time/version.pass.cpp
diff --git a/libcxx/test/std/utilities/time/clock.h b/libcxx/test/std/time/clock.h
rename from libcxx/test/std/utilities/time/clock.h
rename to libcxx/test/std/time/clock.h
diff --git a/libcxx/test/std/utilities/time/days.pass.cpp b/libcxx/test/std/time/days.pass.cpp
rename from libcxx/test/std/utilities/time/days.pass.cpp
rename to libcxx/test/std/time/days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/hours.pass.cpp b/libcxx/test/std/time/hours.pass.cpp
rename from libcxx/test/std/utilities/time/hours.pass.cpp
rename to libcxx/test/std/time/hours.pass.cpp
diff --git a/libcxx/test/std/utilities/time/microseconds.pass.cpp b/libcxx/test/std/time/microseconds.pass.cpp
rename from libcxx/test/std/utilities/time/microseconds.pass.cpp
rename to libcxx/test/std/time/microseconds.pass.cpp
diff --git a/libcxx/test/std/utilities/time/milliseconds.pass.cpp b/libcxx/test/std/time/milliseconds.pass.cpp
rename from libcxx/test/std/utilities/time/milliseconds.pass.cpp
rename to libcxx/test/std/time/milliseconds.pass.cpp
diff --git a/libcxx/test/std/utilities/time/minutes.pass.cpp b/libcxx/test/std/time/minutes.pass.cpp
rename from libcxx/test/std/utilities/time/minutes.pass.cpp
rename to libcxx/test/std/time/minutes.pass.cpp
diff --git a/libcxx/test/std/utilities/time/months.pass.cpp b/libcxx/test/std/time/months.pass.cpp
rename from libcxx/test/std/utilities/time/months.pass.cpp
rename to libcxx/test/std/time/months.pass.cpp
diff --git a/libcxx/test/std/utilities/time/nanoseconds.pass.cpp b/libcxx/test/std/time/nanoseconds.pass.cpp
rename from libcxx/test/std/utilities/time/nanoseconds.pass.cpp
rename to libcxx/test/std/time/nanoseconds.pass.cpp
diff --git a/libcxx/test/std/utilities/time/rep.h b/libcxx/test/std/time/rep.h
rename from libcxx/test/std/utilities/time/rep.h
rename to libcxx/test/std/time/rep.h
diff --git a/libcxx/test/std/utilities/time/seconds.pass.cpp b/libcxx/test/std/time/seconds.pass.cpp
rename from libcxx/test/std/utilities/time/seconds.pass.cpp
rename to libcxx/test/std/time/seconds.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/hhmmss.fail.cpp b/libcxx/test/std/time/time.hms/hhmmss.fail.cpp
rename from libcxx/test/std/utilities/time/time.hms/hhmmss.fail.cpp
rename to libcxx/test/std/time/time.hms/hhmmss.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/hours.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/hours.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/hours.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/hours.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/is_negative.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/is_negative.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/is_negative.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/is_negative.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/minutes.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/minutes.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/minutes.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/minutes.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/precision.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/precision.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/precision.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/precision.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/seconds.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/seconds.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/seconds.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/seconds.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/subseconds.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/subseconds.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/subseconds.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/subseconds.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/to_duration.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/to_duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/to_duration.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/to_duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.members/width.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.members/width.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.members/width.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.members/width.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.hms.nonmembers/nothing.to.do.pass.cpp b/libcxx/test/std/time/time.hms/time.hms.nonmembers/nothing.to.do.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.hms.nonmembers/nothing.to.do.pass.cpp
rename to libcxx/test/std/time/time.hms/time.hms.nonmembers/nothing.to.do.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.12/is_am.pass.cpp b/libcxx/test/std/time/time.hms/time.12/is_am.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.12/is_am.pass.cpp
rename to libcxx/test/std/time/time.hms/time.12/is_am.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.12/is_pm.pass.cpp b/libcxx/test/std/time/time.hms/time.12/is_pm.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.12/is_pm.pass.cpp
rename to libcxx/test/std/time/time.hms/time.12/is_pm.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.12/make12.pass.cpp b/libcxx/test/std/time/time.hms/time.12/make12.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.12/make12.pass.cpp
rename to libcxx/test/std/time/time.hms/time.12/make12.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.hms/time.12/make24.pass.cpp b/libcxx/test/std/time/time.hms/time.12/make24.pass.cpp
rename from libcxx/test/std/utilities/time/time.hms/time.12/make24.pass.cpp
rename to libcxx/test/std/time/time.hms/time.12/make24.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/euclidian.h b/libcxx/test/std/time/time.cal/euclidian.h
rename from libcxx/test/std/utilities/time/time.cal/euclidian.h
rename to libcxx/test/std/time/time.cal/euclidian.h
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/decrement.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/decrement.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/decrement.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/decrement.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/increment.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/increment.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/increment.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/increment.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/plus_minus_equal.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/plus_minus_equal.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.members/plus_minus_equal.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.members/plus_minus_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.fail.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.fail.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.fail.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/time.cal.day.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.day/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.day/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.day/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.day/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.last/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.last/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.last/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.last/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/day.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/day.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/day.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/day.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.md/time.cal.md.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.md/time.cal.md.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.md/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.md/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.md/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.md/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mdlast/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mdlast/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mdlast/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mdlast/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mdlast/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mdlast/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mdlast/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mdlast/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mdlast/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mdlast/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mdlast/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/decrement.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/decrement.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/decrement.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/decrement.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/increment.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/increment.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/increment.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/increment.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/plus_minus_equal.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/plus_minus_equal.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.members/plus_minus_equal.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.members/plus_minus_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/literals.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/literals.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/literals.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/literals.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/time.cal.month.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/time.cal.month.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.month/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.month/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.month/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.month/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/weekday_indexed.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/weekday_indexed.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.members/weekday_indexed.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.members/weekday_indexed.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwd/time.cal.mwd.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwd/time.cal.mwd.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwd/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwd/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwd/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwd/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/weekday_last.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/weekday_last.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/weekday_last.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.members/weekday_last.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwdlast/time.cal.mwdlast.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.mwdlast/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.mwdlast/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.mwdlast/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_day.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/month_day.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_day.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/month_day.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_day_last.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/month_day_last.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_day_last.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/month_day_last.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_weekday.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/month_weekday.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_weekday.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/month_weekday.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_weekday_last.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/month_weekday_last.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/month_weekday_last.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/month_weekday_last.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/year_month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/year_month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_day.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/year_month_day.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_day.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/year_month_day.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_day_last.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/year_month_day_last.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_day_last.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/year_month_day_last.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_weekday.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/year_month_weekday.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_weekday.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/year_month_weekday.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_weekday_last.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.operators/year_month_weekday_last.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.operators/year_month_weekday_last.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.operators/year_month_weekday_last.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/index.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/index.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/index.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/index.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/weekday.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/weekday.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/weekday.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.members/weekday.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/time.cal.wdidx.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdidx/time.cal.wdidx.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdidx/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdidx/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdidx/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/weekday.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/weekday.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/weekday.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.members/weekday.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/time.cal.wdlast.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdlast/time.cal.wdlast.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.wdlast/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.wdlast/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.wdlast/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/c_encoding.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/c_encoding.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/c_encoding.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/c_encoding.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.local_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.local_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.local_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.local_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.sys_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.sys_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.sys_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ctor.sys_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/decrement.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/decrement.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/decrement.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/decrement.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/increment.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/increment.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/increment.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/increment.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/iso_encoding.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/iso_encoding.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/iso_encoding.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/iso_encoding.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/operator[].pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/operator[].pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/operator[].pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/operator[].pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/plus_minus_equal.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/plus_minus_equal.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.members/plus_minus_equal.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.members/plus_minus_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/literals.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/literals.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/literals.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/literals.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/time.cal.weekday.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.weekday/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.weekday/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.weekday/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.weekday/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/decrement.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/decrement.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/decrement.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/decrement.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/increment.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/increment.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/increment.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/increment.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/is_leap.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/is_leap.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/is_leap.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/is_leap.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/plus_minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/plus_minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/plus_minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/plus_minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/plus_minus_equal.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/plus_minus_equal.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.members/plus_minus_equal.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.members/plus_minus_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.fail.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.fail.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.fail.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/time.cal.year.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.year/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.year/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.year/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.year/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.members/year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ym/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ym/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ym/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.local_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.local_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.local_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.local_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.sys_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.sys_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.sys_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.sys_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.year_month_day_last.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.year_month_day_last.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.year_month_day_last.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ctor.year_month_day_last.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/day.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/day.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/day.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/day.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.local_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.local_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.local_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.local_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.sys_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.sys_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.sys_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/op.sys_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.members/year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymd/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymd/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymd/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/day.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/day.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/day.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/day.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month_day_last.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month_day_last.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month_day_last.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/month_day_last.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_local_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_local_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_local_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_local_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_sys_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_sys_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_sys_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/op_sys_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/plus_minus_equal_year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.members/year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.local_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.local_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.local_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.local_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.sys_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.sys_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.sys_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ctor.sys_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/index.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/index.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/index.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/index.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.local_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.local_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.local_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.local_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.sys_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.sys_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.sys_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/op.sys_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/plus_minus_equal_year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday_indexed.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday_indexed.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday_indexed.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/weekday_indexed.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.members/year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/time.cal.ymwd.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwd/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwd/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwd/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ctor.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ctor.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ctor.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ok.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ok.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ok.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/ok.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_local_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_local_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_local_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_local_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_sys_days.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_sys_days.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_sys_days.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/op_sys_days.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_month.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_month.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_month.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/plus_minus_equal_year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/weekday.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/weekday.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/weekday.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/weekday.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/year.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/year.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.members/year.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/comparisons.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/comparisons.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/comparisons.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/comparisons.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/minus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/minus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/minus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/plus.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/plus.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/time.cal.ymwdlast.nonmembers/plus.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/types.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymwdlast/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.cal/time.cal.ymwdlast/types.pass.cpp
rename to libcxx/test/std/time/time.cal/time.cal.ymwdlast/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock.req/nothing_to_do.pass.cpp b/libcxx/test/std/time/time.clock.req/nothing_to_do.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock.req/nothing_to_do.pass.cpp
rename to libcxx/test/std/time/time.clock.req/nothing_to_do.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.hires/consistency.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.hires/consistency.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.hires/now.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.hires/now.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.hires/now.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.hires/now.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/consistency.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.file/consistency.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.file/consistency.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.file/consistency.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/file_time.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.file/file_time.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.file/file_time.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.file/file_time.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.file/now.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.file/now.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/rep_signed.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.file/rep_signed.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.file/rep_signed.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.file/rep_signed.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/to_from_sys.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.file/to_from_sys.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.file/to_from_sys.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.file/to_from_sys.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.steady/consistency.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.steady/consistency.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.steady/now.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.steady/now.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.steady/now.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.steady/now.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/consistency.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.system/consistency.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.system/consistency.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.system/from_time_t.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.system/from_time_t.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/local_time.types.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.system/local_time.types.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.system/local_time.types.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.system/local_time.types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/now.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.system/now.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.system/now.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.system/now.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.system/rep_signed.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.system/rep_signed.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/sys.time.types.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.system/sys.time.types.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.system/sys.time.types.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.system/sys.time.types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.system/to_time_t.pass.cpp
rename from libcxx/test/std/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp
rename to libcxx/test/std/time/time.clock/time.clock.system/to_time_t.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/default_ratio.pass.cpp b/libcxx/test/std/time/time.duration/default_ratio.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/default_ratio.pass.cpp
rename to libcxx/test/std/time/time.duration/default_ratio.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/duration.compile.fail.cpp b/libcxx/test/std/time/time.duration/duration.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/duration.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/duration.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/positive_num.compile.fail.cpp b/libcxx/test/std/time/time.duration/positive_num.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/positive_num.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/positive_num.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/ratio.compile.fail.cpp b/libcxx/test/std/time/time.duration/ratio.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/ratio.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/ratio.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.alg/abs.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.alg/abs.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.alg/abs.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.alg/abs.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_++.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_++.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_++.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_++.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_--.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_--.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_--.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_--.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/ceil.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/ceil.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/ceil.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/ceil.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/duration_cast.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/duration_cast.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/floor.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/floor.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/floor.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/floor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/round.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/round.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/round.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/round.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/toduration.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cast/toduration.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/toduration.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cast/toduration.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.comparisons/op_less.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.comparisons/op_less.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/convert_exact.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/convert_exact.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_float_to_int.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/convert_float_to_int.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_float_to_int.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/convert_float_to_int.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/convert_inexact.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/convert_inexact.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_overflow.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/convert_overflow.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_overflow.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/convert_overflow.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/default.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/default.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/rep.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/rep.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep01.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/rep01.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep01.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/rep01.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/rep02.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/rep02.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/rep02.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/rep02.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep03.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.cons/rep03.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep03.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.cons/rep03.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.literals/literals.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.literals/literals.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.literals/literals1.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.literals/literals1.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.literals/literals1.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.literals/literals1.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.literals/literals2.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.literals/literals2.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.literals/literals2.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.literals/literals2.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_+.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_+.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_-.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_-.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_divide_rep.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_divide_rep.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_mod_rep.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_mod_rep.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_times_rep1.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_times_rep1.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.compile.fail.cpp b/libcxx/test/std/time/time.duration/time.duration.nonmember/op_times_rep2.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.compile.fail.cpp
rename to libcxx/test/std/time/time.duration/time.duration.nonmember/op_times_rep2.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.special/max.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.special/max.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.special/min.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.special/min.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp b/libcxx/test/std/time/time.duration/time.duration.special/zero.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp
rename to libcxx/test/std/time/time.duration/time.duration.special/zero.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.duration/types.pass.cpp b/libcxx/test/std/time/time.duration/types.pass.cpp
rename from libcxx/test/std/utilities/time/time.duration/types.pass.cpp
rename to libcxx/test/std/time/time.duration/types.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/default_duration.pass.cpp b/libcxx/test/std/time/time.point/default_duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/default_duration.pass.cpp
rename to libcxx/test/std/time/time.point/default_duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/duration.compile.fail.cpp b/libcxx/test/std/time/time.point/duration.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/duration.compile.fail.cpp
rename to libcxx/test/std/time/time.point/duration.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.arithmetic/op_+=.pass.cpp b/libcxx/test/std/time/time.point/time.point.arithmetic/op_+=.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.arithmetic/op_+=.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.arithmetic/op_+=.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.arithmetic/op_-=.pass.cpp b/libcxx/test/std/time/time.point/time.point.arithmetic/op_-=.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.arithmetic/op_-=.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.arithmetic/op_-=.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.cast/ceil.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/ceil.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.pass.cpp b/libcxx/test/std/time/time.point/time.point.cast/ceil.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/ceil.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.cast/floor.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/floor.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/floor.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.pass.cpp b/libcxx/test/std/time/time.point/time.point.cast/floor.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/floor.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/floor.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/round.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.cast/round.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/round.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/round.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/round.pass.cpp b/libcxx/test/std/time/time.point/time.point.cast/round.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/round.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/round.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp b/libcxx/test/std/time/time.point/time.point.cast/time_point_cast.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/time_point_cast.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/toduration.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.cast/toduration.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cast/toduration.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.cast/toduration.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.comparisons/op_equal.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.comparisons/op_equal.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp b/libcxx/test/std/time/time.point/time.point.comparisons/op_equal.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.comparisons/op_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.comparisons/op_less.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.comparisons/op_less.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp b/libcxx/test/std/time/time.point/time.point.comparisons/op_less.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.comparisons/op_less.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.cons/convert.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cons/convert.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.cons/convert.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp b/libcxx/test/std/time/time.point/time.point.cons/convert.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.cons/convert.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp b/libcxx/test/std/time/time.point/time.point.cons/default.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.cons/default.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.compile.fail.cpp b/libcxx/test/std/time/time.point/time.point.cons/duration.compile.fail.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cons/duration.compile.fail.cpp
rename to libcxx/test/std/time/time.point/time.point.cons/duration.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp b/libcxx/test/std/time/time.point/time.point.cons/duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.cons/duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp b/libcxx/test/std/time/time.point/time.point.nonmember/op_+.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.nonmember/op_+.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp b/libcxx/test/std/time/time.point/time.point.nonmember/op_-duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.nonmember/op_-duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp b/libcxx/test/std/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.observer/tested_elsewhere.pass.cpp b/libcxx/test/std/time/time.point/time.point.observer/tested_elsewhere.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.observer/tested_elsewhere.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.observer/tested_elsewhere.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.special/max.pass.cpp b/libcxx/test/std/time/time.point/time.point.special/max.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.special/max.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.special/max.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.special/min.pass.cpp b/libcxx/test/std/time/time.point/time.point.special/min.pass.cpp
rename from libcxx/test/std/utilities/time/time.point/time.point.special/min.pass.cpp
rename to libcxx/test/std/time/time.point/time.point.special/min.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp b/libcxx/test/std/time/time.traits/time.traits.duration_values/max.pass.cpp
rename from libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp
rename to libcxx/test/std/time/time.traits/time.traits.duration_values/max.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp b/libcxx/test/std/time/time.traits/time.traits.duration_values/min.pass.cpp
rename from libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp
rename to libcxx/test/std/time/time.traits/time.traits.duration_values/min.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp b/libcxx/test/std/time/time.traits/time.traits.duration_values/zero.pass.cpp
rename from libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp
rename to libcxx/test/std/time/time.traits/time.traits.duration_values/zero.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp b/libcxx/test/std/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
rename from libcxx/test/std/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
rename to libcxx/test/std/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp b/libcxx/test/std/time/time.traits/time.traits.specializations/duration.pass.cpp
rename from libcxx/test/std/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp
rename to libcxx/test/std/time/time.traits/time.traits.specializations/duration.pass.cpp
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp b/libcxx/test/std/time/time.traits/time.traits.specializations/time_point.pass.cpp
rename from libcxx/test/std/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp
rename to libcxx/test/std/time/time.traits/time.traits.specializations/time_point.pass.cpp
diff --git a/libcxx/test/std/utilities/time/weeks.pass.cpp b/libcxx/test/std/time/weeks.pass.cpp
rename from libcxx/test/std/utilities/time/weeks.pass.cpp
rename to libcxx/test/std/time/weeks.pass.cpp
diff --git a/libcxx/test/std/utilities/time/years.pass.cpp b/libcxx/test/std/time/years.pass.cpp
rename from libcxx/test/std/utilities/time/years.pass.cpp
rename to libcxx/test/std/time/years.pass.cpp