diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/Ambiguous/Ambiguous.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/Ambiguous/Ambiguous.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/Ambiguous/Ambiguous.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/Ambiguous/Ambiguous.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/Ambiguous/pkg1/A.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/Ambiguous/pkg1/A.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/Ambiguous/pkg1/A.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/Ambiguous/pkg1/A.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/Ambiguous/pkg2/A.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/Ambiguous/pkg2/A.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/Ambiguous/pkg2/A.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/Ambiguous/pkg2/A.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/AnnotationMember.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/AnnotationMember.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/AnnotationMember.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/AnnotationMember.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/BodyForAbstractMethod.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/BodyForAbstractMethod.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/BodyForAbstractMethod.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/BodyForAbstractMethod.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/CodeCannotBeReached.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/CodeCannotBeReached.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/CodeCannotBeReached.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/CodeCannotBeReached.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/File.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/File.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/File.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/File.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/FileNameAndClassName.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/FileNameAndClassName.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/FileNameAndClassName.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/FileNameAndClassName.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleExpInThrow/Sub.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleExpInThrow/Sub.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleExpInThrow/Sub.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleExpInThrow/Sub.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleExpInThrow/Super.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleExpInThrow/Super.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleExpInThrow/Super.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleExpInThrow/Super.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleReturnType/Sub.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleReturnType/Sub.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleReturnType/Sub.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleReturnType/Sub.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleReturnType/Super.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleReturnType/Super.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/IncompatibleReturnType/Super.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/IncompatibleReturnType/Super.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/InvalidUnionTypeReferenceSequenceCatch.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/InvalidUnionTypeReferenceSequenceCatch.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/InvalidUnionTypeReferenceSequenceCatch.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/InvalidUnionTypeReferenceSequenceCatch.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/MethodReturnsVoid.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/MethodReturnsVoid.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/MethodReturnsVoid.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/MethodReturnsVoid.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/MissingReturnType.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/MissingReturnType.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/MissingReturnType.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/MissingReturnType.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/MissingValueForAnnotationMember/A.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/MissingValueForAnnotationMember/A.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/MissingValueForAnnotationMember/A.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/MissingValueForAnnotationMember/A.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/MissingValueForAnnotationMember/CustomAnnotation.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/MissingValueForAnnotationMember/CustomAnnotation.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/MissingValueForAnnotationMember/CustomAnnotation.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/MissingValueForAnnotationMember/CustomAnnotation.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NoMessageSendOnArrayType.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NoMessageSendOnArrayType.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NoMessageSendOnArrayType.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NoMessageSendOnArrayType.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructor/A.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructor/A.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructor/A.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructor/A.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructor/B.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructor/B.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructor/B.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructor/B.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructorInDefaultConstructor/Sub.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructorInDefaultConstructor/Sub.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructorInDefaultConstructor/Sub.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructorInDefaultConstructor/Sub.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructorInDefaultConstructor/Super.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructorInDefaultConstructor/Super.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleConstructorInDefaultConstructor/Super.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleConstructorInDefaultConstructor/Super.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleMethod/A.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleMethod/A.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleMethod/A.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleMethod/A.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleMethod/B.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleMethod/B.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleMethod/B.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleMethod/B.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleType/A.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleType/A.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleType/A.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleType/A.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleType/B.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleType/B.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/NotVisibleType/B.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/NotVisibleType/B.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/ParameterMismatch.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/ParameterMismatch.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/ParameterMismatch.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/ParameterMismatch.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/TypeMismatch.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/TypeMismatch.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/TypeMismatch.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/TypeMismatch.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/Undefined.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/Undefined.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/Undefined.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/Undefined.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/UndefinedConstructorInDefaultConstructor/Sub.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/UndefinedConstructorInDefaultConstructor/Sub.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/UndefinedConstructorInDefaultConstructor/Sub.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/UndefinedConstructorInDefaultConstructor/Sub.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/UndefinedConstructorInDefaultConstructor/Super.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/UndefinedConstructorInDefaultConstructor/Super.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/UndefinedConstructorInDefaultConstructor/Super.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/UndefinedConstructorInDefaultConstructor/Super.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/UnhandledException.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnhandledException.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/UnhandledException.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnhandledException.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/UnhandledExceptionInDefaultConstructor/Sub.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnhandledExceptionInDefaultConstructor/Sub.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/UnhandledExceptionInDefaultConstructor/Sub.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnhandledExceptionInDefaultConstructor/Sub.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/UnhandledExceptionInDefaultConstructor/Super.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnhandledExceptionInDefaultConstructor/Super.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/UnhandledExceptionInDefaultConstructor/Super.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnhandledExceptionInDefaultConstructor/Super.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/UnreachableCatch.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnreachableCatch.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/UnreachableCatch.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnreachableCatch.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/Unresolved.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/Unresolved.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/Unresolved.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/Unresolved.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/UnterminatedString.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnterminatedString.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/UnterminatedString.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/UnterminatedString.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/VoidMethodReturnsValue.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/VoidMethodReturnsValue.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/VoidMethodReturnsValue.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/VoidMethodReturnsValue.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/notVisibleField/A.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/notVisibleField/A.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/notVisibleField/A.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/notVisibleField/A.java
diff --git a/org.eclipse.jdt.core.javac/examples/diagnostics/notVisibleField/B.java b/org.eclipse.jdt.core.tests.javac/projects/diagnostics/notVisibleField/B.java
similarity index 100%
rename from org.eclipse.jdt.core.javac/examples/diagnostics/notVisibleField/B.java
rename to org.eclipse.jdt.core.tests.javac/projects/diagnostics/notVisibleField/B.java