diff --git a/separate-builds/core/build.gradle b/build.gradle similarity index 100% rename from separate-builds/core/build.gradle rename to build.gradle diff --git a/separate-builds/core/gradle/eclipse-project-layout.gradle b/gradle/eclipse-project-layout.gradle similarity index 100% rename from separate-builds/core/gradle/eclipse-project-layout.gradle rename to gradle/eclipse-project-layout.gradle diff --git a/separate-builds/core/gradle/java-compiler-settings.gradle b/gradle/java-compiler-settings.gradle similarity index 100% rename from separate-builds/core/gradle/java-compiler-settings.gradle rename to gradle/java-compiler-settings.gradle diff --git a/separate-builds/core/gradle/versions.gradle b/gradle/versions.gradle similarity index 100% rename from separate-builds/core/gradle/versions.gradle rename to gradle/versions.gradle diff --git a/tests/org.eclipse.xtext.ide.tests/.gitignore b/org.eclipse.xtext.ide.tests/.gitignore similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.gitignore rename to org.eclipse.xtext.ide.tests/.gitignore diff --git a/plugins/org.eclipse.xtext.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.ide.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.ide.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.runtime.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.launching.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.launching.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.pde.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.pde.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.xtend.core.Xtend.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.xtend.core.Xtend.prefs rename to org.eclipse.xtext.ide.tests/.settings/org.eclipse.xtend.core.Xtend.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.xtext.ide/about.html b/org.eclipse.xtext.ide.tests/about.html similarity index 100% rename from plugins/org.eclipse.xtext.ide/about.html rename to org.eclipse.xtext.ide.tests/about.html diff --git a/tests/org.eclipse.xtext.ide.tests/build.gradle b/org.eclipse.xtext.ide.tests/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/build.gradle rename to org.eclipse.xtext.ide.tests/build.gradle diff --git a/tests/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.ecore b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.ecore similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.ecore rename to org.eclipse.xtext.ide.tests/model/generated/TestLanguage.ecore diff --git a/tests/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel rename to org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/AbstractTestLangLanguageServerTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/AbstractTestLangLanguageServerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/AbstractTestLangLanguageServerTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/AbstractTestLangLanguageServerTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DefinitionTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DefinitionTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DefinitionTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DefinitionTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentSymbolTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentSymbolTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentSymbolTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentSymbolTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/HoverTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/HoverTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/HoverTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/HoverTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/OpenDocumentTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/OpenDocumentTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/OpenDocumentTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/OpenDocumentTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ReferenceTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ReferenceTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ReferenceTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ReferenceTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerLauncherTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerLauncherTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerLauncherTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerLauncherTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/ServerTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceManagerTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceManagerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceManagerTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceManagerTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceSymbolTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceSymbolTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceSymbolTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/WorkspaceSymbolTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/concurrent/RequestManagerTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/concurrent/RequestManagerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/concurrent/RequestManagerTest.xtend rename to org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/concurrent/RequestManagerTest.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/AbstractTestLanguageRuntimeModule.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/AbstractTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/AbstractTestLanguageRuntimeModule.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/AbstractTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtextbin b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtextbin similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtextbin rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtextbin diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetupGenerated.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetupGenerated.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetupGenerated.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/PartialTestLanguageContentAssistParser.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/PartialTestLanguageContentAssistParser.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/PartialTestLanguageContentAssistParser.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/PartialTestLanguageContentAssistParser.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/TestLanguageParser.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/TestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/TestLanguageParser.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/TestLanguageParser.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.g b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.g similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.g rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.g diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.tokens b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.tokens similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.tokens rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguage.tokens diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageLexer.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageLexer.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageLexer.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageLexer.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageParser.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageParser.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/contentassist/antlr/internal/InternalTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageAntlrTokenFileProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageAntlrTokenFileProvider.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageAntlrTokenFileProvider.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageAntlrTokenFileProvider.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageParser.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageParser.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/TestLanguageParser.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.g b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.g similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.g rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.g diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.tokens b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.tokens similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.tokens rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguage.tokens diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageLexer.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageLexer.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageLexer.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageLexer.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageParser.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageParser.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/parser/antlr/internal/InternalTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/scoping/AbstractTestLanguageScopeProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/scoping/AbstractTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/scoping/AbstractTestLanguageScopeProvider.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/scoping/AbstractTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSemanticSequencer.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSemanticSequencer.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSyntacticSequencer.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/serializer/TestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguageFactory.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguageFactory.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguageFactory.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguageFactory.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguagePackage.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguagePackage.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguagePackage.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TestLanguagePackage.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageAdapterFactory.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageAdapterFactory.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageAdapterFactory.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageAdapterFactory.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageSwitch.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageSwitch.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageSwitch.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/util/TestLanguageSwitch.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java rename to org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/validation/AbstractTestLanguageValidator.java diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/META-INF/services/org.eclipse.xtext.ISetup b/org.eclipse.xtext.ide.tests/testlang-src/META-INF/services/org.eclipse.xtext.ISetup similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/META-INF/services/org.eclipse.xtext.ISetup rename to org.eclipse.xtext.ide.tests/testlang-src/META-INF/services/org.eclipse.xtext.ISetup diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/GenerateTestLanguage.mwe2 b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/GenerateTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/GenerateTestLanguage.mwe2 rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/GenerateTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtext b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtext rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetup.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetup.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetup.xtend rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageStandaloneSetup.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/generator/TestLanguageGenerator.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/generator/TestLanguageGenerator.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/generator/TestLanguageGenerator.xtend rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/generator/TestLanguageGenerator.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/highlighting/TestLanguageHighlightingProvider.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/highlighting/TestLanguageHighlightingProvider.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/highlighting/TestLanguageHighlightingProvider.xtend rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/highlighting/TestLanguageHighlightingProvider.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/scoping/TestLanguageScopeProvider.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/scoping/TestLanguageScopeProvider.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/scoping/TestLanguageScopeProvider.xtend rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/scoping/TestLanguageScopeProvider.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/server/SocketServerLauncher.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/server/SocketServerLauncher.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/server/SocketServerLauncher.xtend rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/server/SocketServerLauncher.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/validation/TestLanguageValidator.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/validation/TestLanguageValidator.xtend similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/validation/TestLanguageValidator.xtend rename to org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/validation/TestLanguageValidator.xtend diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/launch.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/launch.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/launch.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/launch.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/tasks.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/tasks.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/tasks.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/.vscode/tasks.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.gitignore b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.gitignore similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.gitignore rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.gitignore diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/launch.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/launch.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/launch.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/launch.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/settings.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/settings.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/settings.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/settings.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/tasks.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/tasks.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/tasks.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscode/tasks.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscodeignore b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscodeignore similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscodeignore rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/.vscodeignore diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/README.md b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/README.md similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/README.md rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/README.md diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/package.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/package.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/package.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/package.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/src/extension.ts b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/src/extension.ts similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/src/extension.ts rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/src/extension.ts diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.configuration.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.configuration.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.configuration.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.configuration.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.tmLanguage b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.tmLanguage similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.tmLanguage rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/testlang.tmLanguage diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/tsconfig.json b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/tsconfig.json similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/tsconfig.json rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/tsconfig.json diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/node.d.ts b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/node.d.ts similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/node.d.ts rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/node.d.ts diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/vscode-typings.d.ts b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/vscode-typings.d.ts similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/vscode-typings.d.ts rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/typings/vscode-typings.d.ts diff --git a/tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/vsc-extension-quickstart.md b/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/vsc-extension-quickstart.md similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/vsc-extension-quickstart.md rename to org.eclipse.xtext.ide.tests/testlang-vscode-extension/testlang/vsc-extension-quickstart.md diff --git a/plugins/org.eclipse.xtext.ide/.gitignore b/org.eclipse.xtext.ide/.gitignore similarity index 100% rename from plugins/org.eclipse.xtext.ide/.gitignore rename to org.eclipse.xtext.ide/.gitignore diff --git a/plugins/org.eclipse.xtext.ide/.settings/.api_filters b/org.eclipse.xtext.ide/.settings/.api_filters similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/.api_filters rename to org.eclipse.xtext.ide/.settings/.api_filters diff --git a/plugins/org.eclipse.xtext.junit4/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs diff --git a/plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.core.runtime.prefs diff --git a/plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.launching.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.jdt.launching.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.m2e.core.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.pde.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.pde.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.xtend.core.Xtend.prefs similarity index 100% rename from plugins/org.eclipse.xtext.ide/.settings/org.eclipse.xtend.core.Xtend.prefs rename to org.eclipse.xtext.ide/.settings/org.eclipse.xtend.core.Xtend.prefs diff --git a/plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF similarity index 100% rename from plugins/org.eclipse.xtext.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.ide/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.xtext.junit4/about.html b/org.eclipse.xtext.ide/about.html similarity index 100% rename from plugins/org.eclipse.xtext.junit4/about.html rename to org.eclipse.xtext.ide/about.html diff --git a/plugins/org.eclipse.xtext.ide/build.gradle b/org.eclipse.xtext.ide/build.gradle similarity index 100% rename from plugins/org.eclipse.xtext.ide/build.gradle rename to org.eclipse.xtext.ide/build.gradle diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/LexerIdeBindings.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/LexerIdeBindings.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/LexerIdeBindings.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/LexerIdeBindings.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/BracePair.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/BracePair.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/BracePair.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/BracePair.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/DefaultBracePairProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/DefaultBracePairProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/DefaultBracePairProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/DefaultBracePairProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/XtextBracePairProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/XtextBracePairProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/XtextBracePairProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/bracketmatching/XtextBracePairProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/AbstractIdeTemplateProposalProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/AbstractIdeTemplateProposalProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/AbstractIdeTemplateProposalProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/AbstractIdeTemplateProposalProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistContext.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistContext.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistContext.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistContext.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistEntry.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistEntry.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistEntry.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistEntry.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/FQNPrefixMatcher.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/FQNPrefixMatcher.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/FQNPrefixMatcher.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/FQNPrefixMatcher.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IFollowElementAcceptor.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IFollowElementAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IFollowElementAcceptor.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IFollowElementAcceptor.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IProposalConflictHelper.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IProposalConflictHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IProposalConflictHelper.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IProposalConflictHelper.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalCreator.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalCreator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalCreator.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalCreator.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalPriorities.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalPriorities.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalPriorities.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalPriorities.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeCrossrefProposalProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeCrossrefProposalProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeCrossrefProposalProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeCrossrefProposalProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ProposalConflictHelper.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ProposalConflictHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ProposalConflictHelper.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ProposalConflictHelper.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractContentAssistParser.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractContentAssistParser.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractContentAssistParser.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractContentAssistParser.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/CallHierarchyHelper.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/CallHierarchyHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/CallHierarchyHelper.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/CallHierarchyHelper.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/EntryPointFinder.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/EntryPointFinder.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/EntryPointFinder.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/EntryPointFinder.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElement.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElement.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElement.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElement.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementCalculator.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementCalculator.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementCalculator.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementCalculator.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementComputer.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementComputer.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementComputer.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/FollowElementComputer.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IContentAssistParser.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IContentAssistParser.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IContentAssistParser.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IContentAssistParser.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IPartialContentAssistParser.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IPartialContentAssistParser.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IPartialContentAssistParser.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/IPartialContentAssistParser.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LeafNodeFinder.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LeafNodeFinder.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LeafNodeFinder.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LeafNodeFinder.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminal.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminal.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminal.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminal.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminalRuleCall.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminalRuleCall.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminalRuleCall.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadTerminalRuleCall.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookaheadKeyword.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookaheadKeyword.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookaheadKeyword.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookaheadKeyword.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ObservableXtextTokenStream.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ObservableXtextTokenStream.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ObservableXtextTokenStream.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ObservableXtextTokenStream.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/AbstractInternalContentAssistParser.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/AbstractInternalContentAssistParser.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/AbstractInternalContentAssistParser.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/AbstractInternalContentAssistParser.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/InfiniteRecursion.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/InfiniteRecursion.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/InfiniteRecursion.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/InfiniteRecursion.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/LinkedHashSetWithoutNull.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/LinkedHashSetWithoutNull.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/LinkedHashSetWithoutNull.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/LinkedHashSetWithoutNull.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/AbstractHierarchyBuilder.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/AbstractHierarchyBuilder.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/AbstractHierarchyBuilder.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/AbstractHierarchyBuilder.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultCallHierarchyBuilder.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultCallHierarchyBuilder.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultCallHierarchyBuilder.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultCallHierarchyBuilder.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNode.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNode.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNode.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNode.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeLocationProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeLocationProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeLocationProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeLocationProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeReference.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeReference.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeReference.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyNodeReference.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyRoot.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyRoot.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyRoot.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/DefaultHierarchyRoot.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/model/TokenTypeToStringMapper.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/navigation/INavigatable.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/navigation/INavigatable.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/navigation/INavigatable.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/navigation/INavigatable.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/partialEditing/IPartialEditingContentAssistParser.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/partialEditing/IPartialEditingContentAssistParser.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/partialEditing/IPartialEditingContentAssistParser.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/partialEditing/IPartialEditingContentAssistParser.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/AbstractAntlrTokenToAttributeIdMapper.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultAntlrTokenToAttributeIdMapper.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultSemanticHighlightingCalculator.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultSemanticHighlightingCalculator.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultSemanticHighlightingCalculator.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultSemanticHighlightingCalculator.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IHighlightedPositionAcceptor.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IHighlightedPositionAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IHighlightedPositionAcceptor.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IHighlightedPositionAcceptor.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/ISemanticHighlightingCalculator.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/ISemanticHighlightingCalculator.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/ISemanticHighlightingCalculator.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/ISemanticHighlightingCalculator.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/LightweightPosition.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/MergingHighlightedPositionAcceptor.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/MergingHighlightedPositionAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/MergingHighlightedPositionAcceptor.java rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/MergingHighlightedPositionAcceptor.java diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescription.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescription.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescription.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescription.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/INameLabelProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/INameLabelProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/INameLabelProvider.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/INameLabelProvider.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/Document.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/DocumentExtensions.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerLauncher.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ServerModule.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/CancellableIndicator.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestCancelIndicator.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/hover/HoverService.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/DocumentSymbolService.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/symbol/WorkspaceSymbolService.xtend diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend rename to org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/util/CancelIndicatorProgressMonitor.xtend diff --git a/tests/org.eclipse.xtext.junit4.tests/.classpath b/org.eclipse.xtext.junit4.tests/.classpath similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/.classpath rename to org.eclipse.xtext.junit4.tests/.classpath diff --git a/plugins/org.eclipse.xtext.junit4/.gitignore b/org.eclipse.xtext.junit4.tests/.gitignore similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.gitignore rename to org.eclipse.xtext.junit4.tests/.gitignore diff --git a/tests/org.eclipse.xtext.junit4.tests/.project b/org.eclipse.xtext.junit4.tests/.project similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/.project rename to org.eclipse.xtext.junit4.tests/.project diff --git a/plugins/org.eclipse.xtext.util/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.junit4.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.junit4.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.junit4.tests/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.junit4.tests/.settings/org.eclipse.core.runtime.prefs diff --git a/splitting/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.junit4.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from splitting/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.xtext.junit4.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/tests/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.junit4.tests/build.properties b/org.eclipse.xtext.junit4.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/build.properties rename to org.eclipse.xtext.junit4.tests/build.properties diff --git a/tests/org.eclipse.xtext.junit4.tests/pom.xml b/org.eclipse.xtext.junit4.tests/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/pom.xml rename to org.eclipse.xtext.junit4.tests/pom.xml diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java b/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java rename to org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsFourTimes.java b/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsFourTimes.java similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsFourTimes.java rename to org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsFourTimes.java diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsTwoTimes.java b/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsTwoTimes.java similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsTwoTimes.java rename to org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/FlakyFailsTwoTimes.java diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/IllegalFlakyConfigTest.java b/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/IllegalFlakyConfigTest.java similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/IllegalFlakyConfigTest.java rename to org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/IllegalFlakyConfigTest.java diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/SmokeTestScenarioTest.java b/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/SmokeTestScenarioTest.java similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/SmokeTestScenarioTest.java rename to org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/SmokeTestScenarioTest.java diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/XtextRunnerTest.java b/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/XtextRunnerTest.java similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/XtextRunnerTest.java rename to org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/XtextRunnerTest.java diff --git a/tests/org.eclipse.xtext.junit4.tests/xtext.junit4.tests.launch b/org.eclipse.xtext.junit4.tests/xtext.junit4.tests.launch similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/xtext.junit4.tests.launch rename to org.eclipse.xtext.junit4.tests/xtext.junit4.tests.launch diff --git a/plugins/org.eclipse.xtext.junit4/.classpath b/org.eclipse.xtext.junit4/.classpath similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.classpath rename to org.eclipse.xtext.junit4/.classpath diff --git a/plugins/org.eclipse.xtext.util/.gitignore b/org.eclipse.xtext.junit4/.gitignore similarity index 100% rename from plugins/org.eclipse.xtext.util/.gitignore rename to org.eclipse.xtext.junit4/.gitignore diff --git a/plugins/org.eclipse.xtext.junit4/.project b/org.eclipse.xtext.junit4/.project similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.project rename to org.eclipse.xtext.junit4/.project diff --git a/plugins/org.eclipse.xtext.junit4/.settings/.api_filters b/org.eclipse.xtext.junit4/.settings/.api_filters similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/.api_filters rename to org.eclipse.xtext.junit4/.settings/.api_filters diff --git a/plugins/org.eclipse.xtext/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.junit4/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.junit4/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.junit4/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.junit4/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.junit4/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.junit4/.settings/org.eclipse.core.runtime.prefs diff --git a/plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.launching.prefs rename to org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.launching.prefs diff --git a/plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.xtext.junit4/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.junit4/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.xtext.junit4/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext.junit4/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.xtext.junit4/.settings/org.eclipse.pde.prefs rename to org.eclipse.xtext.junit4/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF similarity index 100% rename from plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF rename to org.eclipse.xtext.junit4/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.xtext.util/about.html b/org.eclipse.xtext.junit4/about.html similarity index 100% rename from plugins/org.eclipse.xtext.util/about.html rename to org.eclipse.xtext.junit4/about.html diff --git a/plugins/org.eclipse.xtext.junit4/build.properties b/org.eclipse.xtext.junit4/build.properties similarity index 100% rename from plugins/org.eclipse.xtext.junit4/build.properties rename to org.eclipse.xtext.junit4/build.properties diff --git a/plugins/org.eclipse.xtext.junit4/pom.xml b/org.eclipse.xtext.junit4/pom.xml similarity index 100% rename from plugins/org.eclipse.xtext.junit4/pom.xml rename to org.eclipse.xtext.junit4/pom.xml diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/AbstractXtextTests.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/AbstractXtextTests.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/AbstractXtextTests.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/AbstractXtextTests.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/Flaky.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/Flaky.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/Flaky.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/Flaky.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/GlobalRegistries.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/GlobalRegistries.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/GlobalRegistries.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/GlobalRegistries.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IInjectorProvider.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IInjectorProvider.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IInjectorProvider.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IInjectorProvider.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IRegistryConfigurator.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IRegistryConfigurator.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IRegistryConfigurator.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/IRegistryConfigurator.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/InjectWith.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/InjectWith.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/InjectWith.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/InjectWith.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/TemporaryFolder.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/TemporaryFolder.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/TemporaryFolder.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/TemporaryFolder.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/XtextRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/XtextRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/XtextRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/XtextRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/build/AbstractIncrementalBuilderTest.xtend b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/build/AbstractIncrementalBuilderTest.xtend similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/build/AbstractIncrementalBuilderTest.xtend rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/build/AbstractIncrementalBuilderTest.xtend diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTestRequest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTestRequest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTestRequest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTestRequest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ide/AbstractHierarchyBuilderTest.xtend b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ide/AbstractHierarchyBuilderTest.xtend similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ide/AbstractHierarchyBuilderTest.xtend rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ide/AbstractHierarchyBuilderTest.xtend diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/AbstractPortableURIsTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/AbstractPortableURIsTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/AbstractPortableURIsTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/AbstractPortableURIsTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InjectorProviders.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InjectorProviders.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InjectorProviders.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InjectorProviders.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InternalBuilderTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InternalBuilderTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InternalBuilderTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/InternalBuilderTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/LineDelimiters.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/LineDelimiters.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/LineDelimiters.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/LineDelimiters.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/StopwatchRule.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/StopwatchRule.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/StopwatchRule.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/StopwatchRule.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/Timed.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/Timed.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/Timed.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/Timed.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/XtextInjectorProvider.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/XtextInjectorProvider.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/XtextInjectorProvider.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/XtextInjectorProvider.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/logging/LoggingTester.xtend b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/logging/LoggingTester.xtend similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/logging/LoggingTester.xtend rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/logging/LoggingTester.xtend diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertNodeModelAcceptor.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertNodeModelAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertNodeModelAcceptor.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertNodeModelAcceptor.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertStructureAcceptor.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertStructureAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertStructureAcceptor.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/AssertStructureAcceptor.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/DebugSequenceAcceptor.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/DebugSequenceAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/DebugSequenceAcceptor.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/DebugSequenceAcceptor.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/SerializerTester.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/SerializerTester.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/SerializerTester.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/SerializerTester.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/AbstractSmokeTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/AbstractSmokeTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/AbstractSmokeTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/AbstractSmokeTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/DeltaScenarioProcessor.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/DeltaScenarioProcessor.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/DeltaScenarioProcessor.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/DeltaScenarioProcessor.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/IgnoredBySmokeTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/IgnoredBySmokeTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/IgnoredBySmokeTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/IgnoredBySmokeTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ProcessedBy.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ProcessedBy.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ProcessedBy.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ProcessedBy.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenario.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenario.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenario.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenario.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ScenarioProcessor.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ScenarioProcessor.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ScenarioProcessor.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/ScenarioProcessor.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenarios.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenarios.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenarios.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/Scenarios.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/XtextSmokeTestRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/XtextSmokeTestRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/XtextSmokeTestRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/XtextSmokeTestRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractParallelScenarioRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractParallelScenarioRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractParallelScenarioRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractParallelScenarioRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractScenarioRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractScenarioRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractScenarioRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AbstractScenarioRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AllScenariosRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AllScenariosRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AllScenariosRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/AllScenariosRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/CompleteInputScenarioRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/CompleteInputScenarioRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/CompleteInputScenarioRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/CompleteInputScenarioRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/InjectorCache.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/InjectorCache.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/InjectorCache.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/InjectorCache.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelCompleteInputScenarioRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelCompleteInputScenarioRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelCompleteInputScenarioRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelCompleteInputScenarioRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelPermutingScenarioRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelPermutingScenarioRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelPermutingScenarioRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/ParallelPermutingScenarioRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/PermutingScenarioRunner.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/PermutingScenarioRunner.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/PermutingScenarioRunner.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/PermutingScenarioRunner.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/RunnerBuilder.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/RunnerBuilder.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/RunnerBuilder.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/RunnerBuilder.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataCarrier.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataCarrier.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataCarrier.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataCarrier.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataProvider.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataProvider.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataProvider.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/TestDataProvider.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/WrappingInjectorProvider.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/WrappingInjectorProvider.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/WrappingInjectorProvider.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/internal/WrappingInjectorProvider.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/processors/PartialParsingProcessor.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/processors/PartialParsingProcessor.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/processors/PartialParsingProcessor.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/smoketest/processors/PartialParsingProcessor.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractAutoEditTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractAutoEditTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractAutoEditTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractAutoEditTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCStyleLanguageAutoEditTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCStyleLanguageAutoEditTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCStyleLanguageAutoEditTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCStyleLanguageAutoEditTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractContentAssistProcessorTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractContentAssistProcessorTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractContentAssistProcessorTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractContentAssistProcessorTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCursorHandlingTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCursorHandlingTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCursorHandlingTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractCursorHandlingTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractDamagerRepairerTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractDamagerRepairerTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractDamagerRepairerTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractDamagerRepairerTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractEditorTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractEditorTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractEditorTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractEditorTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractLinkedEditingIntegrationTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractLinkedEditingIntegrationTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractLinkedEditingIntegrationTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractLinkedEditingIntegrationTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractOutlineTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractOutlineTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractOutlineTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractOutlineTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractWorkbenchTest.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractWorkbenchTest.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractWorkbenchTest.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/AbstractWorkbenchTest.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/ContentAssistProcessorTestBuilder.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/ContentAssistProcessorTestBuilder.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/ContentAssistProcessorTestBuilder.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/ContentAssistProcessorTestBuilder.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableSelectionProvider.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableSelectionProvider.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableSelectionProvider.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableSelectionProvider.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableTextViewer.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableTextViewer.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableTextViewer.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/MockableTextViewer.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/IResourcesSetupUtil.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/IResourcesSetupUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/IResourcesSetupUtil.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/IResourcesSetupUtil.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/JavaProjectSetupUtil.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/JavaProjectSetupUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/JavaProjectSetupUtil.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/JavaProjectSetupUtil.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/PluginUtil.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/PluginUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/PluginUtil.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/PluginUtil.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIConverter.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIConverter.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIConverter.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIConverter.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIHandler.xtend b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIHandler.xtend similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIHandler.xtend rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/InMemoryURIHandler.xtend diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ParseHelper.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ParseHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ParseHelper.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ParseHelper.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceHelper.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceHelper.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceHelper.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceLoadHelper.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceLoadHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceLoadHelper.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/ResourceLoadHelper.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/URIBasedTestResourceDescription.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/URIBasedTestResourceDescription.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/URIBasedTestResourceDescription.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/util/URIBasedTestResourceDescription.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AbstractValidatorTester.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AbstractValidatorTester.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AbstractValidatorTester.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AbstractValidatorTester.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AssertableDiagnostics.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AssertableDiagnostics.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AssertableDiagnostics.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/AssertableDiagnostics.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/RegisteredValidatorTester.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/RegisteredValidatorTester.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/RegisteredValidatorTester.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/RegisteredValidatorTester.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidationTestHelper.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidationTestHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidationTestHelper.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidationTestHelper.java diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidatorTester.java b/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidatorTester.java similarity index 100% rename from plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidatorTester.java rename to org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/validation/ValidatorTester.java diff --git a/separate-builds/core/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from separate-builds/core/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs rename to org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs diff --git a/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.testing/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.testing/.settings/org.eclipse.core.resources.prefs diff --git a/separate-builds/core/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF similarity index 100% rename from separate-builds/core/org.eclipse.xtext.testing/META-INF/MANIFEST.MF rename to org.eclipse.xtext.testing/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.xtext.xtext.generator/about.html b/org.eclipse.xtext.testing/about.html similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/about.html rename to org.eclipse.xtext.testing/about.html diff --git a/separate-builds/core/org.eclipse.xtext.testing/build.gradle b/org.eclipse.xtext.testing/build.gradle similarity index 100% rename from separate-builds/core/org.eclipse.xtext.testing/build.gradle rename to org.eclipse.xtext.testing/build.gradle diff --git a/separate-builds/core/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend b/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend similarity index 100% rename from separate-builds/core/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend rename to org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend diff --git a/tests/org.eclipse.xtext.testlanguages.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.testlanguages.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.testlanguages.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.testlanguages.ide/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/tests/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.testlanguages.ide/build.gradle b/org.eclipse.xtext.testlanguages.ide/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.testlanguages.ide/build.gradle rename to org.eclipse.xtext.testlanguages.ide/build.gradle diff --git a/tests/org.eclipse.xtext.testlanguages.ide/build.properties b/org.eclipse.xtext.testlanguages.ide/build.properties similarity index 100% rename from tests/org.eclipse.xtext.testlanguages.ide/build.properties rename to org.eclipse.xtext.testlanguages.ide/build.properties diff --git a/tests/org.eclipse.xtext.testlanguages/.gitignore b/org.eclipse.xtext.testlanguages/.gitignore similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/.gitignore rename to org.eclipse.xtext.testlanguages/.gitignore diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.testlanguages/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.testlanguages/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/tests/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF rename to org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.xtext/about.html b/org.eclipse.xtext.testlanguages/about.html similarity index 100% rename from plugins/org.eclipse.xtext/about.html rename to org.eclipse.xtext.testlanguages/about.html diff --git a/tests/org.eclipse.xtext.testlanguages/build.gradle b/org.eclipse.xtext.testlanguages/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/build.gradle rename to org.eclipse.xtext.testlanguages/build.gradle diff --git a/tests/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/build.properties rename to org.eclipse.xtext.testlanguages/build.properties diff --git a/tests/org.eclipse.xtext.testlanguages/integration-test-pom.xml b/org.eclipse.xtext.testlanguages/integration-test-pom.xml similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/integration-test-pom.xml rename to org.eclipse.xtext.testlanguages/integration-test-pom.xml diff --git a/tests/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.ecore b/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.ecore similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.ecore rename to org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.ecore diff --git a/tests/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel rename to org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel diff --git a/tests/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.ecore b/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.ecore similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.ecore rename to org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.ecore diff --git a/tests/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel rename to org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel diff --git a/tests/org.eclipse.xtext.testlanguages/plugin.xml b/org.eclipse.xtext.testlanguages/plugin.xml similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/plugin.xml rename to org.eclipse.xtext.testlanguages/plugin.xml diff --git a/tests/org.eclipse.xtext.testlanguages/plugin.xml_gen b/org.eclipse.xtext.testlanguages/plugin.xml_gen similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/plugin.xml_gen rename to org.eclipse.xtext.testlanguages/plugin.xml_gen diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2 rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.mwe2 rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.xtext b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.xtext rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageRuntimeModule.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageRuntimeModule.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageStandaloneSetup.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/BeeLangTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.mwe2 rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.xtext b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.xtext rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageRuntimeModule.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageRuntimeModule.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageStandaloneSetup.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/ExBeeLangTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.mwe2 rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.xtext b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.xtext rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageRuntimeModule.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageRuntimeModule.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageStandaloneSetup.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/SimpleBeeLangTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/BeeLangTestLanguageFormatter.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/BeeLangTestLanguageFormatter.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/BeeLangTestLanguageFormatter.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/BeeLangTestLanguageFormatter.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/ExBeeLangTestLanguageFormatter.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/ExBeeLangTestLanguageFormatter.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/ExBeeLangTestLanguageFormatter.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/ExBeeLangTestLanguageFormatter.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/SimpleBeeLangTestLanguageFormatter.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/SimpleBeeLangTestLanguageFormatter.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/SimpleBeeLangTestLanguageFormatter.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting/SimpleBeeLangTestLanguageFormatter.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/BeeLangTestLanguageFormatter.xtend b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/BeeLangTestLanguageFormatter.xtend similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/BeeLangTestLanguageFormatter.xtend rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/BeeLangTestLanguageFormatter.xtend diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/ExBeeLangTestLanguageFormatter.xtend b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/ExBeeLangTestLanguageFormatter.xtend similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/ExBeeLangTestLanguageFormatter.xtend rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/ExBeeLangTestLanguageFormatter.xtend diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/SimpleBeeLangTestLanguageFormatter.xtend b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/SimpleBeeLangTestLanguageFormatter.xtend similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/SimpleBeeLangTestLanguageFormatter.xtend rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/formatting2/SimpleBeeLangTestLanguageFormatter.xtend diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/BeeLangTestLanguageScopeProvider.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/BeeLangTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/BeeLangTestLanguageScopeProvider.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/BeeLangTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/ExBeeLangTestLanguageScopeProvider.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/ExBeeLangTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/ExBeeLangTestLanguageScopeProvider.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/ExBeeLangTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/SimpleBeeLangTestLanguageScopeProvider.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/SimpleBeeLangTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/SimpleBeeLangTestLanguageScopeProvider.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/scoping/SimpleBeeLangTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/BeeLangTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/BeeLangTestLanguageValidator.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/BeeLangTestLanguageValidator.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/BeeLangTestLanguageValidator.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/ExBeeLangTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/ExBeeLangTestLanguageValidator.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/ExBeeLangTestLanguageValidator.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/ExBeeLangTestLanguageValidator.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/SimpleBeeLangTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/SimpleBeeLangTestLanguageValidator.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/SimpleBeeLangTestLanguageValidator.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/backtracking/validation/SimpleBeeLangTestLanguageValidator.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2 rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2 diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.xtext b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.xtext rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageRuntimeModule.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageRuntimeModule.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageStandaloneSetup.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/formatting2/NoJdtTestLanguageFormatter.xtend b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/formatting2/NoJdtTestLanguageFormatter.xtend similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/formatting2/NoJdtTestLanguageFormatter.xtend rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/formatting2/NoJdtTestLanguageFormatter.xtend diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/generator/NoJdtTestLanguageGenerator.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/generator/NoJdtTestLanguageGenerator.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/generator/NoJdtTestLanguageGenerator.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/generator/NoJdtTestLanguageGenerator.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/scoping/NoJdtTestLanguageScopeProvider.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/scoping/NoJdtTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/scoping/NoJdtTestLanguageScopeProvider.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/scoping/NoJdtTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/validation/NoJdtTestLanguageValidator.java b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/validation/NoJdtTestLanguageValidator.java similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/validation/NoJdtTestLanguageValidator.java rename to org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/validation/NoJdtTestLanguageValidator.java diff --git a/tests/org.eclipse.xtext.tests/.classpath b/org.eclipse.xtext.tests/.classpath similarity index 100% rename from tests/org.eclipse.xtext.tests/.classpath rename to org.eclipse.xtext.tests/.classpath diff --git a/plugins/org.eclipse.xtext/.gitignore b/org.eclipse.xtext.tests/.gitignore similarity index 100% rename from plugins/org.eclipse.xtext/.gitignore rename to org.eclipse.xtext.tests/.gitignore diff --git a/tests/org.eclipse.xtext.tests/.project b/org.eclipse.xtext.tests/.project similarity index 100% rename from tests/org.eclipse.xtext.tests/.project rename to org.eclipse.xtext.tests/.project diff --git a/tests/org.eclipse.xtext.junit4.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.core.resources.prefs old mode 100644 new mode 100755 similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.tests/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.tests/.settings/org.eclipse.core.runtime.prefs diff --git a/tests/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.launching.prefs rename to org.eclipse.xtext.tests/.settings/org.eclipse.jdt.launching.prefs diff --git a/tests/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.xtext.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/org.eclipse.xtext.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.pde.prefs similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/org.eclipse.pde.prefs rename to org.eclipse.xtext.tests/.settings/org.eclipse.pde.prefs diff --git a/tests/org.eclipse.xtext.tests/.settings/org.eclipse.xtend.shared.ui.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.xtend.shared.ui.prefs similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/org.eclipse.xtend.shared.ui.prefs rename to org.eclipse.xtext.tests/.settings/org.eclipse.xtend.shared.ui.prefs diff --git a/tests/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch b/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch similarity index 100% rename from tests/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch rename to org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch diff --git a/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen similarity index 100% rename from tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen rename to org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen diff --git a/separate-builds/core/org.eclipse.xtext.testing/about.html b/org.eclipse.xtext.tests/about.html similarity index 100% rename from separate-builds/core/org.eclipse.xtext.testing/about.html rename to org.eclipse.xtext.tests/about.html diff --git a/tests/org.eclipse.xtext.tests/build.gradle b/org.eclipse.xtext.tests/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/build.gradle rename to org.eclipse.xtext.tests/build.gradle diff --git a/tests/org.eclipse.xtext.tests/build.properties b/org.eclipse.xtext.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/build.properties rename to org.eclipse.xtext.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/lib/simple.jar b/org.eclipse.xtext.tests/lib/simple.jar similarity index 100% rename from tests/org.eclipse.xtext.tests/lib/simple.jar rename to org.eclipse.xtext.tests/lib/simple.jar diff --git a/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore b/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore rename to org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore diff --git a/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel b/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel rename to org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel diff --git a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore b/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore rename to org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore diff --git a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel b/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel rename to org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel diff --git a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore b/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore rename to org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore diff --git a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel b/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel rename to org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel diff --git a/tests/org.eclipse.xtext.tests/plugin.properties b/org.eclipse.xtext.tests/plugin.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/plugin.properties rename to org.eclipse.xtext.tests/plugin.properties diff --git a/tests/org.eclipse.xtext.tests/plugin.xml b/org.eclipse.xtext.tests/plugin.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/plugin.xml rename to org.eclipse.xtext.tests/plugin.xml diff --git a/tests/org.eclipse.xtext.tests/plugin.xml_gen b/org.eclipse.xtext.tests/plugin.xml_gen similarity index 100% rename from tests/org.eclipse.xtext.tests/plugin.xml_gen rename to org.eclipse.xtext.tests/plugin.xml_gen diff --git a/tests/org.eclipse.xtext.tests/pom.xml b/org.eclipse.xtext.tests/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/pom.xml rename to org.eclipse.xtext.tests/pom.xml diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetupGenerated.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetupGenerated.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetupGenerated.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtextbin similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtextbin rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtextbin diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetupGenerated.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetupGenerated.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetupGenerated.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageAntlrTokenFileProvider.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageAntlrTokenFileProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageAntlrTokenFileProvider.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageAntlrTokenFileProvider.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageParser.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SubTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageAntlrTokenFileProvider.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageAntlrTokenFileProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageAntlrTokenFileProvider.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageAntlrTokenFileProvider.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageParser.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/SuperTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSubTestLanguage.g b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSubTestLanguage.g similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSubTestLanguage.g rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSubTestLanguage.g diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSuperTestLanguage.g b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSuperTestLanguage.g similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSuperTestLanguage.g rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/DebugInternalSuperTestLanguage.g diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.g b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.g similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.g rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.g diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.tokens b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.tokens similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.tokens rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguage.tokens diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageLexer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageLexer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageLexer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageParser.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSubTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.g b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.g similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.g rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.g diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.tokens b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.tokens similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.tokens rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguage.tokens diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageLexer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageLexer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageLexer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageParser.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/parser/antlr/internal/InternalSuperTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SubTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/AnotherSuperMain.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/AnotherSuperMain.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/AnotherSuperMain.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/AnotherSuperMain.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackageFactory.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackageFactory.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackageFactory.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackageFactory.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackagePackage.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackagePackage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackagePackage.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/SubPackagePackage.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/AnotherSuperMainImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/AnotherSuperMainImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/AnotherSuperMainImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/AnotherSuperMainImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageAdapterFactory.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageAdapterFactory.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageAdapterFactory.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageAdapterFactory.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageSwitch.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageSwitch.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageSwitch.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/subPackage/util/SubPackageSwitch.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackageFactory.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackageFactory.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackageFactory.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackageFactory.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackagePackage.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackagePackage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackagePackage.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/SuperPackagePackage.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageAdapterFactory.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageAdapterFactory.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageAdapterFactory.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageAdapterFactory.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageSwitch.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageSwitch.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageSwitch.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/generator/ecore/superPackage/util/SuperPackageSwitch.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtextbin similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtextbin rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtextbin diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetupGenerated.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetupGenerated.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetupGenerated.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguageFactory.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguageFactory.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguageFactory.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguageFactory.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguagePackage.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguagePackage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguagePackage.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/BacktrackingTestLanguagePackage.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageAdapterFactory.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageAdapterFactory.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageAdapterFactory.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageAdapterFactory.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageSwitch.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageSwitch.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageSwitch.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/backtrackingTestLanguage/util/BacktrackingTestLanguageSwitch.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageAntlrTokenFileProvider.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageAntlrTokenFileProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageAntlrTokenFileProvider.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageAntlrTokenFileProvider.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageParser.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/BacktrackingLexerTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/DebugInternalBacktrackingLexerTestLanguage.g b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/DebugInternalBacktrackingLexerTestLanguage.g similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/DebugInternalBacktrackingLexerTestLanguage.g rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/DebugInternalBacktrackingLexerTestLanguage.g diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.g b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.g similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.g rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.g diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.tokens b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.tokens similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.tokens rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/internal/InternalBacktrackingLexerTestLanguageParser.tokens diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.g similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.g rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.g diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.tokens b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.tokens similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.tokens rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalBacktrackingLexerTestLanguageLexer.tokens diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/serializer/BacktrackingLexerTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java rename to org.eclipse.xtext.tests/src-gen2/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java diff --git a/tests/org.eclipse.xtext.tests/src/log4j.properties b/org.eclipse.xtext.tests/src/log4j.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/src/log4j.properties rename to org.eclipse.xtext.tests/src/log4j.properties diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestProjectConfig.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestProjectConfig.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestProjectConfig.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/TestProjectConfig.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/build/IncrementalBuilderTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/build/IncrementalBuilderTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/build/IncrementalBuilderTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/build/IncrementalBuilderTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentFileHeaderProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentFileHeaderProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentFileHeaderProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentFileHeaderProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormattableDocumentTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormattableDocumentTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormattableDocumentTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormattableDocumentTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterSerializerIntegrationTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterSerializerIntegrationTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterSerializerIntegrationTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterSerializerIntegrationTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/FormatterTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenericFormatterTester.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenericFormatterTester.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenericFormatterTester.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenericFormatterTester.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/RegionSetTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/RegionSetTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/RegionSetTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/RegionSetTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessBuilderTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessBuilderTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessBuilderTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessBuilderTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionFinderTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AntlrToolFacadeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AntlrToolFacadeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AntlrToolFacadeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AntlrToolFacadeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/GeneratorTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/LineSeparatorHarminizerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/LineSeparatorHarminizerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/LineSeparatorHarminizerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/LineSeparatorHarminizerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/Test_Manifest.MF b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/Test_Manifest.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/Test_Manifest.MF rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/Test_Manifest.MF diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/TypeReferenceTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/TypeReferenceTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/TypeReferenceTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/TypeReferenceTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/ActionLanguage2Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/ActionLanguage2Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/ActionLanguage2Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/ActionLanguage2Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/EcoreFragmentTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/First.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/First.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/First.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/First.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SuperTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/Bug378261Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/Bug378261Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/Bug378261Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/Bug378261Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderSuperTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderSuperTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderSuperTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderSuperTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTestHelper.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTestHelper.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTestHelper.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTestHelper.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/FirstSetComputationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/FirstSetComputationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/FirstSetComputationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/FirstSetComputationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample.java.txt b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample.java.txt similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample.java.txt rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample.java.txt diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample2.java.txt b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample2.java.txt similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample2.java.txt rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalLexerExample2.java.txt diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalParserExample.java.txt b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalParserExample.java.txt similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalParserExample.java.txt rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/InternalParserExample.java.txt diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/LineMappingNormalizationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/LineMappingNormalizationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/LineMappingNormalizationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/LineMappingNormalizationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceFileNameProviderTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceFileNameProviderTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceFileNameProviderTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceFileNameProviderTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionMergerTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionMergerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionMergerTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionMergerTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionSerializerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionSerializerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionSerializerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionSerializerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionToStringTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionToStringTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionToStringTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/TraceRegionToStringTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version3.trace b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version3.trace similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version3.trace rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version3.trace diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version4.trace b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version4.trace similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version4.trace rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/version4.trace diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageValueConverters.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageValueConverters.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageValueConverters.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageValueConverters.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceGrammarAccessTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceGrammarAccessTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceGrammarAccessTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceGrammarAccessTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2LanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3LanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/AbstractTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/serializer/InheritanceTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexBasedScopeProviderTest.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexBasedScopeProviderTest.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexBasedScopeProviderTest.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexBasedScopeProviderTest.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageGenerator.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageGenerator.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageGenerator.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageGenerator.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageInjectorProvider.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageInjectorProvider.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageInjectorProvider.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageInjectorProvider.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageJavaValidator.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageJavaValidator.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageJavaValidator.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageJavaValidator.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/index/IndexTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/01.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/01.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/01.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/01.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/02.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/02.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/02.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/02.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/03.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/03.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/03.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/03.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/04.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/04.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/04.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/04.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/05.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/05.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/05.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/05.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug289059TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902RuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902RuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902RuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902RuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902StandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902StandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902StandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902StandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug437669Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug437669Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug437669Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug437669Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/FlatResourceSetBasedAllContainersStatePerformanceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/FlatResourceSetBasedAllContainersStatePerformanceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/FlatResourceSetBasedAllContainersStatePerformanceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/FlatResourceSetBasedAllContainersStatePerformanceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/ImportUriTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LangATestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/converter/Bug362902ValueConverters.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/converter/Bug362902ValueConverters.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/converter/Bug362902ValueConverters.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/converter/Bug362902ValueConverters.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinking.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinking.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinking.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinking.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseImportsTestLanguageScopeProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseImportsTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseImportsTestLanguageScopeProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseImportsTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseNamespacesTestLanguageScopeProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseNamespacesTestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseNamespacesTestLanguageScopeProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/IgnoreCaseNamespacesTestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/LangATestLanguageScopeProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/LangATestLanguageScopeProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/LangATestLanguageScopeProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/LangATestLanguageScopeProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/serializer/AbstractIgnoreCaseLinkingTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerNsURI.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerNsURI.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerNsURI.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerNsURI.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformPlugin.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformPlugin.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformPlugin.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformPlugin.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformResource.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformResource.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformResource.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformResource.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/Terminals.xtexterror b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/Terminals.xtexterror similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/Terminals.xtexterror rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/Terminals.xtexterror diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.xtexterror b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.xtexterror similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.xtexterror rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.xtexterror diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestLoadingResourceWithError.xtexterror b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestLoadingResourceWithError.xtexterror similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestLoadingResourceWithError.xtexterror rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestLoadingResourceWithError.xtexterror diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestResourceWithError.xtexterror b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestResourceWithError.xtexterror similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestResourceWithError.xtexterror rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTestResourceWithError.xtexterror diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/emptyFolder/.dummy b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/emptyFolder/.dummy similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/emptyFolder/.dummy rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/emptyFolder/.dummy diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile1.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile1.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile1.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile1.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile2.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile2.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile2.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/OtherFile2.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/Start.importuritestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/Start.importuritestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/Start.importuritestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/importUriSubfolder/Start.importuritestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/File1.indextestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/File1.indextestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/File1.indextestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/File1.indextestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/sub folder/File1.indextestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/sub folder/File1.indextestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/sub folder/File1.indextestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyFolder/sub folder/File1.indextestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyJar.jar b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyJar.jar similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyJar.jar rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/nonemptyJar.jar diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 1/File.indextestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 1/File.indextestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 1/File.indextestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 1/File.indextestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 2/File.indextestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 2/File.indextestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 2/File.indextestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 2/File.indextestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 3/File.indextestlanguage b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 3/File.indextestlanguage similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 3/File.indextestlanguage rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/shadowingtest/folder 3/File.indextestlanguage diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/Bug407280Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/Bug407280Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/Bug407280Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/Bug407280Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNode.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNode.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNode.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNode.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeWithSemanticElement.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeWithSemanticElement.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeWithSemanticElement.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeWithSemanticElement.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNode.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNode.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNode.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNode.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNode.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNode.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNode.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNode.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtilTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtilTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtilTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtilTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/LineAndColumnTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/LineAndColumnTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/LineAndColumnTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/LineAndColumnTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserCrossContainmentTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserCrossContainmentTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserCrossContainmentTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserCrossContainmentTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserReplaceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserReplaceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserReplaceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserReplaceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParsingPointerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParsingPointerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParsingPointerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AbstractPartialParsingPointerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AntlrDatatypeRuleTokenTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AntlrDatatypeRuleTokenTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AntlrDatatypeRuleTokenTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/AntlrDatatypeRuleTokenTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/Bug410560Test.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/Bug410560Test.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/Bug410560Test.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/Bug410560Test.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/CrossContainmentTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/CrossContainmentTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/CrossContainmentTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/CrossContainmentTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/DefaultEcoreElementFactoryTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/DefaultEcoreElementFactoryTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/DefaultEcoreElementFactoryTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/DefaultEcoreElementFactoryTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/OffsetInformationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/OffsetInformationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/OffsetInformationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/OffsetInformationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/ParserTestHelper.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/ParserTestHelper.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/ParserTestHelper.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/ParserTestHelper.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentMultiTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentMultiTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentMultiTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentMultiTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentSingleTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentSingleTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentSingleTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserCrossContainmentSingleTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceExpressionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceExpressionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceExpressionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceExpressionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceLookaheadTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceLookaheadTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceLookaheadTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserReplaceLookaheadTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug378967TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug443221TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429RuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429RuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429RuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429RuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429StandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429StandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429StandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429StandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/bug419429/Bug419429Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageValueConverters.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageValueConverters.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageValueConverters.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageValueConverters.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/01.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/01.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/01.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/01.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/02.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/02.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/02.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/02.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/03.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/03.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/03.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/03.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/04.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/04.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/04.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/04.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/05.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/05.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/05.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/05.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/06.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/06.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/06.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/06.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/07.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/07.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/07.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/07.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/08.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/08.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/08.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/08.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/09.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/09.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/09.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/09.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/10.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/10.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/10.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/10.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/11.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/11.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/11.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/11.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/12.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/12.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/12.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/12.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/13.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/13.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/13.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/13.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/14.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/14.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/14.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/14.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/15.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/15.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/15.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/15.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/16.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/16.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/16.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/16.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/17.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/17.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/17.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/17.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/18.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/18.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/18.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/18.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/19.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/19.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/19.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/19.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/20.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/20.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/20.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/20.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/21.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/21.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/21.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/21.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/22.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/22.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/22.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/22.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/23.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/23.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/23.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/23.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/24.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/24.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/24.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/24.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/25.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/25.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/25.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/25.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/26.epatch b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/26.epatch similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/26.epatch rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/epatch/testcases/26.epatch diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsPlainParsingTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsPlainParsingTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsPlainParsingTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsPlainParsingTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/AbstractFragmentsTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageExStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingInjectorProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingInjectorProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingInjectorProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingInjectorProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsExTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsExTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsExTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsExTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/PlainParsingTests.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/PlainParsingTests.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/PlainParsingTests.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/PlainParsingTests.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareLanguageTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareLanguageTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareLanguageTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareLanguageTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingErrorTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingErrorTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingErrorTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingErrorTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwarePartialParsingTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/parser/antlr/IndentationAwareTestLanguageTokenSource.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/parser/antlr/IndentationAwareTestLanguageTokenSource.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/parser/antlr/IndentationAwareTestLanguageTokenSource.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/parser/antlr/IndentationAwareTestLanguageTokenSource.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/serializer/IndentationAwareTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/AbstractParametersParsingTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/AbstractParametersParsingTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/AbstractParametersParsingTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/AbstractParametersParsingTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersParsingTests.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersParsingTests.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersParsingTests.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersParsingTests.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageExStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRuleTestLanguageConverters.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRuleTestLanguageConverters.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRuleTestLanguageConverters.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRuleTestLanguageConverters.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExBacktrackingBug325745TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ExUnorderedGroupsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleBacktrackingBug325745TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SimpleUnorderedGroupsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/serializer/BacktrackingBug325745TestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestConfig.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestConfig.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestConfig.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestConfig.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLineSeparatorInformation.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLineSeparatorInformation.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLineSeparatorInformation.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLineSeparatorInformation.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestValueConverters.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestValueConverters.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestValueConverters.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestValueConverters.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterWindowsLinebreakTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterWindowsLinebreakTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterWindowsLinebreakTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterWindowsLinebreakTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateElementMatcherTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateElementMatcherTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateElementMatcherTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateElementMatcherTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterMessy.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterMessy.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterMessy.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterMessy.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397RuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397RuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397RuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397RuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397StandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397StandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397StandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397StandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CrossContainment.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/NewSerializerCommentAssociationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/NewSerializerCommentAssociationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/NewSerializerCommentAssociationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/NewSerializerCommentAssociationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerPTC.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerPTC.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerPTC.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerPTC.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerSerializer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerSerializer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerSerializer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientHandlerSerializer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestSerializer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestSerializer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestSerializer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestSerializer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/serializer/UnassignedTextTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/preferences/PreferencesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/preferences/PreferencesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/preferences/PreferencesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/preferences/PreferencesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/leafNodeBug_234132.tst b/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/leafNodeBug_234132.tst similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/leafNodeBug_234132.tst rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/leafNodeBug_234132.tst diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636RuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636RuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636RuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636RuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636StandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636StandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636StandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636StandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug385636TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug451668Test.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug451668Test.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug451668Test.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug451668Test.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageInjectorProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageInjectorProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageInjectorProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageInjectorProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageInjectorProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageInjectorProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LiveContainerTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationProviderTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProvideRegistryTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProvideRegistryTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProvideRegistryTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProvideRegistryTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProviderProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProviderProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProviderProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceServiceProviderProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceSetTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceSetTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceSetTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceSetTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/AbstractLiveContainerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/AbstractLiveContainerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/AbstractLiveContainerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/AbstractLiveContainerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerBuilderIntegerationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerBuilderIntegerationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerBuilderIntegerationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerBuilderIntegerationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/LiveContainerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/iso-8859-1.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/iso-8859-1.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/iso-8859-1.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/iso-8859-1.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf16.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf16.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf16.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf16.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf8.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf8.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf8.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/utf8.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/mydsl.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/mydsl.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/mydsl.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/mydsl.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/PortableURIsTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/PortableURIsTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/PortableURIsTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/PortableURIsTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescriptionTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescriptionTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescriptionTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescriptionTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/some folder/pack/ClassLoaderClasspathUriResolverTest.txt b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/some folder/pack/ClassLoaderClasspathUriResolverTest.txt similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/some folder/pack/ClassLoaderClasspathUriResolverTest.txt rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/some folder/pack/ClassLoaderClasspathUriResolverTest.txt diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/SrcSegmentsInUrisAreNotRemovedTests.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/SrcSegmentsInUrisAreNotRemovedTests.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/SrcSegmentsInUrisAreNotRemovedTests.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/SrcSegmentsInUrisAreNotRemovedTests.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTestInjectorProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTestInjectorProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTestInjectorProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/URIHandlerTestInjectorProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/XtextPlatformResourceURIHandlerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/XtextPlatformResourceURIHandlerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/XtextPlatformResourceURIHandlerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/uriHell/XtextPlatformResourceURIHandlerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MultimapBasedScopeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MultimapBasedScopeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MultimapBasedScopeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MultimapBasedScopeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest-results.txt b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest-results.txt similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest-results.txt rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest-results.txt diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleScopeTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleScopeTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleScopeTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleScopeTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SyntheticModelAwareURIConverter.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SyntheticModelAwareURIConverter.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SyntheticModelAwareURIConverter.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SyntheticModelAwareURIConverter.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/BacktrackingSemanticSequencerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/BacktrackingSemanticSequencerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/BacktrackingSemanticSequencerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/BacktrackingSemanticSequencerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarPDAProviderTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarPDAProviderTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarPDAProviderTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarPDAProviderTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageInjectorProvider.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageInjectorProvider.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageInjectorProvider.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SequencerTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializationAfterModelChangeTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializationAfterModelChangeTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializationAfterModelChangeTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializationAfterModelChangeTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializerPerformanceTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializerPerformanceTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializerPerformanceTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SerializerPerformanceTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSemanticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSemanticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSyntacticSequencer.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/serializer/SyntacticSequencerTestLanguageSyntacticSequencer.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/MyModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/MyModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/MyModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/service/MyModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/ParameterizedTypeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/ParameterizedTypeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/ParameterizedTypeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/service/ParameterizedTypeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskFinderTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskFinderTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskFinderTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskFinderTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskParserTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskParserTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskParserTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/DefaultTaskParserTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/PreferenceTaskTagProviderTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/PreferenceTaskTagProviderTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/PreferenceTaskTagProviderTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/PreferenceTaskTagProviderTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/TaskAssert.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/TaskAssert.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/TaskAssert.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/tasks/TaskAssert.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2RuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2RuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2RuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2RuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2StandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2StandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2StandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage2StandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/CustomizedIndentationAwareTestLanguageParser.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/CustomizedIndentationAwareTestLanguageParser.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/CustomizedIndentationAwareTestLanguageParser.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/CustomizedIndentationAwareTestLanguageParser.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentTokenSource.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentTokenSource.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentTokenSource.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentTokenSource.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/TestErrorAcceptor.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/TestErrorAcceptor.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/TestErrorAcceptor.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/TestErrorAcceptor.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/OnChangeEvictingCacheAdapterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/OnChangeEvictingCacheAdapterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/OnChangeEvictingCacheAdapterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/OnChangeEvictingCacheAdapterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/PolymorphicDispatcherTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/PolymorphicDispatcherTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/PolymorphicDispatcherTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/PolymorphicDispatcherTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesLinuxAndMacTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesLinuxAndMacTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesLinuxAndMacTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesLinuxAndMacTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesWindowsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesWindowsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesWindowsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsCountLinesWindowsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsDiffTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsDiffTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsDiffTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsDiffTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/StringsTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionWithLineInformationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionWithLineInformationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionWithLineInformationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionWithLineInformationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/UriUtilTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/UriUtilTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/UriUtilTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/UriUtilTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/XtextVersionTests.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/XtextVersionTests.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/XtextVersionTests.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/XtextVersionTests.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeEValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeEValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeEValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeEValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageChecks.chk b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageChecks.chk similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageChecks.chk rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageChecks.chk diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageExpensiveChecks.chk b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageExpensiveChecks.chk similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageExpensiveChecks.chk rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageExpensiveChecks.chk diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageFastChecks.chk b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageFastChecks.chk similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageFastChecks.chk rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/XtextGrammarTestLanguageFastChecks.chk diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313RuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313RuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313RuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313RuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313StandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313StandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313StandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313StandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTerminalConverters.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTerminalConverters.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTerminalConverters.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTerminalConverters.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextRuleInspectorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextRuleInspectorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextRuleInspectorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextRuleInspectorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug287082Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug287082Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug287082Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug287082Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug456789Test.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug456789Test.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug456789Test.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug456789Test.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Foo.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Foo.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Foo.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Foo.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PredicatedElementTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PredicatedElementTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PredicatedElementTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PredicatedElementTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidatorTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidatorTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidatorTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidatorTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/SuperCallScopeTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/SuperCallScopeTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/SuperCallScopeTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/SuperCallScopeTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/URIsInEcoreFilesTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/URIsInEcoreFilesTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/URIsInEcoreFilesTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/URIsInEcoreFilesTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug285140TestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug285140TestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug285140TestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug285140TestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_01.xtext.txt b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_01.xtext.txt similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_01.xtext.txt rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_01.xtext.txt diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_02.xtext.txt b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_02.xtext.txt similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_02.xtext.txt rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug413171_02.xtext.txt diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/DataTypeRuleWithEnumResultTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/DataTypeRuleWithEnumResultTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/DataTypeRuleWithEnumResultTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/DataTypeRuleWithEnumResultTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Test.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Test.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Test.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Test.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageRuntimeModule.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageRuntimeModule.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageRuntimeModule.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetup.java similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetup.java rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetup.java diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/test.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/test.ecore similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/test.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/test.ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/AntlrGeneratorFragmentTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/AntlrGeneratorFragmentTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/AntlrGeneratorFragmentTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/AntlrGeneratorFragmentTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/EMFGeneratorFragment2Test.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/EMFGeneratorFragment2Test.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/EMFGeneratorFragment2Test.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/EMFGeneratorFragment2Test.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarAccessExtensionsTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarAccessExtensionsTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarAccessExtensionsTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarAccessExtensionsTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/WizardConfigTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/WizardConfigTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/WizardConfigTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/WizardConfigTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.xtend diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.xtend similarity index 100% rename from tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.xtend rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.xtend diff --git a/tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/ParserFeaturesSuite.java b/org.eclipse.xtext.tests/suites/org/eclipse/xtext/ParserFeaturesSuite.java similarity index 100% rename from tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/ParserFeaturesSuite.java rename to org.eclipse.xtext.tests/suites/org/eclipse/xtext/ParserFeaturesSuite.java diff --git a/tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/grammarinheritance/SuperCallSuite.java b/org.eclipse.xtext.tests/suites/org/eclipse/xtext/grammarinheritance/SuperCallSuite.java similarity index 100% rename from tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/grammarinheritance/SuperCallSuite.java rename to org.eclipse.xtext.tests/suites/org/eclipse/xtext/grammarinheritance/SuperCallSuite.java diff --git a/tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/fragments/FragmentsSuite.java b/org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/fragments/FragmentsSuite.java similarity index 100% rename from tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/fragments/FragmentsSuite.java rename to org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/fragments/FragmentsSuite.java diff --git a/tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/parameters/ParametersSuite.java b/org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/parameters/ParametersSuite.java similarity index 100% rename from tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/parameters/ParametersSuite.java rename to org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/parameters/ParametersSuite.java diff --git a/tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/resource/uriHell/URIHandlerSuite.java b/org.eclipse.xtext.tests/suites/org/eclipse/xtext/resource/uriHell/URIHandlerSuite.java similarity index 100% rename from tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/resource/uriHell/URIHandlerSuite.java rename to org.eclipse.xtext.tests/suites/org/eclipse/xtext/resource/uriHell/URIHandlerSuite.java diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ide/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/MyDsl.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/MyDsl.xtext diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/feature.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/feature.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/feature.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/feature.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ide/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/MyDsl.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/src/org/xtext/example/mydsl/MyDsl.xtext diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/maven-deployment.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/maven-deployment.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/maven-deployment.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/maven-deployment.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle diff --git a/plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.jar diff --git a/plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.properties diff --git a/plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew old mode 100644 new mode 100755 similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew diff --git a/plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew.bat similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew.bat diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/feature.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/feature.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/feature.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/feature.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ide/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.idea/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.idea/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.idea/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.idea/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/MyDsl.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/MyDsl.xtext diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/settings.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/settings.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/settings.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/settings.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/maven-deployment.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/maven-deployment.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/maven-deployment.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/maven-deployment.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.jar rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/wrapper/gradle-wrapper.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew.bat b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew.bat similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradlew.bat rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew.bat diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.ide/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.ide/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.ide/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.ide/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.idea/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.idea/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.idea/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.idea/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/MyDsl.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/src/main/java/org/xtext/example/mydsl/MyDsl.xtext diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/settings.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/settings.gradle similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/settings.gradle rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/settings.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ide/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/MyDsl.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/MyDsl.xtext diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/feature.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/feature.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/feature.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/feature.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ide/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/META-INF/MANIFEST.MF similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/build.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/build.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/MyDsl.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/src/org/xtext/example/mydsl/MyDsl.xtext diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.ide/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.ide/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.ide/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/jar-with-ecore-model.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/jar-with-ecore-model.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/jar-with-ecore-model.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/jar-with-ecore-model.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/GenerateMyDsl.mwe2 diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/MyDsl.xtext similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/src/main/java/org/xtext/example/mydsl/MyDsl.xtext diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml diff --git a/tests/org.eclipse.xtext.tests/xtext.tests (xtend).launch b/org.eclipse.xtext.tests/xtext.tests (xtend).launch similarity index 100% rename from tests/org.eclipse.xtext.tests/xtext.tests (xtend).launch rename to org.eclipse.xtext.tests/xtext.tests (xtend).launch diff --git a/tests/org.eclipse.xtext.tests/xtext.tests.launch b/org.eclipse.xtext.tests/xtext.tests.launch similarity index 100% rename from tests/org.eclipse.xtext.tests/xtext.tests.launch rename to org.eclipse.xtext.tests/xtext.tests.launch diff --git a/tests/org.eclipse.xtext.junit4.tests/.gitignore b/org.eclipse.xtext.util/.gitignore similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/.gitignore rename to org.eclipse.xtext.util/.gitignore diff --git a/plugins/org.eclipse.xtext.util/.settings/.api_filters b/org.eclipse.xtext.util/.settings/.api_filters similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/.api_filters rename to org.eclipse.xtext.util/.settings/.api_filters diff --git a/tests/org.eclipse.xtext.testlanguages/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.util/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.util/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.core.runtime.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.launching.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.jdt.launching.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.pde.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.xtend.core.Xtend.prefs similarity index 100% rename from plugins/org.eclipse.xtext.util/.settings/org.eclipse.xtend.core.Xtend.prefs rename to org.eclipse.xtext.util/.settings/org.eclipse.xtend.core.Xtend.prefs diff --git a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF similarity index 100% rename from plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF rename to org.eclipse.xtext.util/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.ide.tests/about.html b/org.eclipse.xtext.util/about.html similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/about.html rename to org.eclipse.xtext.util/about.html diff --git a/plugins/org.eclipse.xtext.util/build.gradle b/org.eclipse.xtext.util/build.gradle similarity index 100% rename from plugins/org.eclipse.xtext.util/build.gradle rename to org.eclipse.xtext.util/build.gradle diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/AbstractLinkedStack.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/AbstractLinkedStack.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/AbstractLinkedStack.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/AbstractLinkedStack.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Arrays.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Arrays.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Arrays.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Arrays.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/CancelIndicator.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/CancelIndicator.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/CancelIndicator.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/CancelIndicator.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/CollectionBasedAcceptor.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/CollectionBasedAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/CollectionBasedAcceptor.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/CollectionBasedAcceptor.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/DiffUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/DiffUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/DiffUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/DiffUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EcoreGenericsUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EcoreGenericsUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EcoreGenericsUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/EcoreGenericsUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfFormatter.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfFormatter.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfFormatter.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfStructureComparator.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfStructureComparator.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfStructureComparator.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/EmfStructureComparator.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ExceptionAcceptor.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ExceptionAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ExceptionAcceptor.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/ExceptionAcceptor.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/GraphvizDotBuilder.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/GraphvizDotBuilder.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/GraphvizDotBuilder.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/GraphvizDotBuilder.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IAcceptor.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IAcceptor.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/IAcceptor.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IResourceScopeCache.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IResourceScopeCache.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IResourceScopeCache.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/IResourceScopeCache.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegion.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegion.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegion.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegionWithLineInformation.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegionWithLineInformation.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegionWithLineInformation.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/ITextRegionWithLineInformation.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LazyStringInputStream.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LazyStringInputStream.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LazyStringInputStream.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/LazyStringInputStream.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineAndColumn.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineAndColumn.xtend similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineAndColumn.xtend rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineAndColumn.xtend diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineFilterOutputStream.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineFilterOutputStream.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineFilterOutputStream.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/LineFilterOutputStream.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LinkedStack.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LinkedStack.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/LinkedStack.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/LinkedStack.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Modules2.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Modules2.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Modules2.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Modules2.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Notifications.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Notifications.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Notifications.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Notifications.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/OnChangeEvictingCache.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/OnChangeEvictingCache.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/OnChangeEvictingCache.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/OnChangeEvictingCache.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Pair.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Pair.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Pair.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Pair.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReflectionUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReflectionUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReflectionUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReflectionUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReplaceRegion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReplaceRegion.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReplaceRegion.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/ReplaceRegion.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/RuntimeIOException.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/RuntimeIOException.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/RuntimeIOException.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/RuntimeIOException.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleAttributeResolver.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleAttributeResolver.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleAttributeResolver.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleAttributeResolver.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/StopWatch.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/StopWatch.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/StopWatch.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/StopWatch.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/StringInputStream.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/StringInputStream.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/StringInputStream.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/StringInputStream.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TailWriter.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TailWriter.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TailWriter.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/TailWriter.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegion.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegion.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegion.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegionWithLineInformation.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegionWithLineInformation.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegionWithLineInformation.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/TextRegionWithLineInformation.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Triple.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Triple.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Triple.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Triple.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Tuples.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Tuples.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Tuples.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Tuples.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/UriUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/UriUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/UriUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/UriUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Wrapper.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Wrapper.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Wrapper.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/Wrapper.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/AbstractReadWriteAcces.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/AbstractReadWriteAcces.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/AbstractReadWriteAcces.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/AbstractReadWriteAcces.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/CancelableUnitOfWork.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/CancelableUnitOfWork.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/CancelableUnitOfWork.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/CancelableUnitOfWork.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IReadAccess.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IReadAccess.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IReadAccess.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IReadAccess.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IUnitOfWork.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IUnitOfWork.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IUnitOfWork.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IUnitOfWork.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IWriteAccess.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IWriteAccess.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IWriteAccess.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/concurrent/IWriteAccess.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Cfg.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Cfg.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Cfg.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Cfg.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgFactory.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgFactory.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgFactory.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgFactory.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/CfgUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/DirectedGraph.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/DirectedGraph.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/DirectedGraph.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/DirectedGraph.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunction.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunction.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunction.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunction.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Nfa.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Nfa.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Nfa.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Nfa.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaFactory.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaFactory.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaFactory.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaFactory.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToDot.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToDot.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToDot.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToDot.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToProduction.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToProduction.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToProduction.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaToProduction.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Pda.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Pda.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Pda.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Pda.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaFactory.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaFactory.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaFactory.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaFactory.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaListFormatter.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaListFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaListFormatter.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaListFormatter.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaToDot.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaToDot.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaToDot.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaToDot.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Production.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Production.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Production.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Production.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFactory.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFactory.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFactory.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFactory.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFormatter.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFormatter.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionFormatter.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringNfa.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringNfa.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringNfa.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringNfa.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringPda.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringPda.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringPda.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringPda.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Traverser.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Traverser.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Traverser.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/Traverser.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/AlternateJdkLoader.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/AlternateJdkLoader.xtend similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/AlternateJdkLoader.xtend rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/AlternateJdkLoader.xtend diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/CodeGenUtil2.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/CodeGenUtil2.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/CodeGenUtil2.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/CodeGenUtil2.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/EmfAdaptable.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/EmfAdaptable.xtend similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/EmfAdaptable.xtend rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/EmfAdaptable.xtend diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Log.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Log.xtend similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Log.xtend rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Log.xtend diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Stopwatches.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Stopwatches.java similarity index 100% rename from plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Stopwatches.java rename to org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/Stopwatches.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.xtext.generator/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.xtext.generator/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.resources.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.core.runtime.prefs diff --git a/tests/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.launching.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.launching.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.pde.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.xtend.core.Xtend.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.xtend.core.Xtend.prefs rename to org.eclipse.xtext.xtext.generator/.settings/org.eclipse.xtend.core.Xtend.prefs diff --git a/plugins/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF rename to org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF diff --git a/tests/org.eclipse.xtext.testlanguages/about.html b/org.eclipse.xtext.xtext.generator/about.html similarity index 100% rename from tests/org.eclipse.xtext.testlanguages/about.html rename to org.eclipse.xtext.xtext.generator/about.html diff --git a/plugins/org.eclipse.xtext.xtext.generator/build.gradle b/org.eclipse.xtext.xtext.generator/build.gradle similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/build.gradle rename to org.eclipse.xtext.xtext.generator/build.gradle diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractExternalFolderAwareFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractExternalFolderAwareFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractExternalFolderAwareFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractExternalFolderAwareFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractInheritingFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractInheritingFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractInheritingFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractInheritingFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractStubGeneratingFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractStubGeneratingFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractStubGeneratingFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractStubGeneratingFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractXtextGeneratorFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractXtextGeneratorFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractXtextGeneratorFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/AbstractXtextGeneratorFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CodeConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CodeConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CodeConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CodeConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorException.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorException.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorException.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorException.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/DefaultGeneratorModule.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/DefaultGeneratorModule.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/DefaultGeneratorModule.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/DefaultGeneratorModule.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ImplicitFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ImplicitFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ImplicitFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ImplicitFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/Issues.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/Issues.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/Issues.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/Issues.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/MweIssues.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/MweIssues.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/MweIssues.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/MweIssues.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/StandardLanguage.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/StandardLanguage.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/StandardLanguage.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/StandardLanguage.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextDirectoryCleaner.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextDirectoryCleaner.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextDirectoryCleaner.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextDirectoryCleaner.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorNaming.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorNaming.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorNaming.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorNaming.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorStandaloneSetup.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorStandaloneSetup.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorStandaloneSetup.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorStandaloneSetup.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/builder/BuilderIntegrationFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/builder/BuilderIntegrationFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/builder/BuilderIntegrationFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/builder/BuilderIntegrationFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore2xtext/Ecore2XtextValueConverterServiceFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore2xtext/Ecore2XtextValueConverterServiceFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore2xtext/Ecore2XtextValueConverterServiceFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore2xtext/Ecore2XtextValueConverterServiceFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/QualifiedNamesFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/QualifiedNamesFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/QualifiedNamesFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/QualifiedNamesFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/SimpleNamesFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/SimpleNamesFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/SimpleNamesFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/exporting/SimpleNamesFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/generator/GeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/generator/GeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/generator/GeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/generator/GeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/FragmentFakingEcoreResource.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/FragmentFakingEcoreResource.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/FragmentFakingEcoreResource.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/FragmentFakingEcoreResource.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginClassNames.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginClassNames.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginClassNames.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginClassNames.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginExtension.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginExtension.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginExtension.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginExtension.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiAntlrGrammarGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiAntlrGrammarGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiAntlrGrammarGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiAntlrGrammarGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiGrammarNaming.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiGrammarNaming.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiGrammarNaming.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/PsiGrammarNaming.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/XtextAntlrIDEAGeneratorFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/XtextAntlrIDEAGeneratorFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/XtextAntlrIDEAGeneratorFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/parser/antlr/XtextAntlrIDEAGeneratorFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/FileAccessFactory.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/FileAccessFactory.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/FileAccessFactory.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/FileAccessFactory.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GeneratedJavaFileAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GeneratedJavaFileAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GeneratedJavaFileAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GeneratedJavaFileAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GuiceModuleAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GuiceModuleAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GuiceModuleAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/GuiceModuleAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/JavaFileAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/JavaFileAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/JavaFileAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/JavaFileAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/PluginXmlAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/PluginXmlAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/PluginXmlAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/PluginXmlAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/StandaloneSetupAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/StandaloneSetupAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/StandaloneSetupAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/StandaloneSetupAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TextFileAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TextFileAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TextFileAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TextFileAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtendFileAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtendFileAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtendFileAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtendFileAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtextGeneratorFileSystemAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtextGeneratorFileSystemAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtextGeneratorFileSystemAccess.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/XtextGeneratorFileSystemAccess.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/GeneratedClassAnnotation.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/GeneratedClassAnnotation.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/GeneratedClassAnnotation.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/GeneratedClassAnnotation.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SingletonClassAnnotation.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SingletonClassAnnotation.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SingletonClassAnnotation.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SingletonClassAnnotation.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SuppressWarningsAnnotation.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SuppressWarningsAnnotation.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SuppressWarningsAnnotation.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/annotations/SuppressWarningsAnnotation.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/BundleProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/BundleProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/BundleProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/BundleProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/StandardProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/StandardProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/StandardProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/StandardProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/WebProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/WebProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/WebProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/WebProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/XtextProjectConfig.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/XtextProjectConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/XtextProjectConfig.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/XtextProjectConfig.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarWithActionsGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrDebugGrammarGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrDebugGrammarGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrDebugGrammarGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrDebugGrammarGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammar.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammar.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammar.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammar.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrToolFacade.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrToolFacade.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrToolFacade.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrToolFacade.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CombinedGrammarMarker.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CombinedGrammarMarker.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CombinedGrammarMarker.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CombinedGrammarMarker.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/ContentAssistGrammarNaming.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/ContentAssistGrammarNaming.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/ContentAssistGrammarNaming.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/ContentAssistGrammarNaming.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarNaming.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarNaming.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarNaming.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarNaming.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarToken.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarToken.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarToken.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/DebugGrammarToken.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/FirstSetComputer.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/FirstSetComputer.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/FirstSetComputer.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/FirstSetComputer.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/IgnoreCaseString.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/IgnoreCaseString.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/IgnoreCaseString.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/IgnoreCaseString.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/KeywordHelper.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/KeywordHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/KeywordHelper.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/KeywordHelper.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/MutableTokenDefProvider.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/MutableTokenDefProvider.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/MutableTokenDefProvider.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/MutableTokenDefProvider.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/TerminalRuleToLexerBody.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/TerminalRuleToLexerBody.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/TerminalRuleToLexerBody.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/TerminalRuleToLexerBody.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/postProcessing/SuppressWarningsProcessor.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/postProcessing/SuppressWarningsProcessor.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/postProcessing/SuppressWarningsProcessor.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/postProcessing/SuppressWarningsProcessor.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrLexerSplitter.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrLexerSplitter.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrLexerSplitter.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrLexerSplitter.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrParserSplitter.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrParserSplitter.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrParserSplitter.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrParserSplitter.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardForUnorderedGroupsRemover.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardForUnorderedGroupsRemover.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardForUnorderedGroupsRemover.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardForUnorderedGroupsRemover.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardRemover.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardRemover.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardRemover.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/BacktrackingGuardRemover.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/ConditionSimplifier.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/ConditionSimplifier.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/ConditionSimplifier.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/ConditionSimplifier.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/PartialClassExtractor.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/PartialClassExtractor.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/PartialClassExtractor.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/PartialClassExtractor.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.xtext b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.xtext similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.xtext rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.xtext diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsRuntimeModule.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsRuntimeModule.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsRuntimeModule.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsRuntimeModule.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsStandaloneSetup.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsStandaloneSetup.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsStandaloneSetup.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressionsStandaloneSetup.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SyntacticPredicateFixup.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SyntacticPredicateFixup.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SyntacticPredicateFixup.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SyntacticPredicateFixup.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/UnorderedGroupsSplitter.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/UnorderedGroupsSplitter.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/UnorderedGroupsSplitter.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/UnorderedGroupsSplitter.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/internal/LexerSpecialStateTransitionSplitter.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/internal/LexerSpecialStateTransitionSplitter.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/internal/LexerSpecialStateTransitionSplitter.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/internal/LexerSpecialStateTransitionSplitter.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/resourceFactory/ResourceFactoryFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/resourceFactory/ResourceFactoryFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/resourceFactory/ResourceFactoryFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/resourceFactory/ResourceFactoryFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/scoping/ImportNamespacesScopingFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/scoping/ImportNamespacesScopingFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/scoping/ImportNamespacesScopingFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/scoping/ImportNamespacesScopingFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/DebugGraphGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/DebugGraphGenerator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/DebugGraphGenerator.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/DebugGraphGenerator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/EqualAmbiguousTransitions.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/EqualAmbiguousTransitions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/EqualAmbiguousTransitions.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/EqualAmbiguousTransitions.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/InjectableRuleNames.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/InjectableRuleNames.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/InjectableRuleNames.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/InjectableRuleNames.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SemanticSequencerExtensions.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SemanticSequencerExtensions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SemanticSequencerExtensions.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SemanticSequencerExtensions.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerExtensions.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerExtensions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerExtensions.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerExtensions.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerPDA2ExtendedDot.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerPDA2ExtendedDot.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerPDA2ExtendedDot.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SyntacticSequencerPDA2ExtendedDot.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/labeling/LabelProviderFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/labeling/LabelProviderFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/labeling/LabelProviderFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/labeling/LabelProviderFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/OutlineTreeProviderFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/OutlineTreeProviderFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/OutlineTreeProviderFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/OutlineTreeProviderFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/projectWizard/SimpleProjectWizardFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/projectWizard/SimpleProjectWizardFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/projectWizard/SimpleProjectWizardFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/projectWizard/SimpleProjectWizardFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/refactoring/RefactorElementNameFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/refactoring/RefactorElementNameFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/refactoring/RefactorElementNameFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/refactoring/RefactorElementNameFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/templates/CodetemplatesGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/templates/CodetemplatesGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/templates/CodetemplatesGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/templates/CodetemplatesGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/BooleanGeneratorOption.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/BooleanGeneratorOption.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/BooleanGeneratorOption.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/BooleanGeneratorOption.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GenModelUtil2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GenModelUtil2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GenModelUtil2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GenModelUtil2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GeneratorOption.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GeneratorOption.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GeneratorOption.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GeneratorOption.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GrammarUtil2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GrammarUtil2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GrammarUtil2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/GrammarUtil2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/SyntheticTerminalDetector.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/SyntheticTerminalDetector.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/SyntheticTerminalDetector.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/util/SyntheticTerminalDetector.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorNaming.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorNaming.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorNaming.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorNaming.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/RegexpExtensions.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/RegexpExtensions.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/RegexpExtensions.java rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/RegexpExtensions.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseUsageDetector.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseUsageDetector.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseUsageDetector.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseUsageDetector.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XtypeGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XtypeGeneratorFragment2.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XtypeGeneratorFragment2.xtend rename to org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XtypeGeneratorFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext.xtext.wizard/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext.xtext.wizard/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs rename to org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs diff --git a/separate-builds/core/org.eclipse.xtext.testing/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from separate-builds/core/org.eclipse.xtext.testing/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.resources.prefs diff --git a/tests/org.eclipse.xtext.junit4.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from tests/org.eclipse.xtext.junit4.tests/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.core.runtime.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.xtend.core.Xtend.prefs similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.xtend.core.Xtend.prefs rename to org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.xtend.core.Xtend.prefs diff --git a/plugins/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF rename to org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.xtext.xtext.wizard/META-INF/eclipse.inf b/org.eclipse.xtext.xtext.wizard/META-INF/eclipse.inf similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/META-INF/eclipse.inf rename to org.eclipse.xtext.xtext.wizard/META-INF/eclipse.inf diff --git a/plugins/org.eclipse.xtext.xtext.wizard/about.html b/org.eclipse.xtext.xtext.wizard/about.html similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/about.html rename to org.eclipse.xtext.xtext.wizard/about.html diff --git a/plugins/org.eclipse.xtext.xtext.wizard/build.gradle b/org.eclipse.xtext.xtext.wizard/build.gradle similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/build.gradle rename to org.eclipse.xtext.xtext.wizard/build.gradle diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.jar rename to org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/wrapper/gradle-wrapper.properties rename to org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew old mode 100755 new mode 100644 similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew rename to org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew.bat b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat similarity index 100% rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradlew.bat rename to org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/AbstractFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/AbstractFile.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/AbstractFile.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/AbstractFile.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BinaryFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BinaryFile.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BinaryFile.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BinaryFile.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BuildSystem.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BuildSystem.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BuildSystem.java rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/BuildSystem.java diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Ecore2XtextConfiguration.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Ecore2XtextConfiguration.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Ecore2XtextConfiguration.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Ecore2XtextConfiguration.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ExternalDependency.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ExternalDependency.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ExternalDependency.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ExternalDependency.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IntellijProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IntellijProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IntellijProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IntellijProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/LanguageDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/LanguageDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/LanguageDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/LanguageDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Outlet.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Outlet.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Outlet.java rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Outlet.java diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/P2RepositoryProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/P2RepositoryProject.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/P2RepositoryProject.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/P2RepositoryProject.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PlainTextFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PlainTextFile.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PlainTextFile.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PlainTextFile.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectLayout.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectLayout.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectLayout.java rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectLayout.java diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectsCreator.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectsCreator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectsCreator.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectsCreator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeTestProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeTestProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeTestProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeTestProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SdkFeatureProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SdkFeatureProject.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SdkFeatureProject.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SdkFeatureProject.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SourceLayout.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SourceLayout.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SourceLayout.java rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/SourceLayout.java diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestedProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestedProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestedProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestedProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TextFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TextFile.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TextFile.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TextFile.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreator.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreator.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextExtensions.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextExtensions.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextExtensions.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextExtensions.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextGrammarCreator.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextGrammarCreator.xtend similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextGrammarCreator.xtend rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/Ecore2XtextGrammarCreator.xtend diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/UniqueNameUtil.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/UniqueNameUtil.java similarity index 100% rename from plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/UniqueNameUtil.java rename to org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ecore2xtext/UniqueNameUtil.java diff --git a/plugins/org.eclipse.xtext/.cvsignore b/org.eclipse.xtext/.cvsignore similarity index 100% rename from plugins/org.eclipse.xtext/.cvsignore rename to org.eclipse.xtext/.cvsignore diff --git a/tests/org.eclipse.xtext.tests/.gitignore b/org.eclipse.xtext/.gitignore similarity index 100% rename from tests/org.eclipse.xtext.tests/.gitignore rename to org.eclipse.xtext/.gitignore diff --git a/plugins/org.eclipse.xtext/.settings/.api_filters b/org.eclipse.xtext/.settings/.api_filters similarity index 100% rename from plugins/org.eclipse.xtext/.settings/.api_filters rename to org.eclipse.xtext/.settings/.api_filters diff --git a/tests/org.eclipse.xtext.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.eclipse.xtext/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs rename to org.eclipse.xtext/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs rename to org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs diff --git a/tests/org.eclipse.xtext.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext/.settings/org.eclipse.core.resources.prefs old mode 100755 new mode 100644 similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.xtext/.settings/org.eclipse.core.resources.prefs diff --git a/tests/org.eclipse.xtext.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.xtext/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from tests/org.eclipse.xtext.tests/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.xtext/.settings/org.eclipse.core.runtime.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.jdt.launching.prefs rename to org.eclipse.xtext/.settings/org.eclipse.jdt.launching.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.xtext/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.m2e.core.prefs rename to org.eclipse.xtext/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.pde.prefs rename to org.eclipse.xtext/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs rename to org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.shared.ui.prefs b/org.eclipse.xtext/.settings/org.eclipse.xtend.shared.ui.prefs similarity index 100% rename from plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.shared.ui.prefs rename to org.eclipse.xtext/.settings/org.eclipse.xtend.shared.ui.prefs diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF similarity index 100% rename from plugins/org.eclipse.xtext/META-INF/MANIFEST.MF rename to org.eclipse.xtext/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext/META-INF/MANIFEST.MF_gen similarity index 100% rename from plugins/org.eclipse.xtext/META-INF/MANIFEST.MF_gen rename to org.eclipse.xtext/META-INF/MANIFEST.MF_gen diff --git a/tests/org.eclipse.xtext.tests/about.html b/org.eclipse.xtext/about.html similarity index 100% rename from tests/org.eclipse.xtext.tests/about.html rename to org.eclipse.xtext/about.html diff --git a/plugins/org.eclipse.xtext/about.ini b/org.eclipse.xtext/about.ini similarity index 100% rename from plugins/org.eclipse.xtext/about.ini rename to org.eclipse.xtext/about.ini diff --git a/plugins/org.eclipse.xtext/about.mappings b/org.eclipse.xtext/about.mappings similarity index 100% rename from plugins/org.eclipse.xtext/about.mappings rename to org.eclipse.xtext/about.mappings diff --git a/plugins/org.eclipse.xtext/about.properties b/org.eclipse.xtext/about.properties similarity index 100% rename from plugins/org.eclipse.xtext/about.properties rename to org.eclipse.xtext/about.properties diff --git a/plugins/org.eclipse.xtext/build.gradle b/org.eclipse.xtext/build.gradle similarity index 100% rename from plugins/org.eclipse.xtext/build.gradle rename to org.eclipse.xtext/build.gradle diff --git a/plugins/org.eclipse.xtext/modeling32.png b/org.eclipse.xtext/modeling32.png similarity index 100% rename from plugins/org.eclipse.xtext/modeling32.png rename to org.eclipse.xtext/modeling32.png diff --git a/plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.ecore b/org.eclipse.xtext/org/eclipse/xtext/Xtext.ecore similarity index 100% rename from plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.ecore rename to org.eclipse.xtext/org/eclipse/xtext/Xtext.ecore diff --git a/plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel b/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel similarity index 100% rename from plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel rename to org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsDelimiters.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsDelimiters.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsDelimiters.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsDelimiters.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsPackratParser.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsPackratParser.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsPackratParser.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsPackratParser.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsParserConfiguration.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsParserConfiguration.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsParserConfiguration.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/TerminalsParserConfiguration.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsANY_OTHERConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsANY_OTHERConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsANY_OTHERConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsANY_OTHERConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsIDConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsIDConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsIDConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsIDConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsINTConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsINTConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsINTConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsINTConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsML_COMMENTConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsML_COMMENTConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsML_COMMENTConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsML_COMMENTConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSL_COMMENTConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSL_COMMENTConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSL_COMMENTConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSL_COMMENTConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSTRINGConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSTRINGConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSTRINGConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsSTRINGConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsWSConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsWSConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsWSConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/common/parser/packrat/consumers/TerminalsWSConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractPackratParser.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractPackratParser.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractPackratParser.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractPackratParser.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractParserConfiguration.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractParserConfiguration.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractParserConfiguration.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/AbstractParserConfiguration.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/CharArrayWriterAsSequence.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/CharArrayWriterAsSequence.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/CharArrayWriterAsSequence.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/CharArrayWriterAsSequence.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IBacktracker.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IBacktracker.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IBacktracker.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IBacktracker.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ICharSequenceWithOffset.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ICharSequenceWithOffset.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ICharSequenceWithOffset.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ICharSequenceWithOffset.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IHiddenTokenHandler.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IHiddenTokenHandler.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IHiddenTokenHandler.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IHiddenTokenHandler.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IMarkerFactory.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IMarkerFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IMarkerFactory.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IMarkerFactory.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IPackratParser.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IPackratParser.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IPackratParser.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IPackratParser.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParseResultFactory.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParseResultFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParseResultFactory.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParseResultFactory.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParsedTokenVisitor.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParsedTokenVisitor.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParsedTokenVisitor.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParsedTokenVisitor.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParserConfiguration.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParserConfiguration.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParserConfiguration.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/IParserConfiguration.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ParseResultFactory.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ParseResultFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ParseResultFactory.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/ParseResultFactory.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractRuleAwareTerminalConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractRuleAwareTerminalConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractRuleAwareTerminalConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/AbstractRuleAwareTerminalConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ConsumeResult.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ConsumeResult.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ConsumeResult.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ConsumeResult.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/EnumLiteralConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/EnumLiteralConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/EnumLiteralConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/EnumLiteralConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IConsumerUtility.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IConsumerUtility.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IConsumerUtility.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IConsumerUtility.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IElementConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IElementConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IElementConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IElementConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumerConfiguration.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumerConfiguration.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumerConfiguration.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/INonTerminalConsumerConfiguration.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IRootConsumerListener.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IRootConsumerListener.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IRootConsumerListener.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/IRootConsumerListener.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumerConfiguration.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumerConfiguration.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumerConfiguration.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/ITerminalConsumerConfiguration.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/KeywordConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/KeywordConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/KeywordConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/KeywordConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/NonTerminalConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/NonTerminalConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/NonTerminalConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/NonTerminalConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/TerminalConsumer.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/TerminalConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/TerminalConsumer.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/consumers/TerminalConsumer.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugBacktracker.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugBacktracker.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugBacktracker.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugBacktracker.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequence.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequence.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequence.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequence.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequenceWithOffset.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequenceWithOffset.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequenceWithOffset.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugCharSequenceWithOffset.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugConsumerUtility.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugConsumerUtility.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugConsumerUtility.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugConsumerUtility.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugHiddenTokenHandler.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugHiddenTokenHandler.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugHiddenTokenHandler.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugHiddenTokenHandler.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugMarkerFactory.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugMarkerFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugMarkerFactory.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugMarkerFactory.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugParsedTokenAcceptor.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugParsedTokenAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugParsedTokenAcceptor.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugParsedTokenAcceptor.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugUtil.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugUtil.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/DebugUtil.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenCounter.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenCounter.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenCounter.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenCounter.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenPrinter.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenPrinter.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenPrinter.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/debug/ParsedTokenPrinter.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Backtracker.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Backtracker.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Backtracker.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Backtracker.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/IFurtherParsable.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/IFurtherParsable.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/IFurtherParsable.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/IFurtherParsable.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Marker.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Marker.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Marker.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/Marker.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/MarkerAwareBacktracker.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/MarkerAwareBacktracker.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/MarkerAwareBacktracker.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/internal/MarkerAwareBacktracker.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterAlternatives.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterAlternatives.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterAlternatives.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterAlternatives.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterArray.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterArray.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterArray.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterArray.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterRange.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterRange.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterRange.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/CharacterRange.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ICharacterClass.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ICharacterClass.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ICharacterClass.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ICharacterClass.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ISequenceMatcher.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ISequenceMatcher.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ISequenceMatcher.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/ISequenceMatcher.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SetBasedKeywordMatcher.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SetBasedKeywordMatcher.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SetBasedKeywordMatcher.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SetBasedKeywordMatcher.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SingleCharacter.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SingleCharacter.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SingleCharacter.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/SingleCharacter.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/StringWithOffset.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/StringWithOffset.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/StringWithOffset.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/matching/StringWithOffset.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedTokenVisitor.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedTokenVisitor.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedTokenVisitor.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AbstractParsedTokenVisitor.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AlternativesToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AlternativesToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AlternativesToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AlternativesToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AssignmentToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AssignmentToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AssignmentToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/AssignmentToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedTokenVisitor.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedTokenVisitor.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedTokenVisitor.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/CompoundParsedTokenVisitor.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ErrorToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ErrorToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ErrorToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ErrorToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/FakedToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/FakedToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/FakedToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/FakedToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/GroupToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/GroupToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/GroupToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/GroupToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenAcceptor.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenAcceptor.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenAcceptor.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenSource.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenSource.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenSource.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/IParsedTokenSource.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedAction.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedAction.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedAction.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedAction.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedEnumLiteral.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedEnumLiteral.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedEnumLiteral.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedEnumLiteral.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminal.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminal.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminal.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminal.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminalEnd.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminalEnd.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminalEnd.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedNonTerminalEnd.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminal.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminal.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminal.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminal.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeature.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeature.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeature.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeature.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeatureInfo.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeatureInfo.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeatureInfo.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedTerminalWithFeatureInfo.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/ParsedToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/PlaceholderToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/PlaceholderToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/PlaceholderToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/PlaceholderToken.java diff --git a/plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/UnorderedGroupToken.java b/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/UnorderedGroupToken.java similarity index 100% rename from plugins/org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/UnorderedGroupToken.java rename to org.eclipse.xtext/packrat/org/eclipse/xtext/parser/packrat/tokens/UnorderedGroupToken.java diff --git a/plugins/org.eclipse.xtext/plugin.xml b/org.eclipse.xtext/plugin.xml similarity index 100% rename from plugins/org.eclipse.xtext/plugin.xml rename to org.eclipse.xtext/plugin.xml diff --git a/plugins/org.eclipse.xtext/schema/content_resourceServiceProvider.exsd b/org.eclipse.xtext/schema/content_resourceServiceProvider.exsd similarity index 100% rename from plugins/org.eclipse.xtext/schema/content_resourceServiceProvider.exsd rename to org.eclipse.xtext/schema/content_resourceServiceProvider.exsd diff --git a/plugins/org.eclipse.xtext/schema/extension_resourceServiceProvider.exsd b/org.eclipse.xtext/schema/extension_resourceServiceProvider.exsd similarity index 100% rename from plugins/org.eclipse.xtext/schema/extension_resourceServiceProvider.exsd rename to org.eclipse.xtext/schema/extension_resourceServiceProvider.exsd diff --git a/plugins/org.eclipse.xtext/schema/protocol_resourceServiceProvider.exsd b/org.eclipse.xtext/schema/protocol_resourceServiceProvider.exsd similarity index 100% rename from plugins/org.eclipse.xtext/schema/protocol_resourceServiceProvider.exsd rename to org.eclipse.xtext/schema/protocol_resourceServiceProvider.exsd diff --git a/plugins/org.eclipse.xtext/src/log4j.properties b/org.eclipse.xtext/src/log4j.properties similarity index 100% rename from plugins/org.eclipse.xtext/src/log4j.properties rename to org.eclipse.xtext/src/log4j.properties diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/Constants.java b/org.eclipse.xtext/src/org/eclipse/xtext/Constants.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/Constants.java rename to org.eclipse.xtext/src/org/eclipse/xtext/Constants.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java b/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtils.ext b/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtils.ext similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtils.ext rename to org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtils.ext diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/Extensions.ext b/org.eclipse.xtext/src/org/eclipse/xtext/Extensions.ext similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/Extensions.ext rename to org.eclipse.xtext/src/org/eclipse/xtext/Extensions.ext diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarToDot.java b/org.eclipse.xtext/src/org/eclipse/xtext/GrammarToDot.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarToDot.java rename to org.eclipse.xtext/src/org/eclipse/xtext/GrammarToDot.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.ext b/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.ext similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.ext rename to org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.ext diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java rename to org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/IGrammarAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/IGrammarAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/IGrammarAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/IGrammarAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/ISetup.java b/org.eclipse.xtext/src/org/eclipse/xtext/ISetup.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/ISetup.java rename to org.eclipse.xtext/src/org/eclipse/xtext/ISetup.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/LanguageInfo.java b/org.eclipse.xtext/src/org/eclipse/xtext/LanguageInfo.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/LanguageInfo.java rename to org.eclipse.xtext/src/org/eclipse/xtext/LanguageInfo.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext b/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext rename to org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextStandaloneSetup.java b/org.eclipse.xtext/src/org/eclipse/xtext/XtextStandaloneSetup.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextStandaloneSetup.java rename to org.eclipse.xtext/src/org/eclipse/xtext/XtextStandaloneSetup.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/BuildContext.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/build/BuildContext.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/BuildContext.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/build/BuildContext.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/BuildRequest.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/build/BuildRequest.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/BuildRequest.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/build/BuildRequest.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/ClusteringStorageAwareResourceLoader.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/build/ClusteringStorageAwareResourceLoader.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/ClusteringStorageAwareResourceLoader.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/build/ClusteringStorageAwareResourceLoader.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IndexState.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/build/IndexState.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IndexState.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/build/IndexState.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/Indexer.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/build/Indexer.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/Indexer.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/build/Indexer.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/Source2GeneratedMapping.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/build/Source2GeneratedMapping.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/Source2GeneratedMapping.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/build/Source2GeneratedMapping.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.java b/org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.java rename to org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.xtext b/org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.xtext similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.xtext rename to org.eclipse.xtext/src/org/eclipse/xtext/common/Terminals.xtext diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsRuntimeModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsRuntimeModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsRuntimeModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsRuntimeModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsStandaloneSetup.java b/org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsStandaloneSetup.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsStandaloneSetup.java rename to org.eclipse.xtext/src/org/eclipse/xtext/common/TerminalsStandaloneSetup.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/services/DefaultTerminalConverters.java b/org.eclipse.xtext/src/org/eclipse/xtext/common/services/DefaultTerminalConverters.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/services/DefaultTerminalConverters.java rename to org.eclipse.xtext/src/org/eclipse/xtext/common/services/DefaultTerminalConverters.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/services/Ecore2XtextTerminalConverters.java b/org.eclipse.xtext/src/org/eclipse/xtext/common/services/Ecore2XtextTerminalConverters.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/common/services/Ecore2XtextTerminalConverters.java rename to org.eclipse.xtext/src/org/eclipse/xtext/common/services/Ecore2XtextTerminalConverters.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverterService.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverterService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverterService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/IValueConverterService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterException.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterWithValueException.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterWithValueException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterWithValueException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/ValueConverterWithValueException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractIDValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractIDValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractIDValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractIDValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractLexerBasedConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractLexerBasedConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractLexerBasedConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractLexerBasedConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractNullSafeConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractNullSafeConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractNullSafeConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractNullSafeConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractToStringConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractToStringConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractToStringConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractToStringConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverterService.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverterService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverterService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractValueConverterService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/DefaultTerminalConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/DefaultTerminalConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/DefaultTerminalConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/DefaultTerminalConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/EFactoryValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/EFactoryValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/EFactoryValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/EFactoryValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IDValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IDValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IDValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IDValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/INTValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/INTValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/INTValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/INTValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IgnoreCaseIDValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IgnoreCaseIDValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IgnoreCaseIDValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/IgnoreCaseIDValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordAlternativeConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordAlternativeConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordAlternativeConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordAlternativeConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordBasedValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordBasedValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordBasedValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/KeywordBasedValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameInStaticImportValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameInStaticImportValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameInStaticImportValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameInStaticImportValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/QualifiedNameValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/STRINGValueConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/STRINGValueConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/STRINGValueConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/STRINGValueConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/debug/IStratumBreakpointSupport.java b/org.eclipse.xtext/src/org/eclipse/xtext/debug/IStratumBreakpointSupport.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/debug/IStratumBreakpointSupport.java rename to org.eclipse.xtext/src/org/eclipse/xtext/debug/IStratumBreakpointSupport.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducer.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducerDecorator.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducerDecorator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducerDecorator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnosticProducerDecorator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Diagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Diagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Diagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Diagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/DiagnosticMessage.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/DiagnosticMessage.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/DiagnosticMessage.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/DiagnosticMessage.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/ExceptionDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/ExceptionDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/ExceptionDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/ExceptionDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticConsumer.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticConsumer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticConsumer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticProducer.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticProducer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticProducer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/IDiagnosticProducer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/NullDiagnosticProducer.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/NullDiagnosticProducer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/NullDiagnosticProducer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/NullDiagnosticProducer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Severity.java b/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Severity.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Severity.java rename to org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/Severity.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProviderExtension.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProviderExtension.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProviderExtension.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/IEObjectDocumentationProviderExtension.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IFileHeaderProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IFileHeaderProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IFileHeaderProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/IFileHeaderProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IJavaDocTypeReferenceProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IJavaDocTypeReferenceProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/IJavaDocTypeReferenceProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/IJavaDocTypeReferenceProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/AbstractMultiLineCommentProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/AbstractMultiLineCommentProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/AbstractMultiLineCommentProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/AbstractMultiLineCommentProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineFileHeaderProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineFileHeaderProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineFileHeaderProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineFileHeaderProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineJavaDocTypeReferenceProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineJavaDocTypeReferenceProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineJavaDocTypeReferenceProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/documentation/impl/MultiLineJavaDocTypeReferenceProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/IReferenceFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/IReferenceFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/IReferenceFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/findReferences/IReferenceFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceAcceptor.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceAcceptor.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceAcceptor.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceAcceptor.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/findReferences/ReferenceFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURICollector.java b/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURICollector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURICollector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURICollector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURISet.java b/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURISet.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURISet.java rename to org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURISet.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURIs.java b/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURIs.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURIs.java rename to org.eclipse.xtext/src/org/eclipse/xtext/findReferences/TargetURIs.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IElementMatcherProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IElementMatcherProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IElementMatcherProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/IElementMatcherProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatterExtension.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatterExtension.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatterExtension.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/IFormatterExtension.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IIndentationInformation.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IIndentationInformation.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IIndentationInformation.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/IIndentationInformation.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/ILineSeparatorInformation.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/ILineSeparatorInformation.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/ILineSeparatorInformation.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/ILineSeparatorInformation.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelStreamer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelStreamer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelStreamer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/INodeModelStreamer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IWhitespaceInformationProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IWhitespaceInformationProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/IWhitespaceInformationProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/IWhitespaceInformationProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractDeclarativeFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractDeclarativeFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractDeclarativeFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractDeclarativeFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormattingConfig.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormattingConfig.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormattingConfig.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractFormattingConfig.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractNodeModelFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractNodeModelFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractNodeModelFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractNodeModelFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractTokenStream.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractTokenStream.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractTokenStream.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/AbstractTokenStream.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseTokenStream.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseTokenStream.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseTokenStream.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/BaseTokenStream.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/DefaultNodeModelFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/DefaultNodeModelFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/DefaultNodeModelFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/DefaultNodeModelFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherToDot.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherToDot.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherToDot.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/ElementMatcherToDot.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig2.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfig2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfigBasedStream.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfigBasedStream.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfigBasedStream.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/FormattingConfigBasedStream.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherNFAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherNFAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherNFAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherNFAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherState.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherTransition.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherTransition.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherTransition.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/MatcherTransition.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NodeModelStreamer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NodeModelStreamer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NodeModelStreamer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NodeModelStreamer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NullFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NullFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NullFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/NullFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/OneWhitespaceFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/OneWhitespaceFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/OneWhitespaceFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting/impl/OneWhitespaceFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/AbstractFormatter2.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/AbstractFormatter2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/AbstractFormatter2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/AbstractFormatter2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ConflictingFormattingException.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ConflictingFormattingException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ConflictingFormattingException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ConflictingFormattingException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceKeys.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceKeys.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceKeys.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceKeys.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceValuesProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceValuesProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceValuesProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferenceValuesProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferences.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferences.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferences.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterPreferences.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterRequest.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterRequest.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterRequest.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormatterRequest.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormattingNotApplicableException.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormattingNotApplicableException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormattingNotApplicableException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/FormattingNotApplicableException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IAutowrapFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IAutowrapFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IAutowrapFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IAutowrapFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableDocument.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableDocument.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableDocument.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableDocument.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableSubDocument.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableSubDocument.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableSubDocument.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormattableSubDocument.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormatter2.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormatter2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormatter2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IFormatter2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatting.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatting.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatting.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IHiddenRegionFormatting.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IMerger.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IMerger.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IMerger.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/IMerger.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ISubFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ISubFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ISubFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ISubFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacerContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacerContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacerContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/ITextReplacerContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/HiddenRegionFormattingToString.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/HiddenRegionFormattingToString.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/HiddenRegionFormattingToString.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/HiddenRegionFormattingToString.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionAccessToString.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionAccessToString.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionAccessToString.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionAccessToString.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionListToString.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionListToString.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionListToString.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionListToString.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsInTextToString.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsInTextToString.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsInTextToString.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsInTextToString.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsToString.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsToString.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsToString.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsToString.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsWithTitleToString.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsWithTitleToString.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsWithTitleToString.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsWithTitleToString.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractHiddenRegionFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractHiddenRegionFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractHiddenRegionFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractHiddenRegionFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractTextReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractTextReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractTextReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/AbstractTextReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ArrayListTextSegmentSet.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ArrayListTextSegmentSet.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ArrayListTextSegmentSet.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ArrayListTextSegmentSet.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/CommentReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/CommentReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/CommentReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/CommentReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConditionalReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConditionalReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConditionalReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConditionalReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConflictingRegionsException.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConflictingRegionsException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConflictingRegionsException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ConflictingRegionsException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/DoubleHiddenRegionFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/DoubleHiddenRegionFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/DoubleHiddenRegionFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/DoubleHiddenRegionFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FilteredSubDocument.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FilteredSubDocument.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FilteredSubDocument.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FilteredSubDocument.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FormattableDocument.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FormattableDocument.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FormattableDocument.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FormattableDocument.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormatting.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormatting.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormatting.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormatting.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormattingMerger.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormattingMerger.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormattingMerger.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionFormattingMerger.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/HiddenRegionReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ICompositeTextReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ICompositeTextReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ICompositeTextReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/ICompositeTextReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MaxLineWidthDocument.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MaxLineWidthDocument.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MaxLineWidthDocument.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MaxLineWidthDocument.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MultilineCommentReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MultilineCommentReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MultilineCommentReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/MultilineCommentReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionComparator.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionComparator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionComparator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionComparator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionTrace.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionTrace.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionTrace.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionTrace.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionsOutsideFrameException.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionsOutsideFrameException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionsOutsideFrameException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RegionsOutsideFrameException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RootDocument.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RootDocument.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RootDocument.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/RootDocument.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SingleHiddenRegionFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SingleHiddenRegionFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SingleHiddenRegionFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SingleHiddenRegionFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCodeCommentReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCodeCommentReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCodeCommentReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCodeCommentReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCommentReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCommentReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCommentReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineCommentReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineDocCommentReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineDocCommentReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineDocCommentReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SinglelineDocCommentReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SubDocument.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SubDocument.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SubDocument.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/SubDocument.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacementList.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacementList.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacementList.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacementList.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerMerger.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerMerger.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerMerger.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextReplacerMerger.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextSegmentSet.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextSegmentSet.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextSegmentSet.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/TextSegmentSet.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/WhitespaceReplacer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/WhitespaceReplacer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/WhitespaceReplacer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/WhitespaceReplacer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/package-info.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/package-info.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/package-info.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/package-info.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IAstRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IAstRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IAstRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IAstRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IComment.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IComment.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IComment.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IComment.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IEObjectRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IEObjectRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IEObjectRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IEObjectRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegionPart.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegionPart.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegionPart.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IHiddenRegionPart.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ILineRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ILineRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ILineRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ILineRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionsFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionsFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionsFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISemanticRegionsFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISequentialRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISequentialRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISequentialRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ISequentialRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionExtensions.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionExtensions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionExtensions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionExtensions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionRewriter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionRewriter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionRewriter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextRegionRewriter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextReplacement.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextReplacement.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextReplacement.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextReplacement.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextSegment.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextSegment.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextSegment.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/ITextSegment.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IWhitespace.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IWhitespace.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IWhitespace.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/IWhitespace.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/TextRegionAccessBuilder.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/TextRegionAccessBuilder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/TextRegionAccessBuilder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/TextRegionAccessBuilder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractEObjectRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractEObjectRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractEObjectRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractEObjectRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractHiddenRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractHiddenRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractHiddenRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractHiddenRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractSemanticRegionsFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractSemanticRegionsFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractSemanticRegionsFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractSemanticRegionsFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractTextSegment.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractTextSegment.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractTextSegment.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractTextSegment.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/LineRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/LineRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/LineRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/LineRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeComment.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeComment.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeComment.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeComment.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeEObjectRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeEObjectRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeEObjectRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeEObjectRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHiddenRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHiddenRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHiddenRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHiddenRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccessBuilder.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccessBuilder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccessBuilder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccessBuilder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeWhitespace.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeWhitespace.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeWhitespace.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeWhitespace.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionInIterableFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionInIterableFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionInIterableFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionInIterableFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionMatcher.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionMatcher.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionMatcher.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionMatcher.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionNullFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionNullFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionNullFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/SemanticRegionNullFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringComment.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringComment.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringComment.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringComment.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHidden.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHidden.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHidden.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHidden.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHiddenRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHiddenRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHiddenRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringHiddenRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringSemanticRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringSemanticRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringSemanticRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringSemanticRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringWhitespace.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringWhitespace.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringWhitespace.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringWhitespace.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionAccessBuildingSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionAccessBuildingSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionAccessBuildingSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionAccessBuildingSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionRewriter.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionRewriter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionRewriter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionRewriter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegions.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextReplacement.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextReplacement.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextReplacement.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextReplacement.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextSegment.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextSegment.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextSegment.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextSegment.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/package-info.java b/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/package-info.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/package-info.java rename to org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/package-info.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess2.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractGenerator.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractGenerator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractGenerator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractGenerator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/FileSystemAccessQueue.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/FileSystemAccessQueue.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/FileSystemAccessQueue.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/FileSystemAccessQueue.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorComponent.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorComponent.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorComponent.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorComponent.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorContext.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorContext.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorContext.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorContext.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorDelegate.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorDelegate.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorDelegate.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/GeneratorDelegate.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider2.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IContextualOutputConfigurationProvider2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessor.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessorExtension.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessorExtension.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessorExtension.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IFilePostProcessorExtension.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess2.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccess2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension2.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension3.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension3.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension3.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IFileSystemAccessExtension3.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator2.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IGenerator2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGeneratorContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGeneratorContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IGeneratorContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IGeneratorContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IOutputConfigurationProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IOutputConfigurationProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IOutputConfigurationProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IOutputConfigurationProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IShouldGenerate.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/IShouldGenerate.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/IShouldGenerate.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/IShouldGenerate.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/LineSeparatorHarmonizer.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/LineSeparatorHarmonizer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/LineSeparatorHarmonizer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/LineSeparatorHarmonizer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfiguration.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfiguration.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfiguration.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfiguration.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationAdapter.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationAdapter.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationAdapter.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationAdapter.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/OutputConfigurationProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/URIBasedFileSystemAccess.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/URIBasedFileSystemAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/URIBasedFileSystemAccess.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/URIBasedFileSystemAccess.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractStatefulTraceRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractStatefulTraceRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractStatefulTraceRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractStatefulTraceRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegionToString.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegionToString.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegionToString.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegionToString.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/CharSequenceTraceWrapper.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/CharSequenceTraceWrapper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/CharSequenceTraceWrapper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/CharSequenceTraceWrapper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/DefaultTraceURIConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/DefaultTraceURIConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/DefaultTraceURIConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/DefaultTraceURIConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationData.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationData.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationData.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationData.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationInResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationInResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationInResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ILocationInResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITrace.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITrace.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITrace.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITrace.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceForURIProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceForURIProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceForURIProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceForURIProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceRegionProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceRegionProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceRegionProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceRegionProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceToBytecodeInstaller.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceToBytecodeInstaller.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceToBytecodeInstaller.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceToBytecodeInstaller.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceURIConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceURIConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceURIConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/ITraceURIConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LeafIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LeafIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LeafIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LeafIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LineMappingProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LineMappingProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LineMappingProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LineMappingProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LocationData.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LocationData.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LocationData.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/LocationData.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TemporaryTraceRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TemporaryTraceRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TemporaryTraceRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TemporaryTraceRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceFileNameProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceFileNameProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceFileNameProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceFileNameProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceNotFoundException.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceNotFoundException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceNotFoundException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceNotFoundException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegion.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegion.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegion.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionMerger.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionMerger.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionMerger.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionMerger.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceRegionSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/URIWrapper.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/URIWrapper.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/URIWrapper.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/URIWrapper.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractLocationInResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractLocationInResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractLocationInResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractLocationInResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTrace.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTrace.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTrace.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTrace.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTraceForURIProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTraceForURIProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTraceForURIProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/AbstractTraceForURIProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificLocation.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificLocation.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificLocation.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificLocation.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTrace.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTrace.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTrace.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTrace.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTraceProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTraceProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTraceProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/IPlatformSpecificTraceProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/LocationInResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/LocationInResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/LocationInResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/LocationInResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/NoTraces.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/NoTraces.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/NoTraces.java rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/internal/NoTraces.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IGrammarNFAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IGrammarNFAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IGrammarNFAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IGrammarNFAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFAState.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFAState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFAState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFAState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFATransition.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFATransition.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFATransition.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/INFATransition.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAState.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/IPDAState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractCachingNFABuilder.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractCachingNFABuilder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractCachingNFABuilder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractCachingNFABuilder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFATransition.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFATransition.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFATransition.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFATransition.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/CfgAdapter.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/CfgAdapter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/CfgAdapter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/CfgAdapter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultBackwardNFAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultBackwardNFAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultBackwardNFAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultBackwardNFAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultForwardNFAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultForwardNFAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultForwardNFAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultForwardNFAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFAState.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFAState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFAState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFAState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFATransition.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFATransition.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFATransition.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/DefaultNFATransition.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/GrammarElementTitleSwitch.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/GrammarElementTitleSwitch.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/GrammarElementTitleSwitch.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/GrammarElementTitleSwitch.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/NFAToDot.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/NFAToDot.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/NFAToDot.java rename to org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/NFAToDot.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractRegistryReader.java b/org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractRegistryReader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractRegistryReader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractRegistryReader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractResourceServiceProviderDescriptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractResourceServiceProviderDescriptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractResourceServiceProviderDescriptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/internal/AbstractResourceServiceProviderDescriptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/Activator.java b/org.eclipse.xtext/src/org/eclipse/xtext/internal/Activator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/Activator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/internal/Activator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ContentResourceServiceProviderRegistryReader.java b/org.eclipse.xtext/src/org/eclipse/xtext/internal/ContentResourceServiceProviderRegistryReader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ContentResourceServiceProviderRegistryReader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/internal/ContentResourceServiceProviderRegistryReader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ExtensionResourceServiceProviderRegistryReader.java b/org.eclipse.xtext/src/org/eclipse/xtext/internal/ExtensionResourceServiceProviderRegistryReader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ExtensionResourceServiceProviderRegistryReader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/internal/ExtensionResourceServiceProviderRegistryReader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ProtocolResourceServiceProviderRegistryReader.java b/org.eclipse.xtext/src/org/eclipse/xtext/internal/ProtocolResourceServiceProviderRegistryReader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ProtocolResourceServiceProviderRegistryReader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/internal/ProtocolResourceServiceProviderRegistryReader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ResourceServiceProviderDescriptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/internal/ResourceServiceProviderDescriptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/internal/ResourceServiceProviderDescriptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/internal/ResourceServiceProviderDescriptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinker.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinker.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinker.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinker.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingDiagnosticMessageProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingDiagnosticMessageProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingDiagnosticMessageProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingDiagnosticMessageProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingService.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/ILinkingService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/LinkingScopeProviderBinding.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/LinkingScopeProviderBinding.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/LinkingScopeProviderBinding.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/LinkingScopeProviderBinding.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinker.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinker.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinker.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinker.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinkingService.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinkingService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinkingService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractLinkingService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/DefaultLinkingService.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/DefaultLinkingService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/DefaultLinkingService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/DefaultLinkingService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/IllegalNodeException.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/IllegalNodeException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/IllegalNodeException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/IllegalNodeException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/ImportedNamesAdapter.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/ImportedNamesAdapter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/ImportedNamesAdapter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/ImportedNamesAdapter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/Linker.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/Linker.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/Linker.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/Linker.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticMessageProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticMessageProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticMessageProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticMessageProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticProducer.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticProducer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticProducer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingDiagnosticProducer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/LinkingHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/XtextLinkingDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/XtextLinkingDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/XtextLinkingDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/XtextLinkingDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinker.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinker.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinker.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinker.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyURIEncoder.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyURIEncoder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyURIEncoder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyURIEncoder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SettingDelegate.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SettingDelegate.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SettingDelegate.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SettingDelegate.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SyntheticLinkingSupport.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SyntheticLinkingSupport.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SyntheticLinkingSupport.java rename to org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/SyntheticLinkingSupport.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/AbstractReader.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/AbstractReader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/AbstractReader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/AbstractReader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ContainersStateFactory.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ContainersStateFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ContainersStateFactory.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/ContainersStateFactory.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/EquinoxClasspathEntriesProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/EquinoxClasspathEntriesProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/EquinoxClasspathEntriesProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/EquinoxClasspathEntriesProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/IClasspathEntriesProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/IClasspathEntriesProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/IClasspathEntriesProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/IClasspathEntriesProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ISlotEntry.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ISlotEntry.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ISlotEntry.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/ISlotEntry.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/NameBasedFilter.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/NameBasedFilter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/NameBasedFilter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/NameBasedFilter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/NegatedUriFilter.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/NegatedUriFilter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/NegatedUriFilter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/NegatedUriFilter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/PathTraverser.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/PathTraverser.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/PathTraverser.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/PathTraverser.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceDescriptionsProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceDescriptionsProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceDescriptionsProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceDescriptionsProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceLoadingSlotEntry.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceLoadingSlotEntry.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceLoadingSlotEntry.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceLoadingSlotEntry.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntry.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntry.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntry.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntry.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/RuntimeResourceSetInitializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/RuntimeResourceSetInitializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/RuntimeResourceSetInitializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/RuntimeResourceSetInitializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/SlotEntry.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/SlotEntry.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/SlotEntry.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/SlotEntry.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriBasedReader.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriBasedReader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriBasedReader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriBasedReader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriFilter.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriFilter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriFilter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/UriFilter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UrlClassLoaderClasspathEntriesProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UrlClassLoaderClasspathEntriesProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/UrlClassLoaderClasspathEntriesProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/UrlClassLoaderClasspathEntriesProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Validator.java b/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Validator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Validator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/mwe/Validator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/DefaultDeclarativeQualifiedNameProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/naming/DefaultDeclarativeQualifiedNameProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/DefaultDeclarativeQualifiedNameProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/naming/DefaultDeclarativeQualifiedNameProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/naming/IQualifiedNameProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/QualifiedName.java b/org.eclipse.xtext/src/org/eclipse/xtext/naming/QualifiedName.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/QualifiedName.java rename to org.eclipse.xtext/src/org/eclipse/xtext/naming/QualifiedName.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/SimpleNameProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/naming/SimpleNameProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/naming/SimpleNameProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/naming/SimpleNameProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/BidiTreeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ICompositeNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ICompositeNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ICompositeNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ICompositeNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ILeafNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ILeafNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ILeafNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/ILeafNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/INode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/INode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/INode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/INode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/SyntaxErrorMessage.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/SyntaxErrorMessage.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/SyntaxErrorMessage.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/SyntaxErrorMessage.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/AbstractNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/AbstractNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/AbstractNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/AbstractNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeTreeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeTreeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeTreeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/BasicNodeTreeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElement.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElement.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElement.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElement.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElementAndSyntaxError.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElementAndSyntaxError.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElementAndSyntaxError.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSemanticElementAndSyntaxError.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSyntaxError.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSyntaxError.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSyntaxError.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/CompositeNodeWithSyntaxError.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNodeWithSyntaxError.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNodeWithSyntaxError.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNodeWithSyntaxError.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/HiddenLeafNodeWithSyntaxError.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InternalNodeModelUtils.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InternalNodeModelUtils.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InternalNodeModelUtils.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InternalNodeModelUtils.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InvariantChecker.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InvariantChecker.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InvariantChecker.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/InvariantChecker.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNodeWithSyntaxError.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNodeWithSyntaxError.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNodeWithSyntaxError.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/LeafNodeWithSyntaxError.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/NodeModelBuilder.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/NodeModelBuilder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/NodeModelBuilder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/NodeModelBuilder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/RootNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/RootNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/RootNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/RootNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SerializableNodeModel.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SerializableNodeModel.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SerializableNodeModel.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SerializableNodeModel.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SyntheticCompositeNode.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SyntheticCompositeNode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SyntheticCompositeNode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/SyntheticCompositeNode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/DeserializationConversionContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/DeserializationConversionContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/DeserializationConversionContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/DeserializationConversionContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationConversionContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationConversionContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationConversionContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationConversionContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtil.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/serialization/SerializationUtil.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/EmptyBidiIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeTreeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeTreeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeTreeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeTreeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/ReversedBidiTreeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterable.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/SingletonBidiIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/BaseEPackageAccess.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/BaseEPackageAccess.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/BaseEPackageAccess.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/BaseEPackageAccess.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/DefaultEcoreElementFactory.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/DefaultEcoreElementFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/DefaultEcoreElementFactory.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/DefaultEcoreElementFactory.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/EclipseProjectPropertiesEncodingProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/EclipseProjectPropertiesEncodingProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/EclipseProjectPropertiesEncodingProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/EclipseProjectPropertiesEncodingProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IEncodingProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/IEncodingProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IEncodingProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/IEncodingProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParseResult.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParseResult.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParseResult.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/IParseResult.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/ITokenToStringConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/ITokenToStringConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/ITokenToStringConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/ITokenToStringConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseException.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseResult.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseResult.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseResult.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/ParseResult.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParserBasedTokenSourceProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParserBasedTokenSourceProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParserBasedTokenSourceProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParserBasedTokenSourceProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractIndentationTokenSource.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractIndentationTokenSource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractIndentationTokenSource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractIndentationTokenSource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractInternalAntlrParser.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractInternalAntlrParser.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractInternalAntlrParser.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractInternalAntlrParser.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractSplittingTokenSource.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractSplittingTokenSource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractSplittingTokenSource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractSplittingTokenSource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractTokenSourceProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractTokenSourceProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractTokenSourceProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractTokenSourceProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrDatatypeRuleToken.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrDatatypeRuleToken.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrDatatypeRuleToken.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrDatatypeRuleToken.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenToStringConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenToStringConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenToStringConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenToStringConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IAntlrTokenFileProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IAntlrTokenFileProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IAntlrTokenFileProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IAntlrTokenFileProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IPartialParsingHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IPartialParsingHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IPartialParsingHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IPartialParsingHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IReferableElementsUnloader.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IReferableElementsUnloader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IReferableElementsUnloader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IReferableElementsUnloader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ISyntaxErrorMessageProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ISyntaxErrorMessageProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ISyntaxErrorMessageProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ISyntaxErrorMessageProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenDefProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenDefProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenDefProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/ITokenDefProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IUnorderedGroupHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IUnorderedGroupHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IUnorderedGroupHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/IUnorderedGroupHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerBindings.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerBindings.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerBindings.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerBindings.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/LexerProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/NullTokenDefProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/NullTokenDefProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/NullTokenDefProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/NullTokenDefProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/SyntaxErrorMessageProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/SyntaxErrorMessageProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/SyntaxErrorMessageProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/SyntaxErrorMessageProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenDefProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenDefProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenDefProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenDefProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenSourceProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenSourceProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenSourceProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenSourceProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenTool.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenTool.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenTool.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/TokenTool.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/UnorderedGroupHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/UnorderedGroupHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/UnorderedGroupHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/UnorderedGroupHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/DatatypeRuleToken.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/DatatypeRuleToken.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/DatatypeRuleToken.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/DatatypeRuleToken.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingPointers.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingPointers.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingPointers.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingPointers.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/Range.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/Range.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/Range.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/Range.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ICommentAssociater.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ICommentAssociater.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ICommentAssociater.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ICommentAssociater.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IEObjectConsumer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IEObjectConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IEObjectConsumer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IEObjectConsumer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IHiddenTokenHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IHiddenTokenHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IHiddenTokenHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IHiddenTokenHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IParseTreeConstructor.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IParseTreeConstructor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IParseTreeConstructor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/IParseTreeConstructor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStream.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStream.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStream.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStream.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStreamExtension.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStreamExtension.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStreamExtension.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITokenStreamExtension.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/Serializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/Serializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/Serializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/Serializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/SerializerOptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/SerializerOptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/SerializerOptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/SerializerOptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/XtextSerializationException.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/XtextSerializationException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/XtextSerializationException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/XtextSerializationException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractCommentAssociater.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractCommentAssociater.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractCommentAssociater.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractCommentAssociater.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractHiddenTokenHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractHiddenTokenHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractHiddenTokenHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractHiddenTokenHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractKeywordSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractKeywordSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractKeywordSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractKeywordSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractParseTreeConstructor.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractParseTreeConstructor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractParseTreeConstructor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractParseTreeConstructor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractTransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractTransientValueService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractTransientValueService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/AbstractTransientValueService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/CrossReferenceSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/CrossReferenceSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/CrossReferenceSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/CrossReferenceSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultCommentAssociater.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultCommentAssociater.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultCommentAssociater.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultCommentAssociater.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultTransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultTransientValueService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultTransientValueService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultTransientValueService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EObjectConsumer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EObjectConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EObjectConsumer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EObjectConsumer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EnumLiteralSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EnumLiteralSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EnumLiteralSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/EnumLiteralSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/HiddenAndTokenNodeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/HiddenAndTokenNodeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/HiddenAndTokenNodeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/HiddenAndTokenNodeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/IgnoreCaseKeywordSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/IgnoreCaseKeywordSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/IgnoreCaseKeywordSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/IgnoreCaseKeywordSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/KeywordSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/KeywordSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/KeywordSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/KeywordSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/NodeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/NodeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/NodeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/NodeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenStringBuffer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenStringBuffer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenStringBuffer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenStringBuffer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenUtil.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenUtil.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TraceToDot.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TraceToDot.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TraceToDot.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TraceToDot.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstNFAToDot.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstNFAToDot.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstNFAToDot.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstNFAToDot.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstState.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstTransition.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstTransition.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstTransition.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstTransition.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionNFAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionNFAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionNFAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionNFAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionReportImpl.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionReportImpl.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionReportImpl.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TreeConstructionReportImpl.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/ValueSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/ValueSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/ValueSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/ValueSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/WriterTokenStream.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/WriterTokenStream.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/WriterTokenStream.java rename to org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/WriterTokenStream.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/BooleanKey.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/BooleanKey.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/BooleanKey.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/BooleanKey.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValues.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValues.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValues.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValues.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/ITypedPreferenceValues.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/ITypedPreferenceValues.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/ITypedPreferenceValues.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/ITypedPreferenceValues.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IntegerKey.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IntegerKey.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IntegerKey.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/IntegerKey.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/MapBasedPreferenceValues.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/MapBasedPreferenceValues.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/MapBasedPreferenceValues.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/MapBasedPreferenceValues.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKey.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKey.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKey.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKey.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKeysProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKeysProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKeysProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceKeysProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceValuesByLanguage.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceValuesByLanguage.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceValuesByLanguage.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/PreferenceValuesByLanguage.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/StringKey.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/StringKey.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/StringKey.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/StringKey.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceKey.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceKey.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceKey.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceKey.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceValues.java b/org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceValues.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceValues.java rename to org.eclipse.xtext/src/org/eclipse/xtext/preferences/TypedPreferenceValues.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/AbstractEObjectDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/AbstractEObjectDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/AbstractEObjectDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/AbstractEObjectDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolver.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolver.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolver.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolver.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriResolutionException.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriResolutionException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriResolutionException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriResolutionException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/CompilerPhases.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/CompilerPhases.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/CompilerPhases.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/CompilerPhases.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultFragmentProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultFragmentProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultFragmentProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultFragmentProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultLocationInFileProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultLocationInFileProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultLocationInFileProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/DefaultLocationInFileProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResourceDescriptionManager.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResourceDescriptionManager.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResourceDescriptionManager.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/DerivedStateAwareResourceDescriptionManager.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DescriptionUtils.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/DescriptionUtils.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/DescriptionUtils.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/DescriptionUtils.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectAtOffsetHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectAtOffsetHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectAtOffsetHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectAtOffsetHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/EObjectDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ExternalContentSupport.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ExternalContentSupport.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ExternalContentSupport.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ExternalContentSupport.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/FileExtensionProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/FileExtensionProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/FileExtensionProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/FileExtensionProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/FileNotFoundOnClasspathException.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/FileNotFoundOnClasspathException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/FileNotFoundOnClasspathException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/FileNotFoundOnClasspathException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ForwardingEObjectDescription.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ForwardingEObjectDescription.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ForwardingEObjectDescription.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ForwardingEObjectDescription.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IBatchLinkableResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IBatchLinkableResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IBatchLinkableResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IBatchLinkableResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IClasspathUriResolver.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IClasspathUriResolver.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IClasspathUriResolver.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IClasspathUriResolver.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IContainer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IContainer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IContainer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IContainer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IDefaultResourceDescriptionStrategy.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IDefaultResourceDescriptionStrategy.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IDefaultResourceDescriptionStrategy.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IDefaultResourceDescriptionStrategy.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IDerivedStateComputer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IDerivedStateComputer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IDerivedStateComputer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IDerivedStateComputer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IEObjectDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IEObjectDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IEObjectDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IEObjectDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IExternalContentSupport.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IExternalContentSupport.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IExternalContentSupport.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IExternalContentSupport.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IFragmentProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IFragmentProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IFragmentProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IFragmentProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProviderExtension.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProviderExtension.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProviderExtension.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ILocationInFileProviderExtension.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IMimeTypeProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IMimeTypeProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IMimeTypeProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IMimeTypeProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IReferenceDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IReferenceDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IReferenceDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IReferenceDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptionsProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptionsProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptionsProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceDescriptionsProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceFactory.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceFactory.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceFactory.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProviderExtension.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProviderExtension.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProviderExtension.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IResourceServiceProviderExtension.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ISelectable.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ISelectable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ISelectable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ISelectable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IShadowedResourceDescriptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/IShadowedResourceDescriptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IShadowedResourceDescriptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/IShadowedResourceDescriptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ISynchronizable.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ISynchronizable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ISynchronizable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ISynchronizable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/OutdatedStateManager.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/OutdatedStateManager.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/OutdatedStateManager.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/OutdatedStateManager.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSet.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSet.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSet.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSet.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetImpl.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetImpl.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetImpl.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetImpl.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/SaveOptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/SaveOptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/SaveOptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/SaveOptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/SynchronizedXtextResourceSet.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/SynchronizedXtextResourceSet.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/SynchronizedXtextResourceSet.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/SynchronizedXtextResourceSet.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceFactory.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceFactory.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceFactory.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceSet.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceSet.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceSet.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResourceSet.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnosticWithRange.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnosticWithRange.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnosticWithRange.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextSyntaxDiagnosticWithRange.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DisabledClusteringPolicy.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DisabledClusteringPolicy.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DisabledClusteringPolicy.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DisabledClusteringPolicy.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DynamicResourceClusteringPolicy.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DynamicResourceClusteringPolicy.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DynamicResourceClusteringPolicy.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DynamicResourceClusteringPolicy.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/IResourceClusteringPolicy.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/IResourceClusteringPolicy.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/IResourceClusteringPolicy.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/IResourceClusteringPolicy.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ContainerState.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ContainerState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ContainerState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ContainerState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DelegatingIAllContainerAdapter.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DelegatingIAllContainerAdapter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DelegatingIAllContainerAdapter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DelegatingIAllContainerAdapter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DescriptionAddingContainer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DescriptionAddingContainer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DescriptionAddingContainer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/DescriptionAddingContainer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FilterUriContainer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FilterUriContainer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FilterUriContainer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FilterUriContainer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FlatResourceSetBasedAllContainersState.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FlatResourceSetBasedAllContainersState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FlatResourceSetBasedAllContainersState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FlatResourceSetBasedAllContainersState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IAllContainersState.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IAllContainersState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IAllContainersState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IAllContainersState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IContainerState.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IContainerState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IContainerState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/IContainerState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/LiveShadowedAllContainerState.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/LiveShadowedAllContainerState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/LiveShadowedAllContainerState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/LiveShadowedAllContainerState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ProjectDescriptionBasedContainerManager.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ProjectDescriptionBasedContainerManager.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ProjectDescriptionBasedContainerManager.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ProjectDescriptionBasedContainerManager.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersState.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersStateProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersStateProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersStateProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ResourceSetBasedAllContainersStateProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainerManager.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainerManager.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainerManager.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainerManager.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceRuntimeModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceRuntimeModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceRuntimeModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceRuntimeModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceSupport.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceSupport.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceSupport.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/AbstractGenericResourceSupport.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceDescriptionManager.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceDescriptionManager.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceDescriptionManager.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceDescriptionManager.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/XMLEncodingProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/XMLEncodingProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/XMLEncodingProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/XMLEncodingProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractCompoundSelectable.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractCompoundSelectable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractCompoundSelectable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractCompoundSelectable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractContainer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractContainer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractContainer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractContainer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescriptionChangeEventSource.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescriptionChangeEventSource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescriptionChangeEventSource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AbstractResourceDescriptionChangeEventSource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AliasedEObjectDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AliasedEObjectDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AliasedEObjectDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/AliasedEObjectDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/BinaryGrammarResourceFactoryImpl.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/BinaryGrammarResourceFactoryImpl.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/BinaryGrammarResourceFactoryImpl.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/BinaryGrammarResourceFactoryImpl.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChangedResourceDescriptionDelta.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChangedResourceDescriptionDelta.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChangedResourceDescriptionDelta.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChangedResourceDescriptionDelta.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChunkedResourceDescriptions.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChunkedResourceDescriptions.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChunkedResourceDescriptions.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ChunkedResourceDescriptions.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/CoarseGrainedChangeEvent.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/CoarseGrainedChangeEvent.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/CoarseGrainedChangeEvent.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/CoarseGrainedChangeEvent.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDelta.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDelta.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDelta.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDelta.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionManager.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionManager.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionManager.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionManager.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionStrategy.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionStrategy.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionStrategy.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionStrategy.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceServiceProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceServiceProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceServiceProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/DefaultResourceServiceProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EObjectDescriptionLookUp.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EObjectDescriptionLookUp.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EObjectDescriptionLookUp.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EObjectDescriptionLookUp.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EagerResourceSetBasedResourceDescriptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EagerResourceSetBasedResourceDescriptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EagerResourceSetBasedResourceDescriptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/EagerResourceSetBasedResourceDescriptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ListBasedDiagnosticConsumer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ListBasedDiagnosticConsumer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ListBasedDiagnosticConsumer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ListBasedDiagnosticConsumer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/LiveShadowedResourceDescriptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/LiveShadowedResourceDescriptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/LiveShadowedResourceDescriptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/LiveShadowedResourceDescriptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ProjectDescription.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ProjectDescription.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ProjectDescription.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ProjectDescription.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionChangeEvent.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionChangeEvent.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionChangeEvent.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionChangeEvent.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainer.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsData.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsData.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsData.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsData.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceServiceProviderRegistryImpl.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceServiceProviderRegistryImpl.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceServiceProviderRegistryImpl.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceServiceProviderRegistryImpl.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/SimpleResourceDescriptionsBasedContainerManager.java b/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/SimpleResourceDescriptionsBasedContainerManager.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/SimpleResourceDescriptionsBasedContainerManager.java rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/impl/SimpleResourceDescriptionsBasedContainerManager.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/PortableURIs.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/PortableURIs.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/PortableURIs.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/PortableURIs.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageFacade.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageFacade.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageFacade.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageFacade.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageLoadable.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageLoadable.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageLoadable.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageLoadable.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageProviderAdapter.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageProviderAdapter.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageProviderAdapter.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageProviderAdapter.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageWritable.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageWritable.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageWritable.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageWritable.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SourceLevelURIsAdapter.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SourceLevelURIsAdapter.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SourceLevelURIsAdapter.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SourceLevelURIsAdapter.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResource.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResourceDescriptionManager.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResourceDescriptionManager.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResourceDescriptionManager.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/StorageAwareResourceDescriptionManager.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/ICaseInsensitivityHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/ICaseInsensitivityHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/ICaseInsensitivityHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/ICaseInsensitivityHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IGlobalScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IGlobalScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IGlobalScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/IGlobalScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/IScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IgnoreCaseLinking.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IgnoreCaseLinking.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/IgnoreCaseLinking.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/IgnoreCaseLinking.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/Scopes.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/Scopes.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/Scopes.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/Scopes.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractDeclarativeScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractDeclarativeScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractDeclarativeScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractDeclarativeScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeDelegatingScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeDelegatingScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeDelegatingScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeDelegatingScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractGlobalScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/AbstractScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/CaseInsensitivityHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/CaseInsensitivityHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/CaseInsensitivityHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/CaseInsensitivityHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DefaultGlobalScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DefaultGlobalScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DefaultGlobalScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DefaultGlobalScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingEventSource.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingEventSource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingEventSource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingEventSource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/DelegatingScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/FilteringScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/FilteringScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/FilteringScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/FilteringScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/GlobalResourceDescriptionProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/GlobalResourceDescriptionProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/GlobalResourceDescriptionProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/GlobalResourceDescriptionProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IDelegatingScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IDelegatingScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IDelegatingScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IDelegatingScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IScopeWrapper.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IScopeWrapper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IScopeWrapper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/IScopeWrapper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportNormalizer.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportNormalizer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportNormalizer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportNormalizer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriGlobalScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriGlobalScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriGlobalScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriGlobalScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriResolver.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriResolver.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriResolver.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportUriResolver.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/LoadOnDemandResourceDescriptions.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/LoadOnDemandResourceDescriptions.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/LoadOnDemandResourceDescriptions.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/LoadOnDemandResourceDescriptions.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MapBasedScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MapBasedScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MapBasedScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MapBasedScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedSelectable.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedSelectable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedSelectable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/MultimapBasedSelectable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ResourceSetGlobalScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ResourceSetGlobalScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ResourceSetGlobalScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ResourceSetGlobalScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ScopeBasedSelectable.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ScopeBasedSelectable.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ScopeBasedSelectable.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/ScopeBasedSelectable.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SelectableBasedScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SelectableBasedScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SelectableBasedScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SelectableBasedScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleLocalScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleLocalScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleLocalScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleLocalScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SimpleScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SingletonScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SingletonScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SingletonScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/scoping/impl/SingletonScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializationContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializationContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializationContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializationContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/ISerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/DelegatingSequenceAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/DelegatingSequenceAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/DelegatingSequenceAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/DelegatingSequenceAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISemanticSequenceAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISemanticSequenceAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISemanticSequenceAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISemanticSequenceAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISequenceAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISequenceAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISequenceAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISequenceAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISyntacticSequenceAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISyntacticSequenceAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISyntacticSequenceAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/ISyntacticSequenceAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/SequenceFeeder.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/SequenceFeeder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/SequenceFeeder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/SequenceFeeder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/StringBufferSequenceAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/StringBufferSequenceAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/StringBufferSequenceAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/StringBufferSequenceAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/TokenStreamSequenceAdapter.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/TokenStreamSequenceAdapter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/TokenStreamSequenceAdapter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/TokenStreamSequenceAdapter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/WhitespaceAddingSequenceAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/WhitespaceAddingSequenceAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/WhitespaceAddingSequenceAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/acceptor/WhitespaceAddingSequenceAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextTypePDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextTypePDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextTypePDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ContextTypePDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarAlias.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarAlias.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarAlias.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarAlias.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarElementDeclarationOrder.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarElementDeclarationOrder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarElementDeclarationOrder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarElementDeclarationOrder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextTypePDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextTypePDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextTypePDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IContextTypePDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarConstraintProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarConstraintProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarConstraintProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarConstraintProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/IGrammarPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISemanticSequencerNfaProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISemanticSequencerNfaProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISemanticSequencerNfaProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISemanticSequencerNfaProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISerState.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISerState.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISerState.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISerState.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISyntacticSequencerPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISyntacticSequencerPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISyntacticSequencerPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/ISyntacticSequencerPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializationContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializationContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializationContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializationContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializerPDA.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializerPDA.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializerPDA.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SerializerPDA.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SyntacticSequencerPDAProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SyntacticSequencerPDAProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SyntacticSequencerPDAProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SyntacticSequencerPDAProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISemanticSequencerDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISemanticSequencerDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISemanticSequencerDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISemanticSequencerDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISerializationDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISerializationDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISerializationDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISerializationDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISyntacticSequencerDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISyntacticSequencerDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISyntacticSequencerDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISyntacticSequencerDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ITokenDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ITokenDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ITokenDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ITokenDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SequencerDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SequencerDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SequencerDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SequencerDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SerializationDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SerializationDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SerializationDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SerializationDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/TokenDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/TokenDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/TokenDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/TokenDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/FeatureFinderUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/FeatureFinderUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/FeatureFinderUtil.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/FeatureFinderUtil.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/Serializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/Serializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/Serializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/Serializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractDelegatingSemanticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractDelegatingSemanticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractDelegatingSemanticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractDelegatingSemanticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSemanticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSemanticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSemanticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSemanticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSyntacticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSyntacticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSyntacticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AbstractSyntacticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AssignmentFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AssignmentFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AssignmentFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AssignmentFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/BacktrackingSemanticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/BacktrackingSemanticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/BacktrackingSemanticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/BacktrackingSemanticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/EmitterNodeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSyntacticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSyntacticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSyntacticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/GenericSyntacticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/HiddenTokenSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/HiddenTokenSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/HiddenTokenSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/HiddenTokenSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IAssignmentFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IAssignmentFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IAssignmentFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IAssignmentFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IContextFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IContextFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IContextFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IContextFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IHiddenTokenSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IHiddenTokenSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IHiddenTokenSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IHiddenTokenSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticNodeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticNodeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticNodeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticNodeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISemanticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISyntacticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISyntacticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISyntacticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ISyntacticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ITransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ITransientValueService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ITransientValueService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ITransientValueService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/LegacyTransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/LegacyTransientValueService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/LegacyTransientValueService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/LegacyTransientValueService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/RuleCallStack.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/RuleCallStack.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/RuleCallStack.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/RuleCallStack.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueUtil.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/TransientValueUtil.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/CrossReferenceSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/CrossReferenceSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/CrossReferenceSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/CrossReferenceSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/EnumLiteralSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/EnumLiteralSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/EnumLiteralSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/EnumLiteralSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ICrossReferenceSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ICrossReferenceSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ICrossReferenceSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ICrossReferenceSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IEnumLiteralSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IEnumLiteralSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IEnumLiteralSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IEnumLiteralSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IKeywordSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IKeywordSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IKeywordSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IKeywordSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IValueSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IValueSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IValueSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IValueSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IgnoreCaseKeywordSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IgnoreCaseKeywordSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IgnoreCaseKeywordSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/IgnoreCaseKeywordSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/KeywordSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/KeywordSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/KeywordSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/KeywordSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/SerializerScopeProviderBinding.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/SerializerScopeProviderBinding.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/SerializerScopeProviderBinding.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/SerializerScopeProviderBinding.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractElementFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractElementFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractElementFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractElementFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractGenericModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractGenericModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractGenericModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/AbstractGenericModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/BindModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/BindModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/BindModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/BindModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/CompoundModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/CompoundModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/CompoundModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/CompoundModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/DefaultRuntimeModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/DefaultRuntimeModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/DefaultRuntimeModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/DefaultRuntimeModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/DispatchingProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/DispatchingProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/DispatchingProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/DispatchingProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/FreeModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/FreeModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/FreeModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/FreeModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/LanguageSpecific.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/service/LanguageSpecific.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/LanguageSpecific.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/service/LanguageSpecific.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/MethodBasedModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/MethodBasedModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/MethodBasedModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/MethodBasedModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/OperationCanceledManager.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/service/OperationCanceledManager.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/OperationCanceledManager.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/service/OperationCanceledManager.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/SingletonBinding.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/SingletonBinding.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/SingletonBinding.java rename to org.eclipse.xtext/src/org/eclipse/xtext/service/SingletonBinding.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskFinder.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskFinder.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskFinder.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskFinder.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskParser.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskParser.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskParser.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskParser.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskTagProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskTagProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskTagProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/DefaultTaskTagProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskParser.java b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskParser.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskParser.java rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskParser.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskTagProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskTagProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskTagProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/ITaskTagProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/PreferenceTaskTagProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/Priority.java b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/Priority.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/Priority.java rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/Priority.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/Task.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/Task.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/Task.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/Task.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/TaskTag.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/tasks/TaskTag.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/tasks/TaskTag.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/tasks/TaskTag.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractDeclarativeValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractDeclarativeValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractDeclarativeValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractDeclarativeValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractInjectableValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractInjectableValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractInjectableValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractInjectableValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CancelableDiagnostician.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/CancelableDiagnostician.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CancelableDiagnostician.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/CancelableDiagnostician.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/Check.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/Check.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/Check.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/Check.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckMode.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckMode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckMode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckMode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckType.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckType.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckType.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/CheckType.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ComposedChecks.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/ComposedChecks.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ComposedChecks.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/ComposedChecks.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CompositeEValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/CompositeEValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CompositeEValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/CompositeEValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ConfigurableIssueCodesProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/ConfigurableIssueCodesProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ConfigurableIssueCodesProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/ConfigurableIssueCodesProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/DiagnosticConverterImpl.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/DiagnosticConverterImpl.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/DiagnosticConverterImpl.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/DiagnosticConverterImpl.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/EObjectDiagnosticImpl.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/EObjectDiagnosticImpl.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/EObjectDiagnosticImpl.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/EObjectDiagnosticImpl.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/EValidatorRegistrar.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/EValidatorRegistrar.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/EValidatorRegistrar.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/EValidatorRegistrar.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/FeatureBasedDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/FeatureBasedDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/FeatureBasedDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/FeatureBasedDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/GuardException.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/GuardException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/GuardException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/GuardException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityAllocator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityAllocator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityAllocator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityAllocator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityIntervalProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityIntervalProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityIntervalProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IAssignmentQuantityIntervalProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxConstraintProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxConstraintProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxConstraintProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxConstraintProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IConcreteSyntaxValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IDiagnosticConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IDiagnosticConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IDiagnosticConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IDiagnosticConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/INamesAreUniqueValidationHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/INamesAreUniqueValidationHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/INamesAreUniqueValidationHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/INamesAreUniqueValidationHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IResourceValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IResourceValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IResourceValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IResourceValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ImportUriValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/ImportUriValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ImportUriValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/ImportUriValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/Issue.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/Issue.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/Issue.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/Issue.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeverities.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeverities.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeverities.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeverities.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeveritiesProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeveritiesProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeveritiesProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/IssueSeveritiesProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/NamesAreUniqueValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/RangeBasedDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/RangeBasedDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/RangeBasedDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/RangeBasedDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/SeverityConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/SeverityConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/SeverityConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/SeverityConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ValidationMessageAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/ValidationMessageAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ValidationMessageAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/ValidationMessageAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityAllocator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityAllocator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityAllocator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityAllocator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityIntervalProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityIntervalProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityIntervalProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/AssignmentQuantityIntervalProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxConstraintProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxConstraintProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxConstraintProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxConstraintProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxDiagnosticProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxDiagnosticProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxDiagnosticProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxDiagnosticProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxEValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxEValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxEValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxEValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/validation/impl/ConcreteSyntaxValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/FileWorkspaceConfig.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/workspace/FileWorkspaceConfig.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/FileWorkspaceConfig.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/workspace/FileWorkspaceConfig.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfig.java b/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfig.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfig.java rename to org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfig.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfigProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfigProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfigProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/workspace/IProjectConfigProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ISourceFolder.java b/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ISourceFolder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ISourceFolder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/workspace/ISourceFolder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IWorkspaceConfig.java b/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IWorkspaceConfig.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/IWorkspaceConfig.java rename to org.eclipse.xtext/src/org/eclipse/xtext/workspace/IWorkspaceConfig.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigAdapter.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigAdapter.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigAdapter.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigAdapter.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigProvider.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigProvider.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigProvider.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/workspace/ProjectConfigProvider.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/CardinalityAwareSyntacticSequencer.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/CardinalityAwareSyntacticSequencer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/CardinalityAwareSyntacticSequencer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/CardinalityAwareSyntacticSequencer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ConditionEvaluator.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ConditionEvaluator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ConditionEvaluator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ConditionEvaluator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/CurrentTypeFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/CurrentTypeFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/CurrentTypeFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/CurrentTypeFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/FlattenedGrammarAccess.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/FlattenedGrammarAccess.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/FlattenedGrammarAccess.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/FlattenedGrammarAccess.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarResource.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarResource.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarResource.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarWithoutLeftRecursionInspector.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarWithoutLeftRecursionInspector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarWithoutLeftRecursionInspector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/GrammarWithoutLeftRecursionInspector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/KeywordInspector.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/KeywordInspector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/KeywordInspector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/KeywordInspector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/OriginalElement.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/OriginalElement.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/OriginalElement.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/OriginalElement.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/OverriddenValueInspector.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/OverriddenValueInspector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/OverriddenValueInspector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/OverriddenValueInspector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ParameterConfigHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ParameterConfigHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ParameterConfigHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ParameterConfigHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/PredicateUsesUnorderedGroupInspector.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/PredicateUsesUnorderedGroupInspector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/PredicateUsesUnorderedGroupInspector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/PredicateUsesUnorderedGroupInspector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ReducedXtextResourceValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleFilter.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleFilter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleFilter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleFilter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleNames.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleNames.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleNames.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleNames.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithParameterValues.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithParameterValues.xtend similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithParameterValues.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithParameterValues.xtend diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspector.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/SuperCallScope.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/SuperCallScope.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/SuperCallScope.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/SuperCallScope.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/UsedRulesFinder.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/UsedRulesFinder.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/UsedRulesFinder.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/UsedRulesFinder.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextConfigurableIssueCodes.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextConfigurableIssueCodes.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextConfigurableIssueCodes.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextConfigurableIssueCodes.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextCrossReferenceSerializer.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextCrossReferenceSerializer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextCrossReferenceSerializer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextCrossReferenceSerializer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextDiagnosticConverter.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextDiagnosticConverter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextDiagnosticConverter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextDiagnosticConverter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatter.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFragmentProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFragmentProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFragmentProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFragmentProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinker.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinker.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinker.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinker.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingDiagnosticMessageProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingDiagnosticMessageProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingDiagnosticMessageProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingDiagnosticMessageProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingService.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLinkingService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLocationInFileProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLocationInFileProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLocationInFileProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextLocationInFileProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextMetamodelReferenceHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextMetamodelReferenceHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextMetamodelReferenceHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextMetamodelReferenceHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextReferableElementsUnloader.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextReferableElementsUnloader.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextReferableElementsUnloader.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextReferableElementsUnloader.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextResourceDescriptionStrategy.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextResourceDescriptionStrategy.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextResourceDescriptionStrategy.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextResourceDescriptionStrategy.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextRuleInspector.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextRuleInspector.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextRuleInspector.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextRuleInspector.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValueConverters.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValueConverters.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValueConverters.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValueConverters.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/DatatypeRuleUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/DatatypeRuleUtil.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/DatatypeRuleUtil.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/DatatypeRuleUtil.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfo.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfo.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfo.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfo.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfos.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfos.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfos.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfos.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ElementTypeCalculator.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ElementTypeCalculator.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ElementTypeCalculator.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ElementTypeCalculator.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ErrorAcceptor.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ErrorAcceptor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ErrorAcceptor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/ErrorAcceptor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/IXtext2EcorePostProcessor.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/IXtext2EcorePostProcessor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/IXtext2EcorePostProcessor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/IXtext2EcorePostProcessor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/SourceAdapter.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/SourceAdapter.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/SourceAdapter.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/SourceAdapter.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnostic.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnostic.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnostic.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnostic.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticsProducer.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticsProducer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticsProducer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticsProducer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationErrorCode.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationErrorCode.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationErrorCode.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationErrorCode.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationException.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TransformationException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelper.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelper.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelper.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelper.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/UnexpectedClassInfoException.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/UnexpectedClassInfoException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/UnexpectedClassInfoException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/UnexpectedClassInfoException.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/XtendXtext2EcorePostProcessor.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/XtendXtext2EcorePostProcessor.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/XtendXtext2EcorePostProcessor.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/XtendXtext2EcorePostProcessor.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreInterpretationContext.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreInterpretationContext.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreInterpretationContext.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreInterpretationContext.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformer.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformer.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformer.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformer.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareEcoreFactory.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareEcoreFactory.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareEcoreFactory.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareEcoreFactory.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareSyntaxErrorMessageProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareSyntaxErrorMessageProvider.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareSyntaxErrorMessageProvider.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/CardinalityAwareSyntaxErrorMessageProvider.java diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/MoreThanOneCardinalityException.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/MoreThanOneCardinalityException.java similarity index 100% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/MoreThanOneCardinalityException.java rename to org.eclipse.xtext/src/org/eclipse/xtext/xtext/parser/MoreThanOneCardinalityException.java diff --git a/separate-builds/core/.project b/separate-builds/core/.project deleted file mode 100644 index e91831a53..000000000 --- a/separate-builds/core/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - xtext-core - Project xtext-core created by Buildship. - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/separate-builds/core/.settings/org.eclipse.buildship.core.prefs b/separate-builds/core/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 5aec851a5..000000000 --- a/separate-builds/core/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.project.dir= -derived.resources=.gradle,build -eclipse.preferences.version=1 -project.path=\: diff --git a/separate-builds/core/settings.gradle b/settings.gradle similarity index 100% rename from separate-builds/core/settings.gradle rename to settings.gradle diff --git a/splitting/.classpath b/splitting/.classpath deleted file mode 100644 index fceb4801b..000000000 --- a/splitting/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/splitting/.project b/splitting/.project deleted file mode 100644 index 255dd984a..000000000 --- a/splitting/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - splitting - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/splitting/README.md b/splitting/README.md deleted file mode 100644 index a83febc96..000000000 --- a/splitting/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Repository Splitting - -This project provides tools for splitting the Xtext repository as described [in the Wiki](https://github.com/eclipse/xtext/wiki/Restructuring). This is the proposed work flow: - - 1. `../gradlew findProjects` creates `build/splitting/all-projects.txt`, a list of all projects (paths with a `.project` file) that have ever been in the history, and `build/splitting/unmapped-paths.txt`, a list of paths that are not covered by any project. - 2. Create `splitting.txt` based on the results of the previous step. This file must consist of lines of the form `path >> target-repos`, where `path` can be any file or directory in the repository and `target-repos` is either `delete` or a list of repository ids where that path should be included. - 3. `../gradlew clean validateSplitting` checks whether `splitting.txt` covers all files found in the history. - 4. `../gradlew generateRemovals` creates `build/splitting/removals-*.txt` for each target repository. - -Now you have all necessary data to perform the actual splitting. In order to do this: - - 1. Create and checkout a new branch. - 2. Run `../gradlew *FilterBranch`, where `*` is the target repository id. - 3. Find something else to do (on my machine the previous command takes more than one hour). - 4. Push the resulting branch to the corresponding repository. diff --git a/splitting/build.gradle b/splitting/build.gradle deleted file mode 100644 index 05da9c50e..000000000 --- a/splitting/build.gradle +++ /dev/null @@ -1,79 +0,0 @@ -apply plugin: 'java' - -sourceSets.main.java.srcDirs = ['src'] - -def outputFilesDir = "$buildDir/splitting" -def allHistoryFiles = file(outputFilesDir + "/all-files.txt") -def allProjects = file(outputFilesDir + "/all-projects.txt") -def unmappedPaths = file(outputFilesDir + "/unmapped-paths.txt") -def splittingFile = file("splitting.txt") -def repositories = ["core", "extras", "lib", "xtend", "eclipse", "idea", "web", "maven"] - -task listFiles(type: Exec) { - group 'Splitting Helper' - description 'Creates a list of all files that have ever been in the git history.' - outputs.file allHistoryFiles - workingDir '..' - commandLine 'git', 'log', '--pretty=format:', '--name-only', '--diff-filter=A' - doFirst { - new File(allHistoryFiles.parent).mkdirs() - standardOutput = new FileOutputStream(allHistoryFiles) - } -} - -task findProjects(type: JavaExec) { - group 'Splitting Helper' - description 'Creates a list of all projects that have ever been in the git history.' - dependsOn(sourceSets.main.runtimeClasspath, listFiles) - inputs.file allHistoryFiles - outputs.files allProjects, unmappedPaths - classpath = sourceSets.main.runtimeClasspath.filter{it.exists()} - main = "org.eclipse.xtext.splitting.FindProjects" - args outputFilesDir -} - -task validateSplitting(type: JavaExec) { - group 'Splitting Helper' - description 'Checks splitting.txt for validity.' - dependsOn(sourceSets.main.runtimeClasspath, listFiles) - inputs.files splittingFile, allHistoryFiles - classpath = sourceSets.main.runtimeClasspath.filter{it.exists()} - main = "org.eclipse.xtext.splitting.ValidateSplitting" - args splittingFile, outputFilesDir -} - -task generateRemovals(type: JavaExec) { - group 'Splitting Helper' - description 'Generates a list of files to remove for each repository.' - dependsOn(sourceSets.main.runtimeClasspath, validateSplitting) - inputs.files splittingFile - outputs.files repositories.collect{ file("$outputFilesDir/removals-${it}.txt") } - classpath = sourceSets.main.runtimeClasspath.filter{it.exists()} - main = "org.eclipse.xtext.splitting.GenerateRemovals" - args splittingFile, outputFilesDir -} - -repositories.each { targetRepo -> - def removalsFile = file("$outputFilesDir/removals-${targetRepo}.txt") - task "${targetRepo}FilterBranch"(type: Exec) { - group 'Git History Manipulation' - description "Filters the git history for the target repository ${targetRepo}." - dependsOn(generateRemovals) - inputs.file removalsFile - workingDir '..' - commandLine 'splitting/git-filter-branch.sh', removalsFile.path, file('.').canonicalPath, targetRepo - } -} - -task(allFilterBranch) { - group 'Git History Manipulation' - description 'Runs the filter-branch tasks for all target repositories.' - repositories.each { dependsOn("${it}FilterBranch") } -} - -task pushToGithub(type: Exec) { - group 'Git History Manipulation' - description 'Force-Push all branches to TypeFox/xtext-splitted-repo on Github.' - workingDir '..' - commandLine 'git', 'push', '--all', '-f', 'https://xtext-repo-split@github.com/TypeFox/xtext-splitted-repo.git' -} \ No newline at end of file diff --git a/splitting/git-filter-branch.sh b/splitting/git-filter-branch.sh deleted file mode 100755 index d94e78f1f..000000000 --- a/splitting/git-filter-branch.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -git checkout -B split-$3 refs/remotes/origin/repo_splitting - -REMOVALS=`cat $1 | tr '\n' ' '` -git filter-branch -f --prune-empty \ - --index-filter "git rm -qrf --cached --ignore-unmatch $REMOVALS" \ - --parent-filter $2/parent-filter.sh \ - HEAD diff --git a/splitting/parent-filter.sh b/splitting/parent-filter.sh deleted file mode 100755 index 64f90fa28..000000000 --- a/splitting/parent-filter.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -read INPUT -if [ -n "$INPUT" ] -then - SHOW_BRANCH=`git show-branch --independent ${INPUT//-p/}` - for PARENT in $SHOW_BRANCH - do - echo -n "-p $PARENT " - done -fi diff --git a/splitting/settings.gradle b/splitting/settings.gradle deleted file mode 100644 index e69de29bb..000000000 diff --git a/splitting/splitting.txt b/splitting/splitting.txt deleted file mode 100644 index 3b5658d01..000000000 --- a/splitting/splitting.txt +++ /dev/null @@ -1,485 +0,0 @@ -splitting >> core, extras, lib, xtend, eclipse, idea, web, maven -tests/org.eclipse.xtext.testlanguages >> core, extras -tests/org.eclipse.xtext.testlanguages.ide >> core, extras -tests/org.eclipse.xtext.testlanguages.tests >> core, extras -tests/org.eclipse.xtext.tests >> core, extras, eclipse -tests/org.eclipse.xtext.common.types.tests >> extras, eclipse -tests/org.eclipse.xtext.java.tests >> extras, eclipse -tests/org.eclipse.xtext.purexbase.tests >> extras, eclipse -tests/org.eclipse.xtext.generator.tests >> core, extras -tests/org.eclipse.xtext.junit4.tests >> core, eclipse -intellij/org.eclipse.xtext.idea.example.entities >> idea, web -intellij/org.eclipse.xtext.idea.example.entities.ide >> idea, web -intellij/org.eclipse.xtext.idea.generator >> idea, eclipse -maven/org.eclipse.xtext.parent >> maven, eclipse, xtend -maven/org.eclipse.xtext.target >> maven, eclipse, xtend -maven/org.eclipse.xtext.tycho.parent >> eclipse, xtend -maven/org.eclipse.xtext.tycho.tests.parent >> eclipse, xtend -plugins/org.eclipse.xtext.junit4 >> core, eclipse - -plugins/org.eclipse.xtext >> core -plugins/org.eclipse.xtext.ide >> core -plugins/org.eclipse.xtext.util >> core -plugins/org.eclipse.xtext.xtext.generator >> core -plugins/org.eclipse.xtext.xtext.wizard >> core -tests/org.eclipse.xtext.ide.tests >> core -separate-builds/core >> core - -plugins/org.eclipse.xtext.builder.standalone >> extras -plugins/org.eclipse.xtext.common.types >> extras -plugins/org.eclipse.xtext.ecore >> extras -plugins/org.eclipse.xtext.generator >> extras -plugins/org.eclipse.xtext.java >> extras -plugins/org.eclipse.xtext.purexbase >> extras -plugins/org.eclipse.xtext.purexbase.test >> extras -plugins/org.eclipse.xtext.smap >> extras -plugins/org.eclipse.xtext.xbase >> extras -plugins/org.eclipse.xtext.xbase.ide >> extras -tests/org.eclipse.xtext.xbase.tests >> extras -tests/org.eclipse.xtext.xbase.testlanguages >> extras -separate-builds/extras >> extras - -plugins/org.eclipse.xtend.lib >> lib -plugins/org.eclipse.xtend.lib.gwt >> lib -maven/org.eclipse.xtend.lib.gwt.test >> lib -plugins/org.eclipse.xtend.lib.macro >> lib -plugins/org.eclipse.xtext.xbase.lib >> lib -plugins/org.eclipse.xtext.xbase.lib.gwt >> lib -separate-builds/lib >> lib - -separate-builds/xtend >> xtend -docs/org.eclipse.xtend.doc >> xtend -examples/org.eclipse.xtend.examples/.classpath >> xtend -examples/org.eclipse.xtend.examples/.project >> xtend -examples/org.eclipse.xtend.examples/.settings >> xtend -examples/org.eclipse.xtend.examples/META-INF >> xtend -examples/org.eclipse.xtend.examples/about.html >> xtend -examples/org.eclipse.xtend.examples/build.properties >> xtend -examples/org.eclipse.xtend.examples/icons >> xtend -examples/org.eclipse.xtend.examples/plugin.properties >> xtend -examples/org.eclipse.xtend.examples/plugin.xml >> xtend -examples/org.eclipse.xtend.examples/pom.xml >> xtend -examples/org.eclipse.xtend.examples-container >> xtend -plugins/org.eclipse.xtend.core >> xtend -plugins/org.eclipse.xtend.ide >> xtend -plugins/org.eclipse.xtend.ide.common >> xtend -plugins/org.eclipse.xtend.m2e >> xtend -plugins/org.eclipse.xtend.standalone >> xtend -intellij/org.eclipse.xtend.idea >> xtend -intellij/org.eclipse.xtend.idea.tests >> xtend -tests/org.eclipse.xtend.caliper.tests >> xtend -tests/org.eclipse.xtend.core.tests >> xtend -tests/org.eclipse.xtend.core.tests.java8 >> xtend -tests/org.eclipse.xtend.ide.swtbot.tests >> xtend -tests/org.eclipse.xtend.ide.tests >> xtend -tests/org.eclipse.xtend.performance.tests >> xtend -tests/org.eclipse.xtend.swtbot >> xtend -features/org.eclipse.xtend.gwt.feature >> xtend -features/org.eclipse.xtend.sdk.feature >> xtend -maven/org.eclipse.xtend.maven.android.archetype >> xtend -maven/org.eclipse.xtend.maven.archetype >> xtend -maven/org.eclipse.xtend.maven.plugin >> xtend - - -releng/org.eclipse.xtext.releng/.classpath >> eclipse -releng/org.eclipse.xtext.releng/.gitignore >> eclipse -releng/org.eclipse.xtext.releng/.project >> eclipse -releng/org.eclipse.xtext.releng/.settings >> eclipse -releng/org.eclipse.xtext.releng/META-INF/MANIFEST.MF >> eclipse -releng/org.eclipse.xtext.releng/api-baseline/.gitignore >> eclipse -releng/org.eclipse.xtext.releng/api-baseline/api-baseline.target >> eclipse -releng/org.eclipse.xtext.releng/api-baseline/readme.txt >> eclipse -releng/org.eclipse.xtext.releng/buckminster.cspec >> eclipse -releng/org.eclipse.xtext.releng/build.properties >> eclipse -releng/org.eclipse.xtext.releng/component.def >> eclipse -releng/org.eclipse.xtext.releng/distrobuilder >> eclipse -releng/org.eclipse.xtext.releng/findbugs >> eclipse -releng/org.eclipse.xtext.releng/generate xtext javadoc.launch >> eclipse -releng/org.eclipse.xtext.releng/javadoc.ant >> eclipse -releng/org.eclipse.xtext.releng/local-xtext-build.launch >> eclipse -releng/org.eclipse.xtext.releng/org.eclipse.xtext.releng javadoc.ant.launch >> eclipse -releng/org.eclipse.xtext.releng/plugin_customization.ini >> eclipse -releng/org.eclipse.xtext.releng/projectSet.psf >> eclipse -releng/org.eclipse.xtext.releng/promote.properties >> eclipse -releng/org.eclipse.xtext.releng/promoter.ant >> eclipse -releng/org.eclipse.xtext.releng/publisher.properties >> eclipse -releng/org.eclipse.xtext.releng/releng >> eclipse -releng/org.eclipse.xtext.releng/sonar >> eclipse -releng/org.eclipse.xtext.releng/target-platforms >> eclipse -releng/org.eclipse.xtext.core.parent >> eclipse -devtools/org.eclipse.xtext.contributor >> eclipse -features/org.eclipse.xtend.swtbot.tests.feature >> eclipse -features/org.eclipse.xtend.tests.feature >> eclipse -features/org.eclipse.xtext.build.feature >> eclipse -features/org.eclipse.xtext.docs.feature >> eclipse -features/org.eclipse.xtext.examples.feature >> eclipse -features/org.eclipse.xtext.gwt.feature >> eclipse -features/org.eclipse.xtext.license.feature >> eclipse -features/org.eclipse.xtext.redist.feature >> eclipse -features/org.eclipse.xtext.runtime.feature >> eclipse -features/org.eclipse.xtext.sdk.feature/.project >> eclipse -features/org.eclipse.xtext.sdk.feature/.settings >> eclipse -features/org.eclipse.xtext.sdk.feature/build.properties >> eclipse -features/org.eclipse.xtext.sdk.feature/feature.properties >> eclipse -features/org.eclipse.xtext.sdk.feature/feature.xml >> eclipse -features/org.eclipse.xtext.sdk.feature/p2.inf >> eclipse -features/org.eclipse.xtext.sdk.feature/pom.xml >> eclipse -features/org.eclipse.xtext.tests.feature >> eclipse -features/org.eclipse.xtext.ui.feature >> eclipse -features/org.eclipse.xtext.xbase.feature >> eclipse -features/org.eclipse.xtext.xbase.lib.feature >> eclipse -features/org.eclipse.xtext.xtext.ui.feature >> eclipse -docs/org.eclipse.xtext.doc >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/.classpath >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/.project >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/.settings >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/about.html >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/buckminster.cspec >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/build.properties >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/build.xml >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/component.def >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/contents >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/plugin.properties >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/META-INF >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/plugin.xml >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/.classpath >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/.gitignore >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/.project >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/.settings >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/META-INF >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/about.html >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/build.properties >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/icons >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/plugin.properties >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/plugin.xml >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/pom.xml >> eclipse -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/src >> eclipse -plugins/org.eclipse.xtext.activities >> eclipse -plugins/org.eclipse.xtext.builder >> eclipse -plugins/org.eclipse.xtext.common.types.edit >> eclipse -plugins/org.eclipse.xtext.common.types.shared >> eclipse -plugins/org.eclipse.xtext.common.types.shared.jdt38 >> eclipse -plugins/org.eclipse.xtext.common.types.ui >> eclipse -plugins/org.eclipse.xtext.compatibility.galileo >> eclipse -plugins/org.eclipse.xtext.logging >> eclipse -plugins/org.eclipse.xtext.m2e >> eclipse -plugins/org.eclipse.xtext.purexbase.ui >> eclipse -plugins/org.eclipse.xtext.ui >> eclipse -plugins/org.eclipse.xtext.ui.codetemplates >> eclipse -plugins/org.eclipse.xtext.ui.codetemplates.ui >> eclipse -plugins/org.eclipse.xtext.ui.ecore >> eclipse -plugins/org.eclipse.xtext.ui.shared >> eclipse -plugins/org.eclipse.xtext.xbase.junit >> eclipse -plugins/org.eclipse.xtext.xbase.ui >> eclipse -plugins/org.eclipse.xtext.xtext.ui >> eclipse -plugins/org.eclipse.xtext.xtext.ui.graph >> eclipse -tests/org.eclipse.xtext.builder.tests >> eclipse -tests/org.eclipse.xtext.testlanguages.ui >> eclipse -tests/org.eclipse.xtext.xbase.testlanguages.ui >> eclipse -tests/org.eclipse.xtext.ui.codetemplates.tests >> eclipse -tests/org.eclipse.xtext.ui.tests >> eclipse -tests/org.eclipse.xtext.xbase.ui.tests >> eclipse -tests/org.eclipse.xtext.xtext.ui.graph.tests >> eclipse -tests/org.eclipse.xtext.xtext.ui.tests >> eclipse -separate-builds/eclipse >> eclipse - - -separate-builds/idea >> idea -intellij/org.eclipse.xtext.core.idea.tests >> idea -intellij/org.eclipse.xtext.idea >> idea -intellij/org.eclipse.xtext.idea.common.types.tests >> idea -intellij/org.eclipse.xtext.idea.example.entities.idea >> idea -intellij/org.eclipse.xtext.idea.example.entities.tests >> idea -intellij/org.eclipse.xtext.idea.example.entities.ui >> idea -intellij/org.eclipse.xtext.idea.junit >> idea -intellij/org.eclipse.xtext.idea.sdomain >> idea -intellij/org.eclipse.xtext.idea.sdomain.idea >> idea -intellij/org.eclipse.xtext.idea.sdomain.idea.tests >> idea -intellij/org.eclipse.xtext.idea.sdomain.tests >> idea -intellij/org.eclipse.xtext.idea.sdomain.ui >> idea -intellij/org.eclipse.xtext.idea.tests >> idea -intellij/org.eclipse.xtext.purexbase.idea >> idea -intellij/org.eclipse.xtext.testlanguages.idea >> idea -intellij/org.eclipse.xtext.xbase.idea >> idea -intellij/org.eclipse.xtext.xbase.idea.tests >> idea -intellij/org.eclipse.xtext.xtext.idea >> idea -intellij/org.eclipse.xtext.xtext.idea.tests >> idea -intellij/.settings >> idea -intellij/.gitignore >> idea -intellij/.project >> idea -intellij/build.gradle >> idea -intellij/debug.idea.launch >> idea -intellij/refresh-gradle-dependencies-idea.launch >> idea - - -web/build.gradle >> web -web/.project >> web -web/.settings >> web -web/org.eclipse.xtext.web >> web -web/org.eclipse.xtext.web.example.jetty >> web -web/org.eclipse.xtext.web.example.statemachine >> web -web/org.eclipse.xtext.web.example.statemachine.ide >> web -web/org.eclipse.xtext.web.servlet >> web -web/org.eclipse.xtext.xbase.web >> web -web/refresh-gradle-dependencies-web.launch >> web -separate-builds/web >> web - -maven/org.eclipse.xtext.maven.plugin >> maven -maven/org.eclipse.xtext.xtext >> maven -separate-builds/maven >> maven - - - - -.DS_Store >> delete -.gitignore >> delete -.project >> delete -.settings >> delete -CONTRIBUTING >> delete -README.md >> delete -build.gradle >> delete -dummy.txt >> delete -gradle-app.setting >> delete -gradle.ant >> delete -gradle.properties >> delete -gradlew >> delete -gradlew.bat >> delete -hover.patch.txt >> delete -org.eclipse.core.resources.prefs >> delete -org.eclipse.core.runtime.prefs >> delete -org.eclipse.jdt.core.prefs >> delete -org.eclipse.jdt.launching.prefs >> delete -org.eclipse.jdt.ui.prefs >> delete -org.eclipse.xtend.core.Xtend.prefs >> delete -settings.gradle >> delete -test.txt >> delete - -develop >> delete -gradle >> delete -jenkins >> delete -website >> delete -xtext-website >> delete -xtext.website.generator >> delete -website-xtend >> delete -xtend-website >> delete -xtend.website.generator >> delete - -devtools/com.rcpquickstart.bundletestcollector >> delete -devtools/org.eclipse.xtext.reference >> delete -devtools/org.eclipse.xtext.reference.ui >> delete -devtools/org.eclipse.xtext.testcollector >> delete -devtools/org.eclipse.xtext.bootstrap >> delete -devtools/org.eclipse.xtext.language-generator >> delete - -docs/images >> delete -docs/org.xtext.sevenlanguages.doc.xdoc >> delete -docs/org.eclipse.xtend.bootstrapdoc >> delete -docs/org.eclipse.xtend.doc.xdoc >> delete -docs/gen_toc.jar >> delete -docs/org.eclipse.xtext.doc.xdoc >> delete - -maven/.settings >> delete -maven/build.gradle >> delete -maven/mvnw >> delete -maven/mvnw.bat >> delete -maven/wrapper >> delete -maven/org.eclipse.xtext.xbase.lib.slim >> delete -maven/org.eclipse.xtend.core >> delete -maven/org.eclipse.xtend.ide.common >> delete -maven/org.eclipse.xtext >> delete -maven/org.eclipse.xtext.common.types >> delete -maven/org.eclipse.xtext.dependencies >> delete -maven/org.eclipse.xtext.ide >> delete -maven/org.eclipse.xtext.standalone.parent >> delete -maven/org.eclipse.xtext.xbase >> delete - -plugins/org.eclipse.xtext.core >> delete -plugins/org.eclipse.xtext.maven.plugin >> delete -plugins/org.eclipse.xtext.standalone.maven >> delete -plugins/.settings >> delete -plugins/build.gradle >> delete -plugins/com.google.collect >> delete -plugins/com.google.guava >> delete -plugins/com.google.guice >> delete -plugins/com.google.inject >> delete -plugins/images >> delete -plugins/org.antlr.gen >> delete -plugins/org.antlr.runtime >> delete -plugins/org.apache.log4j >> delete -plugins/org.eclipse.emf.index >> delete -plugins/org.eclipse.emf.index.ui >> delete -plugins/org.eclipse.xtext.doc.manual >> delete -plugins/org.eclipse.xtext.generator.parser >> delete -plugins/org.eclipse.xtext.index >> delete -plugins/org.eclipse.xtext.xtend2.lib >> delete -plugins/org.eclipse.xtend2.lib >> delete -plugins/org.eclipse.xtend.bootstrapdoc >> delete -plugins/org.eclipse.xtext.xtend2.bootstrapdoc >> delete -plugins/org.eclipse.xtend.doc >> delete -plugins/org.eclipse.xtend.doc.xdoc >> delete -plugins/org.eclipse.xtend.gradle.plugin >> delete -plugins/org.eclipse.xtend.macro >> delete -plugins/org.eclipse.xtend.macro.lang >> delete -plugins/org.eclipse.xtend.macro.lang.tests >> delete -plugins/org.eclipse.xtend.macro.lang.ui >> delete -plugins/org.eclipse.xtend.maven >> delete -plugins/org.eclipse.xtend.maven.android.archetype >> delete -plugins/org.eclipse.xtend.maven.archetype >> delete -plugins/org.eclipse.xtend.xdoc >> delete -plugins/org.eclipse.xtext.xtend >> delete -plugins/org.eclipse.xtext.xtend2 >> delete -plugins/org.eclipse.xtext.xtend2.doc >> delete -plugins/org.eclipse.xtext.xtend2.m2e >> delete -plugins/org.eclipse.xtext.xtend2.ui >> delete -plugins/org.eclipse.xtend.maven.plugin >> delete -plugins/org.eclipse.xtend.standalone.maven >> delete -plugins/org.eclipse.xtend2.lib.maven >> delete -plugins/org.eclipse.xtend2.maven.plugin >> delete -plugins/org.eclipse.xtend2.standalone.maven >> delete -plugins/org.eclipse.xtext.xtend2.maven >> delete -plugins/org.eclipse.xtext.xtend2.standalone >> delete -plugins/org.eclipse.xtext.xtend2.standalone.maven >> delete -plugins/org.eclipse.xtext.common.ui >> delete -plugins/org.eclipse.xtext.doc >> delete -plugins/org.eclipse.xtext.doc.xdoc >> delete -plugins/org.eclipse.xtext.gmf.glue >> delete -plugins/org.eclipse.xtext.graphviewer.ui >> delete -plugins/org.eclipse.xtext.junit >> delete -plugins/org.eclipse.xtext.log4j >> delete -plugins/org.eclipse.xtext.preference >> delete -plugins/org.eclipse.xtext.service >> delete -plugins/org.eclipse.xtext.service.ui >> delete -plugins/org.eclipse.xtext.ui.builtin >> delete -plugins/org.eclipse.xtext.ui.common >> delete -plugins/org.eclipse.xtext.ui.common.xtend >> delete -plugins/org.eclipse.xtext.ui.core >> delete -plugins/org.eclipse.xtext.ui.generator >> delete -plugins/org.eclipse.xtext.ui.junit >> delete -plugins/org.eclipse.xtext.wikitext.core >> delete -plugins/org.eclipse.xtext.wizard >> delete -plugins/org.eclipse.xtext.xbase.doc >> delete -plugins/org.eclipse.xtend.lib.maven >> delete -plugins/org.eclipse.xtext.xbase.lib.maven >> delete - -separate-builds/.project >> delete - -tests/.settings >> delete -tests/build.gradle >> delete -tests/org.eclipse.emf.index.tests >> delete -tests/org.eclipse.emf.index.ui.tests >> delete -tests/org.eclipse.xtend.ide.tests.data >> delete -tests/org.eclipse.xtend.macro.lang.tests >> delete -tests/org.eclipse.xtend.standalone.tests >> delete -tests/org.eclipse.xtext.xtend.tests >> delete -tests/org.eclipse.xtext.xtend2.standalone.tests >> delete -tests/org.eclipse.xtext.xtend2.tests >> delete -tests/org.eclipse.xtext.xtend2.ui.tests >> delete -tests/org.eclipse.xtext.automated.tests >> delete -tests/org.eclipse.xtext.example.domainmodel.ui.tests >> delete -tests/org.eclipse.xtext.index.tests >> delete -tests/org.eclipse.xtext.preference.tests >> delete -tests/org.eclipse.xtext.service.tests >> delete -tests/org.eclipse.xtext.service.ui.tests >> delete -tests/org.eclipse.xtext.ui.common.tests >> delete -tests/org.eclipse.xtext.ui.core.tests >> delete -tests/org.eclipse.xtext.wikitext.tests >> delete -tests/org.eclipse.xtext.ui.integration.tests >> delete -tests/org.eclipse.xtext.common.types.test >> delete - -features/org.eclipse.emf.index.feature >> delete -features/org.eclipse.xtend.build.feature >> delete -features/org.eclipse.xtend.feature >> delete -features/org.eclipse.xtend.m2e.feature >> delete -features/org.eclipse.xtext.m2e.feature >> delete -features/org.eclipse.xtext.site.feature >> delete -features/org.eclipse.xtext.xtend2.m2e.feature >> delete -features/org.eclipse.xtext.xtend2.sdk.feature >> delete -features/org.eclipse.xtext.sdk.feature/about.ini >> delete -features/org.eclipse.xtext.sdk.feature/about.mappings >> delete -features/org.eclipse.xtext.sdk.feature/about.properties >> delete -features/org.eclipse.xtext.sdk.feature/modeling32.png >> delete -features/org.eclipse.xtext.sdk.feature/license.html >> delete -features/org.eclipse.xtext.sdk.feature/about.html >> delete -features/org.eclipse.xtext.sdk.feature/sourceTemplatePlugin >> delete -features/org.eclipse.xtext.sdk.feature/sourceTemplateFeature >> delete -features/org.eclipse.xtext.sdk.feature/sourceTemplateBundle >> delete -features/org.eclipse.xtext.sdk.feature/features >> delete -features/org.eclipse.xtext.sdk.feature/plugins >> delete -features/org.eclipse.xtext.sdk.feature/epl-v10.html >> delete -features/org.eclipse.xtext.sdk.feature/rootfiles >> delete - -examples/org.eclipse.xtext.example.domainmodel >> delete -examples/org.eclipse.xtext.example.domainmodel.ui >> delete -examples/org.eclipse.xtext.example.ecoredsl >> delete -examples/org.eclipse.xtext.example.ecoredsl.ui >> delete -examples/org.eclipse.xtext.example.fowlerdsl >> delete -examples/org.eclipse.xtext.example.fowlerdsl.ui >> delete -examples/org.eclipse.xtend.examples/contents >> delete -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtext.ui.examples/contents >> delete -examples/org.eclipse.xtext.xtext.ui.examples/jax2012-xtext-tutorial.zip >> delete -examples/org.eclipse.xtext.xtext.ui.examples/org.eclipse.xtext.xtend2.ui.examples >> delete -examples/org.eclipse.xtext.xtext.ui.examples/icons >> delete - -intellij/refresh-gradle-dependencies.launch >> delete -intellij/buildSrc >> delete -intellij/gradle >> delete -intellij/gradle.ant >> delete -intellij/updatePlugins.xml >> delete -intellij/org.eclipse.xtext.idea.plugin >> delete -intellij/PsiViewer__1_.jar >> delete -intellij/prepareIntellij.gradle >> delete -intellij/gradlew >> delete -intellij/gradlew.bat >> delete -intellij/settings.gradle >> delete -intellij/intellij-dependencies >> delete -intellij/org.eclipse.xtext.idea.all >> delete -intellij/org.eclipse.xtext.idea.builder >> delete -intellij/org.eclipse.xtext.idea.builder.tests >> delete -intellij/org.eclipse.xtext.idea.common.types.RefactoringTestLanguage >> delete -intellij/org.eclipse.xtext.xtex.idea >> delete -intellij/org.xtext.idea >> delete -intellij/org.xtext.idea.all >> delete -intellij/org.xtext.idea.builder >> delete -intellij/org.xtext.idea.generator >> delete -intellij/org.xtext.idea.sdomain >> delete -intellij/org.xtext.idea.sdomain.idea >> delete -intellij/org.xtext.idea.sdomain.idea.tests >> delete -intellij/org.xtext.idea.sdomain.tests >> delete -intellij/org.xtext.idea.sdomain.ui >> delete - -web/refresh-gradle-dependencies.launch >> delete -web/org.eclipse.xtext.web.example.statemachine.web >> delete -web/org.eclipse.xtext.web.generator >> delete - - -releng/org.eclipse.xtend.releng >> delete -releng/org.eclipse.xtext.pom.modifier >> delete -releng/org.eclipse.xtext.releng/Install buckminster headless.launch >> delete -releng/org.eclipse.xtext.releng/META-INF/CVS >> delete -releng/org.eclipse.xtext.releng/api-baseline/runtime_2.0.0_M6 >> delete -releng/org.eclipse.xtext.releng/api-baseline/runtime_2.0.0_M7 >> delete -releng/org.eclipse.xtext.releng/api-baseline/runtime_2.0.0_final >> delete -releng/org.eclipse.xtext.releng/api-baseline/runtime_2.1.0_final >> delete -releng/org.eclipse.xtext.releng/api-baseline/runtime_2.2.1 >> delete -releng/org.eclipse.xtext.releng/bin >> delete -releng/org.eclipse.xtext.releng/lib >> delete -releng/org.eclipse.xtext.releng/src >> delete -releng/org.eclipse.xtext.releng/statistics >> delete -releng/org.eclipse.xtext.releng/team >> delete -releng/DELETE.ME >> delete -releng/MOVED_TO_org.eclipse.xtext.releng >> delete -releng/.classpath >> delete -releng/.project >> delete -releng/.settings >> delete -releng/LOCAL_WORKSPACE_SETUP.txt >> delete -releng/META-INF >> delete -releng/build-local-macosx.properties >> delete -releng/build-local.properties >> delete -releng/build.properties >> delete -releng/build.xml >> delete -releng/hudson >> delete -releng/libs >> delete -releng/maps >> delete -releng/team >> delete -releng/promote.properties >> delete -releng/testing.properties >> delete diff --git a/splitting/src/org/eclipse/xtext/splitting/FindProjects.java b/splitting/src/org/eclipse/xtext/splitting/FindProjects.java deleted file mode 100644 index e685c5fe7..000000000 --- a/splitting/src/org/eclipse/xtext/splitting/FindProjects.java +++ /dev/null @@ -1,168 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 TypeFox GmbH (http://www.typefox.io) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -package org.eclipse.xtext.splitting; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.FileWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class FindProjects { - - public static final String ALL_FILES = "all-files.txt"; - public static final String ALL_PROJECTS = "all-projects.txt"; - public static final String UNMAPPED_PATHS = "unmapped-paths.txt"; - - public static void main(String[] args) { - if (args.length != 1) { - fail("Expected path to output files as argument."); - } - String outputDir = args[0]; - try { - final Directory root = new Directory(".", null); - try (BufferedReader reader = new BufferedReader(new FileReader(outputDir + "/" + ALL_FILES))) { - // Gather all paths in a directory structure - String line; - while ((line = reader.readLine()) != null) { - String[] segments = line.split("/"); - DirectoryEntry current = root; - for (int i = 0; i < segments.length; i++) { - String segment = segments[i].replaceAll("\"|\\\\.", ""); - if (!segment.isEmpty() && current instanceof Directory) { - Directory currentDir = (Directory) current; - if (currentDir.entries.containsKey(segment)) - current = currentDir.entries.get(segment); - else { - DirectoryEntry newEntry; - if (i == segments.length - 1) - newEntry = new DirectoryEntry(segment, currentDir); - else - newEntry = new Directory(segment, currentDir); - currentDir.entries.put(segment, newEntry); - current = newEntry; - } - } - } - } - } - - // Find the projects and unmapped paths that are relevant for the repository history - final List projects = new ArrayList<>(); - final List otherPaths = new ArrayList<>(); - findProjects(root, projects, otherPaths, false); - - // Write the collected projects into a file - Collections.sort(projects); - try (FileWriter writer = new FileWriter(outputDir + "/" + ALL_PROJECTS)) { - for (Directory project : projects) { - writer.write(project.toString()); - writer.write('\n'); - } - } - - // Write the unmapped paths into another file - Collections.sort(otherPaths); - try (FileWriter writer = new FileWriter(outputDir + "/" + UNMAPPED_PATHS)) { - for (DirectoryEntry path : otherPaths) { - writer.write(path.toString()); - writer.write('\n'); - } - } - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - - private static void fail(String message) { - System.err.print("ERROR: "); - System.err.println(message); - System.exit(1); - } - - private static boolean findProjects(Directory dir, List projects, List otherPaths, boolean skipOtherPaths) { - boolean containsProject = dir.parent != null && dir.entries.values().stream().anyMatch((e) -> e.name.equals(".project")); - if (containsProject) { - projects.add(dir); - skipOtherPaths = true; - } - Set subDirsWithProjects = new HashSet<>(); - for (DirectoryEntry entry : dir.entries.values()) { - if (entry instanceof Directory) { - Directory subDir = (Directory) entry; - if (findProjects(subDir, projects, otherPaths, skipOtherPaths)) - subDirsWithProjects.add(subDir); - } - } - if (!skipOtherPaths && !subDirsWithProjects.isEmpty()) { - for (DirectoryEntry entry : dir.entries.values()) { - if (!subDirsWithProjects.contains(entry)) - otherPaths.add(entry); - } - } - return containsProject || !subDirsWithProjects.isEmpty(); - } - - private static class DirectoryEntry implements Comparable { - final String name; - final Directory parent; - - DirectoryEntry(String name, Directory parent) { - this.name = name; - this.parent = parent; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof Directory) { - Directory other = (Directory) obj; - return this.parent == other.parent && this.name.equals(other.name); - } - return false; - } - - @Override - public int hashCode() { - if (parent == null) - return name.hashCode(); - else - return parent.hashCode() * 7 + name.hashCode(); - } - - @Override - public int compareTo(DirectoryEntry other) { - if (this.parent == other.parent) - return this.name.compareTo(other.name); - else - return this.toString().compareTo(other.toString()); - } - - @Override - public String toString() { - if (parent == null || parent.parent == null) - return name; - else - return parent.toString() + "/" + name; - } - } - - private static class Directory extends DirectoryEntry { - final Map entries = new HashMap<>(); - - Directory(String name, Directory parent) { - super(name, parent); - } - } - -} diff --git a/splitting/src/org/eclipse/xtext/splitting/GenerateRemovals.java b/splitting/src/org/eclipse/xtext/splitting/GenerateRemovals.java deleted file mode 100644 index ad3dc7602..000000000 --- a/splitting/src/org/eclipse/xtext/splitting/GenerateRemovals.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 TypeFox GmbH (http://www.typefox.io) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -package org.eclipse.xtext.splitting; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.FileWriter; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class GenerateRemovals { - - public static final Set REMOVE_DIRS = Collections.unmodifiableSet(new LinkedHashSet<>(Arrays.asList( - "bin", "src-gen", "xtend-gen", "xtext-gen", "emf-gen" - ))); - - public static void main(String[] args) { - if (args.length != 2) { - fail("Expected paths to splitting.txt and output files as arguments."); - } - String outputDir = args[1]; - try { - final Map> removalPaths = new HashMap<>(); - for (String targetRepo : ValidateSplitting.REPOSITORIES) { - removalPaths.put(targetRepo, new LinkedHashSet<>()); - } - - // Gather paths to be removed from the history for each target repository - try (BufferedReader reader = new BufferedReader(new FileReader(args[0]))) { - String line; - while ((line = reader.readLine()) != null) { - if (!line.isEmpty()) { - String[] parts = line.split(">>"); - String[] repos = parts[1].split(","); - for (String targetRepo : ValidateSplitting.REPOSITORIES) { - boolean isInTargetRepo = false; - for (String repo : repos) { - if (targetRepo.equals(repo.trim())) { - isInTargetRepo = true; - break; - } - } - if (!isInTargetRepo) { - String path = parts[0].trim(); - removalPaths.get(targetRepo).add(path); - } - } - } - } - } - - // Add directories with generated code to the removal list - final Pattern segmentPattern = Pattern.compile("/"); - try (BufferedReader reader = new BufferedReader(new FileReader(outputDir + "/" + FindProjects.ALL_FILES))) { - String line; - while ((line = reader.readLine()) != null) { - String file = line.replaceAll("\"|\\\\.", ""); - for (String genDir : REMOVE_DIRS) { - int genDirIndex = file.indexOf("/" + genDir + "/"); - if (genDirIndex >= 0) { - for (String targetRepo : ValidateSplitting.REPOSITORIES) { - Set repoRemovals = removalPaths.get(targetRepo); - Matcher matcher = segmentPattern.matcher(file); - boolean foundRemoval = false; - int genDirEndIndex = genDirIndex + genDir.length() + 1; - while (!foundRemoval && matcher.find() && matcher.start() <= genDirEndIndex) { - if (repoRemovals.contains(file.substring(0, matcher.start()))) - foundRemoval = true; - } - if (!foundRemoval) - repoRemovals.add(file.substring(0, genDirEndIndex)); - } - } - } - } - } - - // Write a removal list for each target repository - for (String targetRepo : ValidateSplitting.REPOSITORIES) { - try (FileWriter writer = new FileWriter(outputDir + "/removals-" + targetRepo + ".txt")) { - for (String path : removalPaths.get(targetRepo)) { - writer.write(path); - writer.write('\n'); - } - } - } - - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - - private static void fail(String message) { - System.err.print("ERROR: "); - System.err.println(message); - System.exit(1); - } - -} diff --git a/splitting/src/org/eclipse/xtext/splitting/ValidateSplitting.java b/splitting/src/org/eclipse/xtext/splitting/ValidateSplitting.java deleted file mode 100644 index 4bac89257..000000000 --- a/splitting/src/org/eclipse/xtext/splitting/ValidateSplitting.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 TypeFox GmbH (http://www.typefox.io) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -package org.eclipse.xtext.splitting; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class ValidateSplitting { - - public static final Set REPOSITORIES = Collections.unmodifiableSet(new LinkedHashSet<>(Arrays.asList( - "core", "extras", "lib", "xtend", "eclipse", "idea", "web", "maven" - ))); - - public static final String DELETE = "delete"; - - public static void main(String[] args) { - if (args.length != 2) { - fail("Expected paths to splitting.txt and output files as arguments."); - } - String outputDir = args[1]; - try { - - // Validate repositories and gather all paths from the splitting file - final Set specifiedPaths = new HashSet<>(); - try (BufferedReader reader = new BufferedReader(new FileReader(args[0]))) { - String line; - while ((line = reader.readLine()) != null) { - if (!line.isEmpty()) { - String[] parts = line.split(">>"); - if (parts.length != 2) - fail("Invalid line: " + line); - if (!DELETE.equals(parts[1].trim())) { - String[] repos = parts[1].split(","); - if (repos.length == 0) - fail("Invalid line: " + line); - for (String repo : repos) { - String trimmed = repo.trim(); - if (!REPOSITORIES.contains(trimmed)) - fail("Invalid repository: " + trimmed); - } - } - String path = parts[0].trim(); - if (!specifiedPaths.add(path)) - fail("Path has ambiguous specification: " + path); - } - } - } - - // Check whether any path has an ambiguous specification - final Pattern segmentPattern = Pattern.compile("/"); - for (String path : specifiedPaths) { - Matcher matcher = segmentPattern.matcher(path); - while (matcher.find()) { - if (specifiedPaths.contains(path.substring(0, matcher.start()))) - fail("Path has ambiguous specification: " + path); - } - } - - // Check whether each file has a specified path as prefix - try (BufferedReader reader = new BufferedReader(new FileReader(outputDir + "/" + FindProjects.ALL_FILES))) { - String line; - while ((line = reader.readLine()) != null) { - if (!line.isEmpty()) { - String file = line.replaceAll("\"|\\\\.", ""); - if (!specifiedPaths.contains(file)) { - Matcher matcher = segmentPattern.matcher(file); - boolean foundSplitting = false; - while (!foundSplitting && matcher.find()) { - if (specifiedPaths.contains(file.substring(0, matcher.start()))) - foundSplitting = true; - } - if (!foundSplitting) - fail("File not covered by splitting: " + file); - } - } - } - } - - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - - private static void fail(String message) { - System.err.print("ERROR: "); - System.err.println(message); - System.exit(1); - } - -} diff --git a/tests/org.eclipse.xtext.junit4.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.xtext.junit4.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 3a2153707..000000000 --- a/tests/org.eclipse.xtext.junit4.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8