diff --git a/src/test/ui/E0501.rs b/src/test/ui/error-codes/E0501.rs
similarity index 100%
rename from src/test/ui/E0501.rs
rename to src/test/ui/error-codes/E0501.rs
diff --git a/src/test/ui/E0501.stderr b/src/test/ui/error-codes/E0501.stderr
similarity index 100%
rename from src/test/ui/E0501.stderr
rename to src/test/ui/error-codes/E0501.stderr
diff --git a/src/test/ui/E0506.rs b/src/test/ui/error-codes/E0506.rs
similarity index 100%
rename from src/test/ui/E0506.rs
rename to src/test/ui/error-codes/E0506.rs
diff --git a/src/test/ui/E0506.stderr b/src/test/ui/error-codes/E0506.stderr
similarity index 100%
rename from src/test/ui/E0506.stderr
rename to src/test/ui/error-codes/E0506.stderr
diff --git a/src/test/ui/E0508-fail.rs b/src/test/ui/error-codes/E0508-fail.rs
similarity index 100%
rename from src/test/ui/E0508-fail.rs
rename to src/test/ui/error-codes/E0508-fail.rs
diff --git a/src/test/ui/E0508-fail.stderr b/src/test/ui/error-codes/E0508-fail.stderr
similarity index 100%
rename from src/test/ui/E0508-fail.stderr
rename to src/test/ui/error-codes/E0508-fail.stderr
diff --git a/src/test/ui/E0508.rs b/src/test/ui/error-codes/E0508.rs
similarity index 100%
rename from src/test/ui/E0508.rs
rename to src/test/ui/error-codes/E0508.rs
diff --git a/src/test/ui/E0508.stderr b/src/test/ui/error-codes/E0508.stderr
similarity index 100%
rename from src/test/ui/E0508.stderr
rename to src/test/ui/error-codes/E0508.stderr
diff --git a/src/test/ui/E0583.rs b/src/test/ui/error-codes/E0583.rs
similarity index 100%
rename from src/test/ui/E0583.rs
rename to src/test/ui/error-codes/E0583.rs
diff --git a/src/test/ui/E0583.stderr b/src/test/ui/error-codes/E0583.stderr
similarity index 100%
rename from src/test/ui/E0583.stderr
rename to src/test/ui/error-codes/E0583.stderr
diff --git a/src/test/ui/E0594.rs b/src/test/ui/error-codes/E0594.rs
similarity index 100%
rename from src/test/ui/E0594.rs
rename to src/test/ui/error-codes/E0594.rs
diff --git a/src/test/ui/E0594.stderr b/src/test/ui/error-codes/E0594.stderr
similarity index 100%
rename from src/test/ui/E0594.stderr
rename to src/test/ui/error-codes/E0594.stderr
diff --git a/src/test/ui/E0596.rs b/src/test/ui/error-codes/E0596.rs
similarity index 100%
rename from src/test/ui/E0596.rs
rename to src/test/ui/error-codes/E0596.rs
diff --git a/src/test/ui/E0596.stderr b/src/test/ui/error-codes/E0596.stderr
similarity index 100%
rename from src/test/ui/E0596.stderr
rename to src/test/ui/error-codes/E0596.stderr
diff --git a/src/test/ui/E0642.rs b/src/test/ui/error-codes/E0642.rs
similarity index 100%
rename from src/test/ui/E0642.rs
rename to src/test/ui/error-codes/E0642.rs
diff --git a/src/test/ui/E0642.stderr b/src/test/ui/error-codes/E0642.stderr
similarity index 100%
rename from src/test/ui/E0642.stderr
rename to src/test/ui/error-codes/E0642.stderr
diff --git a/src/test/ui/E0660.rs b/src/test/ui/error-codes/E0660.rs
similarity index 100%
rename from src/test/ui/E0660.rs
rename to src/test/ui/error-codes/E0660.rs
diff --git a/src/test/ui/E0660.stderr b/src/test/ui/error-codes/E0660.stderr
similarity index 100%
rename from src/test/ui/E0660.stderr
rename to src/test/ui/error-codes/E0660.stderr
diff --git a/src/test/ui/E0661.rs b/src/test/ui/error-codes/E0661.rs
similarity index 100%
rename from src/test/ui/E0661.rs
rename to src/test/ui/error-codes/E0661.rs
diff --git a/src/test/ui/E0661.stderr b/src/test/ui/error-codes/E0661.stderr
similarity index 100%
rename from src/test/ui/E0661.stderr
rename to src/test/ui/error-codes/E0661.stderr
diff --git a/src/test/ui/E0662.rs b/src/test/ui/error-codes/E0662.rs
similarity index 100%
rename from src/test/ui/E0662.rs
rename to src/test/ui/error-codes/E0662.rs
diff --git a/src/test/ui/E0662.stderr b/src/test/ui/error-codes/E0662.stderr
similarity index 100%
rename from src/test/ui/E0662.stderr
rename to src/test/ui/error-codes/E0662.stderr
diff --git a/src/test/ui/E0663.rs b/src/test/ui/error-codes/E0663.rs
similarity index 100%
rename from src/test/ui/E0663.rs
rename to src/test/ui/error-codes/E0663.rs
diff --git a/src/test/ui/E0663.stderr b/src/test/ui/error-codes/E0663.stderr
similarity index 100%
rename from src/test/ui/E0663.stderr
rename to src/test/ui/error-codes/E0663.stderr
diff --git a/src/test/ui/E0664.rs b/src/test/ui/error-codes/E0664.rs
similarity index 100%
rename from src/test/ui/E0664.rs
rename to src/test/ui/error-codes/E0664.rs
diff --git a/src/test/ui/E0664.stderr b/src/test/ui/error-codes/E0664.stderr
similarity index 100%
rename from src/test/ui/E0664.stderr
rename to src/test/ui/error-codes/E0664.stderr
diff --git a/src/test/ui/E0665.rs b/src/test/ui/error-codes/E0665.rs
similarity index 100%
rename from src/test/ui/E0665.rs
rename to src/test/ui/error-codes/E0665.rs
diff --git a/src/test/ui/E0665.stderr b/src/test/ui/error-codes/E0665.stderr
similarity index 100%
rename from src/test/ui/E0665.stderr
rename to src/test/ui/error-codes/E0665.stderr
diff --git a/src/test/ui/E0705.rs b/src/test/ui/error-codes/E0705.rs
similarity index 100%
rename from src/test/ui/E0705.rs
rename to src/test/ui/error-codes/E0705.rs
diff --git a/src/test/ui/E0705.stderr b/src/test/ui/error-codes/E0705.stderr
similarity index 100%
rename from src/test/ui/E0705.stderr
rename to src/test/ui/error-codes/E0705.stderr
diff --git a/src/test/ui/e0119/auxiliary/complex_impl_support.rs b/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
similarity index 100%
rename from src/test/ui/e0119/auxiliary/complex_impl_support.rs
rename to src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
diff --git a/src/test/ui/e0119/auxiliary/issue-23563-a.rs b/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
similarity index 100%
rename from src/test/ui/e0119/auxiliary/issue-23563-a.rs
rename to src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
diff --git a/src/test/ui/e0119/complex-impl.rs b/src/test/ui/error-codes/e0119/complex-impl.rs
similarity index 100%
rename from src/test/ui/e0119/complex-impl.rs
rename to src/test/ui/error-codes/e0119/complex-impl.rs
diff --git a/src/test/ui/e0119/complex-impl.stderr b/src/test/ui/error-codes/e0119/complex-impl.stderr
similarity index 100%
rename from src/test/ui/e0119/complex-impl.stderr
rename to src/test/ui/error-codes/e0119/complex-impl.stderr
diff --git a/src/test/ui/e0119/conflict-with-std.rs b/src/test/ui/error-codes/e0119/conflict-with-std.rs
similarity index 100%
rename from src/test/ui/e0119/conflict-with-std.rs
rename to src/test/ui/error-codes/e0119/conflict-with-std.rs
diff --git a/src/test/ui/e0119/conflict-with-std.stderr b/src/test/ui/error-codes/e0119/conflict-with-std.stderr
similarity index 100%
rename from src/test/ui/e0119/conflict-with-std.stderr
rename to src/test/ui/error-codes/e0119/conflict-with-std.stderr
diff --git a/src/test/ui/e0119/issue-23563.rs b/src/test/ui/error-codes/e0119/issue-23563.rs
similarity index 100%
rename from src/test/ui/e0119/issue-23563.rs
rename to src/test/ui/error-codes/e0119/issue-23563.rs
diff --git a/src/test/ui/e0119/issue-23563.stderr b/src/test/ui/error-codes/e0119/issue-23563.stderr
similarity index 100%
rename from src/test/ui/e0119/issue-23563.stderr
rename to src/test/ui/error-codes/e0119/issue-23563.stderr
diff --git a/src/test/ui/e0119/issue-27403.rs b/src/test/ui/error-codes/e0119/issue-27403.rs
similarity index 100%
rename from src/test/ui/e0119/issue-27403.rs
rename to src/test/ui/error-codes/e0119/issue-27403.rs
diff --git a/src/test/ui/e0119/issue-27403.stderr b/src/test/ui/error-codes/e0119/issue-27403.stderr
similarity index 100%
rename from src/test/ui/e0119/issue-27403.stderr
rename to src/test/ui/error-codes/e0119/issue-27403.stderr
diff --git a/src/test/ui/e0119/issue-28981.rs b/src/test/ui/error-codes/e0119/issue-28981.rs
similarity index 100%
rename from src/test/ui/e0119/issue-28981.rs
rename to src/test/ui/error-codes/e0119/issue-28981.rs
diff --git a/src/test/ui/e0119/issue-28981.stderr b/src/test/ui/error-codes/e0119/issue-28981.stderr
similarity index 100%
rename from src/test/ui/e0119/issue-28981.stderr
rename to src/test/ui/error-codes/e0119/issue-28981.stderr
diff --git a/src/test/ui/e0119/so-37347311.rs b/src/test/ui/error-codes/e0119/so-37347311.rs
similarity index 100%
rename from src/test/ui/e0119/so-37347311.rs
rename to src/test/ui/error-codes/e0119/so-37347311.rs
diff --git a/src/test/ui/e0119/so-37347311.stderr b/src/test/ui/error-codes/e0119/so-37347311.stderr
similarity index 100%
rename from src/test/ui/e0119/so-37347311.stderr
rename to src/test/ui/error-codes/e0119/so-37347311.stderr