diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml index 515d8174afc..bc8aed21404 100644 --- a/assembly/assembly-wsagent-war/pom.xml +++ b/assembly/assembly-wsagent-war/pom.xml @@ -94,11 +94,6 @@ org.eclipse.che.lib che-swagger-module - - org.eclipse.che.plugin - che-jdt-ext-machine - jar - org.eclipse.che.plugin che-plugin-cpp-lang-server diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/pom.xml deleted file mode 100644 index 026a540fccb..00000000000 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/pom.xml +++ /dev/null @@ -1,350 +0,0 @@ - - - - 4.0.0 - - che-plugin-java-ext-jdt-parent - org.eclipse.che.plugin - 4.3.0-RC1-SNAPSHOT - - che-jdt-ext-machine - jar - Che Plugin :: Java :: Extension Machine JDT - - - com.google.code.gson - gson - - - com.google.guava - guava - - - com.google.inject - guice - - - javax.inject - javax.inject - - - javax.validation - validation-api - - - javax.ws.rs - javax.ws.rs-api - - - org.eclipse.birt.runtime - org.eclipse.equinox.common - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-model - - - org.eclipse.che.core - che-core-api-project - - - org.eclipse.che.core - che-core-commons-inject - - - org.eclipse.che.core - che-core-commons-lang - - - org.eclipse.che.core - che-core-commons-schedule - - - org.eclipse.che.plugin - che-plugin-java-ext-lang-shared - - - org.eclipse.che.plugin - che-plugin-java-jdt-core-repack - - - org.eclipse.jdt.core - org.eclipse.tycho - - - - - org.eclipse.che.plugin - org.eclipse.core.filebuffers - - - org.eclipse.che.plugin - org.eclipse.core.resources - - - org.eclipse.che.plugin - org.eclipse.jdt.ui - - - org.eclipse.che.plugin - org.eclipse.jface - - - org.eclipse.che.plugin - org.eclipse.jface.text - - - org.eclipse.che.plugin - org.eclipse.ltk.core.refactoring - - - org.eclipse.che.plugin - org.eclipse.search - - - org.eclipse.equinox - preferences - - - org.eclipse.search - org.eclipse.search - - - org.eclipse.text - org.eclipse.text - - - org.eclipse.equinox.common - org.eclipse.equinox - - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - test - - - junit - junit - test - - - org.easytesting - fest-assert - test - - - org.eclipse.che.core - che-core-api-workspace - test - - - org.eclipse.che.core - che-core-commons-env - test - - - org.eclipse.che.plugin - org.eclipse.ui.ide - test - - - org.everrest - everrest-integration-guice - test - - - org.mockito - mockito-core - test - - - - src/main/java - src/test/java - target/classes - - - src/main/resources - - - - - src/test/resources - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-tomcat-libs - process-resources - - copy - - - - - com.google.gwt - gwt-user - ${com.google.gwt.version} - ${project.build.testOutputDirectory}/temp/ws/test - gwt-user.jar - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.surefire - surefire-junit47 - ${version.surefire.plugin} - - - - random - - **/jdt/**/*.java - - - - - com.mycila - license-maven-plugin - - - **/*.svg - **/*.png - **/*.gif - **/*.rscjson - **/*.zip - **/*.txt - **/*.jpg - **/*.rsc - **/*.json - **/readableNames - **/RenameMethodInInterface/** - **/RenameNonPrivateField/** - **/RenamePackage/** - **/RenameParameters/** - **/RenamePrivateField/** - **/RenamePrivateMethod/** - **/RenameStaticMethod/** - **/RenameTests18/** - **/RenameType/** - **/RenameTypeParameter/** - **/RenameVirtualMethodInClass/** - **/projects/** - **/org/eclipse/che/jdt/javadoc/** - **/org/eclipse/che/jface/** - **/org/eclipse/che/jdt/internal/codeassist/** - **/org/eclipse/core/** - **/org/eclipse/search/** - **/org/eclipse/ltk/** - **/org/eclipse/che/jdt/core/** - **/org/eclipse/che/jdt/dom/** - **/org/eclipse/che/jdt/corext/util/** - **/org/eclipse/che/jdt/util/** - **/org/eclipse/che/core/** - **/org/eclipse/che/ltk/** - **/org/eclipse/che/jdt/** - **/org/eclipse/che/jdt/internal/core/** - **/org/eclipse/che/jdt/core/launching/IVMInstallType.java - **/org/eclipse/che/jdt/core/launching/JREContainer.java - **/org/eclipse/che/jdt/core/launching/LibraryInfo.java - **/org/eclipse/che/jdt/core/launching/LibraryLocation.java - **/org/eclipse/che/jdt/core/launching/StandardVMType.java - **/org/eclipse/che/jdt/core/search/** - **/org/eclipse/che/jdt/format/** - **/org/eclipse/che/jdt/internal/core/builder/** - **/org/eclipse/che/jdt/internal/core/search/indexing/** - **/org/eclipse/che/jdt/internal/core/search/matching/** - **/org/eclipse/che/jdt/internal/core/search/processing/JobManager.java - **/org/eclipse/che/jdt/internal/core/search/AbstractJavaSearchScope.java - **/org/eclipse/che/jdt/internal/core/search/AbstractSearchScope.java - **/org/eclipse/che/jdt/internal/core/search/BasicSearchEngine.java - **/org/eclipse/che/jdt/internal/core/search/HierarchyScope.java - **/org/eclipse/che/jdt/internal/core/search/IndexQueryRequestor.java - **/org/eclipse/che/jdt/internal/core/search/IndexSelector.java - **/org/eclipse/che/jdt/internal/core/search/IRestrictedAccessConstructorRequestor.java - **/org/eclipse/che/jdt/internal/core/search/IRestrictedAccessTypeRequestor.java - **/org/eclipse/che/jdt/internal/core/search/JavaSearchDocument.java - **/org/eclipse/che/jdt/internal/core/search/JavaSearchParticipant.java - **/org/eclipse/che/jdt/internal/core/search/JavaSearchScope.java - **/org/eclipse/che/jdt/internal/core/search/JavaSearchTypeNameMatch.java - **/org/eclipse/che/jdt/internal/core/search/JavaWorkspaceScope.java - **/org/eclipse/che/jdt/internal/core/search/PathCollector.java - **/org/eclipse/che/jdt/internal/core/search/PatternSearchJob.java - **/org/eclipse/che/jdt/internal/core/search/StringOperation.java - **/org/eclipse/che/jdt/internal/core/search/SubTypeSearchJob.java - **/org/eclipse/che/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java - **/org/eclipse/che/jdt/internal/core/search/TypeNameRequestorWrapper.java - **/org/eclipse/che/jdt/internal/core/util/** - **/org/eclipse/che/jdt/internal/core/ClasspathEntry.java - **/org/eclipse/che/text/test/Accessor.java - **/org/eclipse/che/jdt/internal/corext/CorextMessages.properties - - - - - - - - jdt-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.surefire - surefire-junit47 - ${version.surefire.plugin} - - - - - none - - - **/jdt/**/*.java - - - - - - - - diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/junit381-noUI-src.zip b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/junit381-noUI-src.zip deleted file mode 100644 index 125b3c90992..00000000000 Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/junit381-noUI-src.zip and /dev/null differ diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs15.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs15.jar deleted file mode 100644 index 32f3eee37b3..00000000000 Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs15.jar and /dev/null differ diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs16.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs16.jar deleted file mode 100644 index 28269fb57ec..00000000000 Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs16.jar and /dev/null differ diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs17.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs17.jar deleted file mode 100644 index 9c5c3acbda2..00000000000 Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs17.jar and /dev/null differ diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs18.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs18.jar deleted file mode 100644 index 225d910051d..00000000000 Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs18.jar and /dev/null differ diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml index ee3c4ce25bf..57eccf4b378 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml @@ -32,6 +32,5 @@ che-plugin-java-jdt-core-repack org-eclipse-jdt-ui org-eclipse-ltk-core-refactoring - che-jdt-ext-machine diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java index 71a90f2eed2..5b802c3e5ed 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java @@ -45,7 +45,7 @@ public class JavaClasspathServiceClientImpl implements JavaClasspathServiceClien protected JavaClasspathServiceClientImpl(AppContext appContext, WsAgentStateController wsAgentStateController) { this.wsAgentStateController = wsAgentStateController; - this.baseHttpUrl = "/jdt/"; + this.baseHttpUrl = "/java/"; } /** {@inheritDoc} */ diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java index 22c1741d437..99e0bfea660 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java @@ -56,7 +56,7 @@ public void showDocumentation() { TextEditorPresenter editor = ((TextEditorPresenter)activeEditor); int offset = editor.getCursorOffset(); final PositionConverter.PixelCoordinates coordinates = editor.getPositionConverter().offsetToPixel(offset); - view.show(appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/javadoc/find?fqn=" + + view.show(appContext.getDevMachine().getWsAgentBaseUrl() + "/java/javadoc/find?fqn=" + JavaSourceFolderUtil.getFQNForFile(editor.getEditorInput().getFile()) + "&projectpath=" + appContext.getCurrentProject().getProjectConfig().getPath() + "&offset=" + offset, coordinates.getX(), coordinates.getY()); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java index fcdb5c14768..053aa8e11e0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java @@ -62,14 +62,14 @@ public JavaCodeAssistClient(DtoUnmarshallerFactory unmarshallerFactory, } public void computeProposals(String projectPath, String fqn, int offset, String contents, AsyncRequestCallback callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/completion" + "/?projectpath=" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/completion" + "/?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset; asyncRequestFactory.createPostRequest(url, null).data(contents).send(callback); } public void computeAssistProposals(String projectPath, String fqn, int offset, List problems, AsyncRequestCallback callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/assist" + "/?projectpath=" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/assist" + "/?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset; List prob = new ArrayList<>(); prob.addAll(problems); @@ -78,7 +78,7 @@ public void computeAssistProposals(String projectPath, String fqn, int offset, L public void applyProposal(String sessionId, int index, boolean insert, final AsyncCallback callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/apply/completion/?sessionid=" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/apply/completion/?sessionid=" + sessionId + "&index=" + index + "&insert=" + insert; Unmarshallable unmarshaller = unmarshallerFactory.newUnmarshaller(ProposalApplyResult.class); @@ -96,7 +96,7 @@ protected void onFailure(Throwable throwable) { } public String getProposalDocUrl(int id, String sessionId) { - return appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/info?sessionid=" + sessionId + + return appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/info?sessionid=" + sessionId + "&index=" + id; } @@ -146,7 +146,7 @@ public List apply(List arg) throws FunctionException { */ public Promise> organizeImports(String projectPath, String fqn) { String url = appContext.getDevMachine().getWsAgentBaseUrl() + - "/jdt/code-assist/organize-imports?projectpath=" + projectPath + + "/java/code-assist/organize-imports?projectpath=" + projectPath + "&fqn=" + fqn; return asyncRequestFactory.createPostRequest(url, null) @@ -164,7 +164,7 @@ public Promise> organizeImports(String projectPath, Stri */ public Promise applyChosenImports(String projectPath, String fqn, ConflictImportDTO chosen) { String url = appContext.getDevMachine().getWsAgentBaseUrl() + - "/jdt/code-assist/apply-imports?projectpath=" + projectPath + + "/java/code-assist/apply-imports?projectpath=" + projectPath + "&fqn=" + fqn; return asyncRequestFactory.createPostRequest(url, chosen) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java index 8e9ab26181c..2c1ebd3d450 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java @@ -40,7 +40,7 @@ public JavaReconcileClient(DtoUnmarshallerFactory dtoUnmarshallerFactory, } public void reconcile(String projectPath, String fqn, final ReconcileCallback callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/reconcile/?projectpath=" + projectPath + "&fqn=" + fqn; + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/reconcile/?projectpath=" + projectPath + "&fqn=" + fqn; asyncRequestFactory.createGetRequest(url) .send(new AsyncRequestCallback(dtoUnmarshallerFactory.newUnmarshaller(ReconcileResult.class)) { @Override diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java index a374ce88e3b..d6efb576c41 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java @@ -62,34 +62,34 @@ public JavaNavigationServiceImpl(AppContext appContext, @Override public void findDeclaration(String projectPath, String fqn, int offset, AsyncRequestCallback callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/find-declaration" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/find-declaration" + "?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset; requestFactory.createGetRequest(url).send(callback); } public void getExternalLibraries(String projectPath, AsyncRequestCallback> callback) { String url = - appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/libraries?projectpath=" + projectPath; + appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/libraries?projectpath=" + projectPath; requestFactory.createGetRequest(url).send(callback); } @Override public void getLibraryChildren(String projectPath, int libId, AsyncRequestCallback> callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/lib/children" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/lib/children" + "?projectpath=" + projectPath + "&root=" + libId; requestFactory.createGetRequest(url).send(callback); } @Override public void getChildren(String projectPath, int libId, String path, AsyncRequestCallback> callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/children" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/children" + "?projectpath=" + projectPath + "&root=" + libId + "&path=" + path; requestFactory.createGetRequest(url).send(callback); } @Override public void getEntry(String projectPath, int libId, String path, AsyncRequestCallback callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/entry" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/entry" + "?projectpath=" + projectPath + "&root=" + libId + "&path=" + path; requestFactory.createGetRequest(url).send(callback); } @@ -103,14 +103,14 @@ public void getContent(String projectPath, int libId, String path, AsyncRequestC @Override public void getContent(String projectPath, String fqn, AsyncRequestCallback callback) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/contentbyfqn?projectpath=" + projectPath + "&fqn=" + fqn; + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/contentbyfqn?projectpath=" + projectPath + "&fqn=" + fqn; requestFactory.createGetRequest(url).send(callback); } /** {@inheritDoc} */ @Override public Promise getCompilationUnit(String projectPath, String fqn, boolean showInherited) { - final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/compilation-unit" + + final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/compilation-unit" + "?projectpath=" + projectPath + "&fqn=" + fqn + "&showinherited=" + showInherited; return newPromise(new AsyncPromiseHelper.RequestCall() { @@ -125,7 +125,7 @@ public void makeCall(AsyncCallback callback) { @Override public Promise getImplementations(String projectPath, String fqn, int offset) { - final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/implementations" + + final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/implementations" + "?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset; return requestFactory.createGetRequest(url) @@ -136,7 +136,7 @@ public Promise getImplementations(String projectPa @Override public Promise> getProjectsAndPackages(boolean includePackage) { - final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/get/projects/and/packages" + final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/get/projects/and/packages" + "?includepackages=" + includePackage; return newPromise(new AsyncPromiseHelper.RequestCall>() { @@ -153,13 +153,13 @@ public void makeCall(AsyncCallback> callback) { @Override public String getContentUrl(String projectPath, int libId, String path) { - return appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/content" + + return appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/content" + "?projectpath=" + projectPath + "&root=" + libId + "&path=" + path; } @Override public Promise> getMethodParametersHints(String projectPath, String fqn, int offset, int lineStartOffset) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/parameters" + + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/parameters" + "?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset + "&lineStart=" + lineStartOffset; return requestFactory.createGetRequest(url) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java index f44a240f60e..ae36fb202cf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java @@ -47,7 +47,7 @@ public ClasspathServiceClientImpl(AsyncRequestFactory asyncRequestFactory, this.appContext = appContext; this.loader = loaderFactory.newLoader(); - this.pathToService = "/jdt/classpath"; + this.pathToService = "/java/classpath"; } @Override diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java index 9dd34d2da73..61889a8e08a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java @@ -68,7 +68,7 @@ public RefactoringServiceClientImpl(AsyncRequestFactory asyncRequestFactory, this.unmarshallerFactory = unmarshallerFactory; this.appContext = appContext; this.loader = loaderFactory.newLoader(); - this.pathToService = "/jdt/refactoring/"; + this.pathToService = "/java/refactoring/"; } /** {@inheritDoc} */ diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java index 09cc54c78ce..411d6d760b1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java @@ -52,7 +52,7 @@ public JavaSearchServiceRest(AsyncRequestFactory asyncRequestFactory, this.unmarshallerFactory = unmarshallerFactory; this.appContext = appContext; this.loader = loaderFactory.newLoader(); - this.pathToService = "/jdt/search/find/usages"; + this.pathToService = "/java/search/find/usages"; } @Override diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java index be3615f8543..37640f77dc2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java @@ -59,7 +59,7 @@ public JavaSearchServiceWS(MessageBusProvider provider, this.dtoFactory = dtoFactory; this.loader = loaderFactory.newLoader(); this.unmarshallerFactory = unmarshallerFactory; - this.pathToService = "/jdt/search/"; + this.pathToService = "/java/search/"; } @Override diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java index a56fe4e5a96..83aee01cd3e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java @@ -44,7 +44,7 @@ public SettingsServiceClientImpl(AppContext appContext, /** {@inheritDoc} */ @Override public Promise applyCompileParameters(@NotNull final Map parameters) { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/compiler-settings/set"; + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/compiler-settings/set"; JsonSerializable data = new JsonSerializable() { @Override @@ -62,7 +62,7 @@ public String toJson() { /** {@inheritDoc} */ @Override public Promise> getCompileParameters() { - String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/compiler-settings/all"; + String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/compiler-settings/all"; return asyncRequestFactory.createGetRequest(url) .header(ACCEPT, APPLICATION_JSON) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml index f73f09f78c6..dbc0cc7d9e7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml @@ -24,6 +24,14 @@ false + + com.google.code.gson + gson + + + com.google.guava + guava + com.google.inject guice @@ -32,6 +40,14 @@ com.google.inject.extensions guice-multibindings + + javax.inject + javax.inject + + + javax.validation + validation-api + javax.ws.rs javax.ws.rs-api @@ -49,14 +65,30 @@ org.eclipse.che.core che-core-api-dto + + org.eclipse.che.core + che-core-api-model + org.eclipse.che.core che-core-api-project + + org.eclipse.che.core + che-core-commons-env + org.eclipse.che.core che-core-commons-inject + + org.eclipse.che.core + che-core-commons-lang + + + org.eclipse.che.core + che-core-commons-schedule + org.eclipse.che.plugin che-plugin-java-ext-lang-shared @@ -72,6 +104,10 @@ + + org.eclipse.che.plugin + org.eclipse.core.filebuffers + org.eclipse.che.plugin org.eclipse.core.resources @@ -80,6 +116,58 @@ org.eclipse.che.plugin org.eclipse.jdt.ui + + org.eclipse.che.plugin + org.eclipse.jface + + + org.eclipse.che.plugin + org.eclipse.jface.text + + + org.eclipse.che.plugin + org.eclipse.ltk.core.refactoring + + + org.eclipse.che.plugin + org.eclipse.search + + + org.eclipse.che.plugin + org.eclipse.ui.ide + + + org.eclipse.equinox + preferences + + + org.eclipse.search + org.eclipse.search + + + org.eclipse.text + org.eclipse.text + + + org.eclipse.equinox.common + org.eclipse.equinox + + + + + org.slf4j + slf4j-api + + + junit + junit + test + + + org.easytesting + fest-assert + test + org.hamcrest hamcrest-core @@ -102,6 +190,19 @@ + src/main/java + src/test/java + target/classes + + + src/main/resources + + + + + src/test/resources + + org.apache.maven.plugins @@ -117,6 +218,71 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-tomcat-libs + process-resources + + copy + + + + + com.google.gwt + gwt-user + ${com.google.gwt.version} + ${project.build.testOutputDirectory}/temp/ws/test + gwt-user.jar + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-junit47 + ${version.surefire.plugin} + + + + random + + **/jdt/**/*.java + + + + + com.mycila + license-maven-plugin + + + **/*.jar + **/*.zip + **/RenameMethodInInterface/** + **/RenameNonPrivateField/** + **/RenamePackage/** + **/RenameParameters/** + **/RenamePrivateField/** + **/RenamePrivateMethod/** + **/RenameStaticMethod/** + **/RenameTests18/** + **/RenameType/** + **/RenameTypeParameter/** + **/RenameVirtualMethodInClass/** + **/org/eclipse/che/plugin/java/server/test/Accessor.java + **/projects/** + **/org/eclipse/che/plugin/java/server/jdt/** + + + diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/CodeAssist.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/CodeAssist.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/CodeAssist.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/CodeAssist.java index 2af61485bbf..4ac7fe7e549 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/CodeAssist.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/CodeAssist.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; +package org.eclipse.che.plugin.java.server; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -26,6 +26,7 @@ import org.eclipse.che.ide.ext.java.shared.dto.Proposals; import org.eclipse.che.ide.ext.java.shared.dto.Region; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeInfo; +import org.eclipse.che.jdt.JavadocFinder; import org.eclipse.che.jdt.javadoc.HTMLPrinter; import org.eclipse.che.jdt.javaeditor.HasLinkedModel; import org.eclipse.che.jdt.javaeditor.TextViewer; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/CodeAssistantException.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/CodeAssistantException.java similarity index 92% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/CodeAssistantException.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/CodeAssistantException.java index a61986275a8..8db39c1542d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/CodeAssistantException.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/CodeAssistantException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; +package org.eclipse.che.plugin.java.server; /** * diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JavaNavigation.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JavaNavigation.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JavaNavigation.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JavaNavigation.java index 51dae718270..55591e5d780 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JavaNavigation.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JavaNavigation.java @@ -1,14 +1,15 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 - *

+ * * Contributors: - * Codenvy, S.A. - initial API and implementation + * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; + +package org.eclipse.che.plugin.java.server; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JavaTypeHierarchy.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JavaTypeHierarchy.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JavaTypeHierarchy.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JavaTypeHierarchy.java index 1afe3a50d82..1b7e5a6b1d6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JavaTypeHierarchy.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JavaTypeHierarchy.java @@ -1,14 +1,15 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 - *

+ * * Contributors: - * Codenvy, S.A. - initial API and implementation + * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; + +package org.eclipse.che.plugin.java.server; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JdtException.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JdtException.java similarity index 50% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JdtException.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JdtException.java index 2be50a82e36..64b2dd981dc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JdtException.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/JdtException.java @@ -1,4 +1,15 @@ -package org.eclipse.che.jdt; +/******************************************************************************* + * Copyright (c) 2012-2016 Codenvy, S.A. + * 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 + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ + +package org.eclipse.che.plugin.java.server; import org.eclipse.che.api.core.ServerException; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/ParametersHints.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/ParametersHints.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/ParametersHints.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/ParametersHints.java index f414d020407..bac491c1dfc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/ParametersHints.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/ParametersHints.java @@ -1,14 +1,15 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 - *

+ * * Contributors: - * Codenvy, S.A. - initial API and implementation + * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; + +package org.eclipse.che.plugin.java.server; import com.google.inject.Singleton; @@ -49,7 +50,7 @@ * test2.x(); * *

- * When we call method {@link org.eclipse.che.jdt.ParametersHints#findHints(IJavaProject, String, int, int)} for test2.x() + * When we call method {@link ParametersHints#findHints(IJavaProject, String, int, int)} for test2.x() * we will get following: * ________ * int x, double y diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/ProjectListeners.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/ProjectListeners.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/ProjectListeners.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/ProjectListeners.java index 2cb8049e565..ef34e12ed81 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/ProjectListeners.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/ProjectListeners.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; +package org.eclipse.che.plugin.java.server; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/SourcesFromBytecodeGenerator.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/SourcesFromBytecodeGenerator.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/SourcesFromBytecodeGenerator.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/SourcesFromBytecodeGenerator.java index f030ba6c5a1..64e20702ccd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/SourcesFromBytecodeGenerator.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/SourcesFromBytecodeGenerator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; +package org.eclipse.che.plugin.java.server; import com.google.inject.Singleton; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JdtGuiceModule.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/inject/JdtGuiceModule.java similarity index 72% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JdtGuiceModule.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/inject/JdtGuiceModule.java index 2f6a33706a7..345e0edd892 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/JdtGuiceModule.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/inject/JdtGuiceModule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; +package org.eclipse.che.plugin.java.server.inject; import com.google.inject.AbstractModule; import com.google.inject.Provides; @@ -17,16 +17,17 @@ import com.google.inject.name.Named; import org.eclipse.che.inject.DynaModule; -import org.eclipse.che.jdt.refactoring.RefactoringManager; -import org.eclipse.che.jdt.rest.CodeAssistService; -import org.eclipse.che.jdt.rest.CompilerSetupService; -import org.eclipse.che.jdt.rest.FormatService; -import org.eclipse.che.jdt.rest.JavaNavigationService; -import org.eclipse.che.jdt.rest.JavaReconcileService; -import org.eclipse.che.jdt.rest.JavadocService; -import org.eclipse.che.jdt.rest.JdtExceptionMapper; -import org.eclipse.che.jdt.rest.RefactoringService; -import org.eclipse.che.jdt.rest.SearchService; +import org.eclipse.che.plugin.java.server.ProjectListeners; +import org.eclipse.che.plugin.java.server.refactoring.RefactoringManager; +import org.eclipse.che.plugin.java.server.rest.CodeAssistService; +import org.eclipse.che.plugin.java.server.rest.CompilerSetupService; +import org.eclipse.che.plugin.java.server.rest.FormatService; +import org.eclipse.che.plugin.java.server.rest.JavaNavigationService; +import org.eclipse.che.plugin.java.server.rest.JavaReconcileService; +import org.eclipse.che.plugin.java.server.rest.JavadocService; +import org.eclipse.che.plugin.java.server.rest.JdtExceptionMapper; +import org.eclipse.che.plugin.java.server.rest.RefactoringService; +import org.eclipse.che.plugin.java.server.rest.SearchService; import org.eclipse.core.internal.filebuffers.FileBuffersPlugin; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jdt.internal.ui.JavaPlugin; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/DtoConverter.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/DtoConverter.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/DtoConverter.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/DtoConverter.java index 09fd3c1e928..1ab9404cccb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/DtoConverter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/DtoConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.refactoring; import org.eclipse.che.dto.server.DtoFactory; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringPreview; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/RefactoringException.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/RefactoringException.java similarity index 89% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/RefactoringException.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/RefactoringException.java index 905eab7ae17..dd6373105a3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/RefactoringException.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/RefactoringException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.refactoring; /** * Throws when we can't perform refactoring diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/RefactoringManager.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/RefactoringManager.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/RefactoringManager.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/RefactoringManager.java index 7653ade5ac5..e831f11f20a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/RefactoringManager.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/RefactoringManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.refactoring; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -33,11 +33,11 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameSettings; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ReorgDestination; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ValidateNewName; -import org.eclipse.che.jdt.refactoring.session.MoveRefactoringSession; -import org.eclipse.che.jdt.refactoring.session.RefactoringSession; -import org.eclipse.che.jdt.refactoring.session.RenameLinkedModeRefactoringSession; -import org.eclipse.che.jdt.refactoring.session.RenameSession; -import org.eclipse.che.jdt.refactoring.session.ReorgRefactoringSession; +import org.eclipse.che.plugin.java.server.refactoring.session.MoveRefactoringSession; +import org.eclipse.che.plugin.java.server.refactoring.session.RefactoringSession; +import org.eclipse.che.plugin.java.server.refactoring.session.RenameLinkedModeRefactoringSession; +import org.eclipse.che.plugin.java.server.refactoring.session.RenameSession; +import org.eclipse.che.plugin.java.server.refactoring.session.ReorgRefactoringSession; import org.eclipse.che.jdt.util.JdtFlags; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.AssertionFailedException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/MoveRefactoringSession.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/MoveRefactoringSession.java similarity index 93% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/MoveRefactoringSession.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/MoveRefactoringSession.java index 736748d25d7..5c0328d48de 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/MoveRefactoringSession.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/MoveRefactoringSession.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring.session; +package org.eclipse.che.plugin.java.server.refactoring.session; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaMoveProcessor; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RefactoringSession.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RefactoringSession.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RefactoringSession.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RefactoringSession.java index 205346c3bb7..fcfa59ede1e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RefactoringSession.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RefactoringSession.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,14 +9,14 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring.session; +package org.eclipse.che.plugin.java.server.refactoring.session; import org.eclipse.che.dto.server.DtoFactory; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeCreationResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeInfo; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; -import org.eclipse.che.jdt.refactoring.DtoConverter; -import org.eclipse.che.jdt.refactoring.RefactoringException; +import org.eclipse.che.plugin.java.server.refactoring.DtoConverter; +import org.eclipse.che.plugin.java.server.refactoring.RefactoringException; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RenameLinkedModeRefactoringSession.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RenameLinkedModeRefactoringSession.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RenameLinkedModeRefactoringSession.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RenameLinkedModeRefactoringSession.java index cb081fd4872..cc4de836875 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RenameLinkedModeRefactoringSession.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RenameLinkedModeRefactoringSession.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,14 +9,14 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring.session; +package org.eclipse.che.plugin.java.server.refactoring.session; import org.eclipse.che.ide.ext.java.shared.dto.LinkedModeModel; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeCreationResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeInfo; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; -import org.eclipse.che.jdt.refactoring.DtoConverter; -import org.eclipse.che.jdt.refactoring.RefactoringException; +import org.eclipse.che.plugin.java.server.refactoring.DtoConverter; +import org.eclipse.che.plugin.java.server.refactoring.RefactoringException; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IField; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RenameSession.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RenameSession.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RenameSession.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RenameSession.java index 2466c44f6d4..627c802c061 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/RenameSession.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/RenameSession.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring.session; +package org.eclipse.che.plugin.java.server.refactoring.session; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameSettings; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/ReorgRefactoringSession.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/ReorgRefactoringSession.java similarity index 91% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/ReorgRefactoringSession.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/ReorgRefactoringSession.java index 15fe7347b45..119aff425bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/refactoring/session/ReorgRefactoringSession.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/refactoring/session/ReorgRefactoringSession.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring.session; +package org.eclipse.che.plugin.java.server.refactoring.session; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.ltk.core.refactoring.Refactoring; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/ClasspathService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/ClasspathService.java index 9335e342653..4fcde3d94f3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/ClasspathService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/ClasspathService.java @@ -34,7 +34,7 @@ * * @author Valeriy Svydenko */ -@Path("jdt/classpath/") +@Path("java/classpath/") public class ClasspathService { private static final JavaModel model = JavaModelManager.getJavaModelManager().getJavaModel(); diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/CodeAssistService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/CodeAssistService.java similarity index 96% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/CodeAssistService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/CodeAssistService.java index 1dc688443d8..1582e4289b9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/CodeAssistService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/CodeAssistService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,14 +9,14 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; +package org.eclipse.che.plugin.java.server.rest; import org.eclipse.che.api.core.NotFoundException; +import org.eclipse.che.ide.ext.java.shared.dto.ConflictImportDTO; import org.eclipse.che.ide.ext.java.shared.dto.Problem; import org.eclipse.che.ide.ext.java.shared.dto.ProposalApplyResult; import org.eclipse.che.ide.ext.java.shared.dto.Proposals; -import org.eclipse.che.ide.ext.java.shared.dto.ConflictImportDTO; -import org.eclipse.che.jdt.CodeAssist; +import org.eclipse.che.plugin.java.server.CodeAssist; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaModelException; @@ -40,7 +40,7 @@ /** * @author Evgen Vidolob */ -@Path("jdt/code-assist") +@Path("java/code-assist") public class CodeAssistService { private static final JavaModel model = JavaModelManager.getJavaModelManager().getJavaModel(); diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/CompilerSetupService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/CompilerSetupService.java similarity index 96% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/CompilerSetupService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/CompilerSetupService.java index 8d0def41675..bfed0581bca 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/CompilerSetupService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/CompilerSetupService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; +package org.eclipse.che.plugin.java.server.rest; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; @@ -35,7 +35,7 @@ * * @author Dmitry Shnurenko */ -@Path("/jdt/compiler-settings") +@Path("/java/compiler-settings") public class CompilerSetupService { private static final JavaModel JAVA_MODEL = JavaModelManager.getJavaModelManager().getJavaModel(); diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/FormatService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/FormatService.java similarity index 92% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/FormatService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/FormatService.java index 71b6a32c995..99715ffff0d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/FormatService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/FormatService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; +package org.eclipse.che.plugin.java.server.rest; import com.google.inject.Inject; @@ -27,7 +27,7 @@ /** * @author Roman Nikitenko */ -@Path("code-formatting") +@Path("java/code-formatting") public class FormatService { private Formatter formatter; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavaNavigationService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaNavigationService.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavaNavigationService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaNavigationService.java index 49f496025cf..665f0e8db71 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavaNavigationService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaNavigationService.java @@ -1,14 +1,15 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 - *

+ * * Contributors: - * Codenvy, S.A. - initial API and implementation + * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; + +package org.eclipse.che.plugin.java.server.rest; import org.eclipse.che.ide.ext.java.shared.Jar; import org.eclipse.che.ide.ext.java.shared.JarEntry; @@ -18,9 +19,9 @@ import org.eclipse.che.ide.ext.java.shared.dto.model.CompilationUnit; import org.eclipse.che.ide.ext.java.shared.dto.model.JavaProject; import org.eclipse.che.ide.ext.java.shared.dto.model.MethodParameters; -import org.eclipse.che.jdt.JavaNavigation; -import org.eclipse.che.jdt.JavaTypeHierarchy; -import org.eclipse.che.jdt.ParametersHints; +import org.eclipse.che.plugin.java.server.JavaNavigation; +import org.eclipse.che.plugin.java.server.JavaTypeHierarchy; +import org.eclipse.che.plugin.java.server.ParametersHints; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaModelException; @@ -37,7 +38,7 @@ /** * @author Evgen Vidolob */ -@Path("jdt/navigation") +@Path("java/navigation") public class JavaNavigationService { JavaModel MODEL = JavaModelManager.getJavaModelManager().getJavaModel(); diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavaReconcileService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaReconcileService.java similarity index 92% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavaReconcileService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaReconcileService.java index ab77140d42b..4f5463d8b1e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavaReconcileService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaReconcileService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; +package org.eclipse.che.plugin.java.server.rest; import com.google.inject.Inject; @@ -28,7 +28,7 @@ /** * @author Evgen Vidolob */ -@Path("jdt/reconcile") +@Path("java/reconcile") public class JavaReconcileService { private static final JavaModel model = JavaModelManager.getJavaModelManager().getJavaModel(); diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavadocService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavadocService.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavadocService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavadocService.java index 3954155090b..cc1f042fc89 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JavadocService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavadocService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; +package org.eclipse.che.plugin.java.server.rest; import org.eclipse.che.jdt.JavadocFinder; import org.eclipse.jdt.internal.core.JavaModelManager; @@ -26,7 +26,7 @@ /** * @author Evgen Vidolob */ -@Path("jdt/javadoc") +@Path("java/javadoc") public class JavadocService { @Path("find") diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JdtExceptionMapper.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JdtExceptionMapper.java similarity index 59% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JdtExceptionMapper.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JdtExceptionMapper.java index 9a1391ece90..c41c7cac517 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/JdtExceptionMapper.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JdtExceptionMapper.java @@ -1,8 +1,18 @@ -package org.eclipse.che.jdt.rest; +/******************************************************************************* + * Copyright (c) 2012-2016 Codenvy, S.A. + * 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 + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.plugin.java.server.rest; import org.eclipse.che.dto.server.DtoFactory; -import org.eclipse.che.jdt.JdtException; -import org.eclipse.che.jdt.search.SearchException; +import org.eclipse.che.plugin.java.server.JdtException; +import org.eclipse.che.plugin.java.server.search.SearchException; import javax.inject.Singleton; import javax.ws.rs.core.MediaType; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/RefactoringService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/RefactoringService.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/RefactoringService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/RefactoringService.java index 5e2fa6c6fca..8bff0574620 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/RefactoringService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/RefactoringService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; +package org.eclipse.che.plugin.java.server.rest; import com.google.inject.Inject; @@ -30,8 +30,8 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameSettings; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ReorgDestination; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ValidateNewName; -import org.eclipse.che.jdt.refactoring.RefactoringException; -import org.eclipse.che.jdt.refactoring.RefactoringManager; +import org.eclipse.che.plugin.java.server.refactoring.RefactoringException; +import org.eclipse.che.plugin.java.server.refactoring.RefactoringManager; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ICompilationUnit; @@ -56,7 +56,7 @@ * * @author Evgen Vidolob */ -@Path("/jdt/refactoring") +@Path("java/refactoring") public class RefactoringService { private static final JavaModel model = JavaModelManager.getJavaModelManager().getJavaModel(); private RefactoringManager manager; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/SearchService.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/SearchService.java similarity index 86% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/SearchService.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/SearchService.java index 61190c49604..a282a3d29c8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/rest/SearchService.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/SearchService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,14 +9,14 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.rest; +package org.eclipse.che.plugin.java.server.rest; import com.google.inject.Inject; import org.eclipse.che.ide.ext.java.shared.dto.search.FindUsagesRequest; import org.eclipse.che.ide.ext.java.shared.dto.search.FindUsagesResponse; -import org.eclipse.che.jdt.search.SearchException; -import org.eclipse.che.jdt.search.SearchManager; +import org.eclipse.che.plugin.java.server.search.SearchException; +import org.eclipse.che.plugin.java.server.search.SearchManager; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.internal.core.JavaModel; import org.eclipse.jdt.internal.core.JavaModelManager; @@ -33,7 +33,7 @@ * * @author Evgen Vidolob */ -@Path("jdt/search") +@Path("java/search") public class SearchService { @Inject diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/JavaElementToDtoConverter.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/JavaElementToDtoConverter.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/JavaElementToDtoConverter.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/JavaElementToDtoConverter.java index aef38daf13b..2a17ec500b0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/JavaElementToDtoConverter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/JavaElementToDtoConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,7 +9,7 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.search; +package org.eclipse.che.plugin.java.server.search; import org.eclipse.che.dto.server.DtoFactory; import org.eclipse.che.ide.ext.java.shared.dto.model.ClassFile; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/SearchException.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/SearchException.java similarity index 84% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/SearchException.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/SearchException.java index 4c7423ebd58..e687293d544 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/SearchException.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/SearchException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 @@ -9,9 +9,10 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.search; +package org.eclipse.che.plugin.java.server.search; -import org.eclipse.che.jdt.JdtException; + +import org.eclipse.che.plugin.java.server.JdtException; /** * Represents problem in Java search. diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/SearchManager.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/SearchManager.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/SearchManager.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/SearchManager.java index 4e7d10adc3f..eb96040d11b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/main/java/org/eclipse/che/jdt/search/SearchManager.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/main/java/org/eclipse/che/plugin/java/server/search/SearchManager.java @@ -1,15 +1,15 @@ /******************************************************************************* - * Copyright (c) 2012-2015 Codenvy, S.A. + * Copyright (c) 2012-2016 Codenvy, S.A. * 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 * * Contributors: - * Codenvy, S.A. - initial API and implementation + * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.search; +package org.eclipse.che.plugin.java.server.search; import com.google.inject.Singleton; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/BaseTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/BaseTest.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/BaseTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/BaseTest.java index f4a6b66347a..6b635a846ff 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/BaseTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/BaseTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.jdt.javadoc.JavaElementLinks; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/CodeAssistantTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/CodeAssistantTest.java similarity index 87% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/CodeAssistantTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/CodeAssistantTest.java index a5b60a3c1be..0a6679fdde9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/CodeAssistantTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/CodeAssistantTest.java @@ -8,15 +8,12 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; -import org.eclipse.che.ide.ext.java.shared.dto.Proposals; -import org.eclipse.che.jdt.CodeAssist; +import org.eclipse.che.plugin.java.server.CodeAssist; import org.junit.Ignore; import org.junit.Test; -import static org.fest.assertions.Assertions.assertThat; - /** * @author Evgen Vidolob */ diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/DeltaProcessingTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/DeltaProcessingTest.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/DeltaProcessingTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/DeltaProcessingTest.java index d0ca7f97687..db4dbd952e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/DeltaProcessingTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/DeltaProcessingTest.java @@ -8,14 +8,14 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.che.api.project.server.notification.ProjectItemModifiedEvent; import org.eclipse.che.jdt.core.resources.ResourceChangedEvent; -import org.eclipse.jdt.internal.core.JavaModelManager; import org.eclipse.jdt.core.compiler.CharOperation; import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer; import org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner; +import org.eclipse.jdt.internal.core.JavaModelManager; import org.junit.After; import org.junit.Ignore; import org.junit.Test; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/DummyProjectManager.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/DummyProjectManager.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/DummyProjectManager.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/DummyProjectManager.java index 4b401e32f9d..a41572ed5a7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/DummyProjectManager.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/DummyProjectManager.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.commons.env.EnvironmentContext; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/FindDeclarationTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/FindDeclarationTest.java similarity index 93% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/FindDeclarationTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/FindDeclarationTest.java index de3d8ea02dc..eb8edce7b72 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/FindDeclarationTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/FindDeclarationTest.java @@ -8,11 +8,11 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.che.ide.ext.java.shared.OpenDeclarationDescriptor; -import org.eclipse.che.jdt.JavaNavigation; -import org.eclipse.che.jdt.SourcesFromBytecodeGenerator; +import org.eclipse.che.plugin.java.server.JavaNavigation; +import org.eclipse.che.plugin.java.server.SourcesFromBytecodeGenerator; import org.junit.Ignore; import org.junit.Test; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JarNavigationTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JarNavigationTest.java similarity index 94% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JarNavigationTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JarNavigationTest.java index 0cfe9dff5cf..8a8702de7ab 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JarNavigationTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JarNavigationTest.java @@ -8,15 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.che.ide.ext.java.shared.Jar; import org.eclipse.che.ide.ext.java.shared.JarEntry; import org.eclipse.che.ide.ext.java.shared.dto.ClassContent; import org.eclipse.che.ide.ext.java.shared.dto.model.JavaProject; import org.eclipse.che.ide.ext.java.shared.dto.model.PackageFragmentRoot; -import org.eclipse.che.jdt.JavaNavigation; -import org.eclipse.che.jdt.SourcesFromBytecodeGenerator; +import org.eclipse.che.plugin.java.server.JavaNavigation; +import org.eclipse.che.plugin.java.server.SourcesFromBytecodeGenerator; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.junit.Ignore; import org.junit.Test; @@ -154,7 +154,7 @@ public void testSortJarEntries() throws Exception { String javaHome = getClass().getResource("/temp").getPath() + "/ws/test/gwt-user.jar"; IPackageFragmentRoot root = project.getPackageFragmentRoot(new File(javaHome).getPath()); List content = navigation.getPackageFragmentRootContent(project, root.hashCode()); - assertThat(content).isNotNull().isNotEmpty().onProperty("name").containsSequence("about_files","com.google", "javax", "org", "META-INF", "about.html", "plugin.properties"); + assertThat(content).isNotNull().isNotEmpty().onProperty("name").containsSequence("about_files", "com.google", "javax", "org", "META-INF", "about.html", "plugin.properties"); } @Test @@ -162,7 +162,7 @@ public void testSortJarEntriesWithClasses() throws Exception { String javaHome = getClass().getResource("/temp").getPath() + "/ws/test/gwt-user.jar"; IPackageFragmentRoot root = project.getPackageFragmentRoot(new File(javaHome).getPath()); List content = navigation.getChildren(project, root.hashCode(), "org.hibernate.validator"); - assertThat(content).isNotNull().isNotEmpty().onProperty("name").containsSequence("engine","HibernateValidationMessageResolver.class", "ValidationMessages.class", "HibernateValidator.gwt.xml", "README.txt"); + assertThat(content).isNotNull().isNotEmpty().onProperty("name").containsSequence("engine", "HibernateValidationMessageResolver.class", "ValidationMessages.class", "HibernateValidator.gwt.xml", "README.txt"); } @Test @@ -179,8 +179,8 @@ public void testFileContentInPackage() throws Exception { IPackageFragmentRoot root = project.getPackageFragmentRoot(new File(javaHome).getPath()); ClassContent content = navigation.getContent(project, root.hashCode(), "/com/google/gwt/user/User.gwt.xml"); assertThat(content.getContent()).isNotNull().contains("") - .contains("") - .contains(""); + .contains("") + .contains(""); } @Test diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocFromSourceTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocFromSourceTest.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocFromSourceTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocFromSourceTest.java index 7075b5ffd1b..cfa764d6a64 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocFromSourceTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocFromSourceTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.che.jdt.JavadocFinder; import org.eclipse.jdt.core.IJavaElement; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocTest.java index 1f98001c1ca..4336e73c4bc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.che.jdt.JavadocFinder; import org.eclipse.che.jdt.javadoc.JavaElementLinks; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocUrlTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocUrlTest.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocUrlTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocUrlTest.java index 13f6a83d266..424f4ef76aa 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/JavadocUrlTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/JavadocUrlTest.java @@ -8,9 +8,8 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; -import org.eclipse.che.jdt.JavadocFinder; import org.eclipse.che.jdt.javadoc.JavaElementLinks; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/ReconcileTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/ReconcileTest.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/ReconcileTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/ReconcileTest.java index bd9e51eea75..520f66d2257 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/ReconcileTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/ReconcileTest.java @@ -8,10 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.che.ide.ext.java.shared.dto.HighlightedPosition; import org.eclipse.che.ide.ext.java.shared.dto.ReconcileResult; import org.eclipse.che.jdt.javaeditor.JavaReconciler; @@ -19,6 +18,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.CompilationUnit; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/SourceFromBytecodeGeneratorTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/SourceFromBytecodeGeneratorTest.java similarity index 93% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/SourceFromBytecodeGeneratorTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/SourceFromBytecodeGeneratorTest.java index 5f1d621d4b9..d9c6d353368 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/SourceFromBytecodeGeneratorTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/SourceFromBytecodeGeneratorTest.java @@ -8,10 +8,10 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; -import org.eclipse.che.jdt.SourcesFromBytecodeGenerator; +import org.eclipse.che.plugin.java.server.SourcesFromBytecodeGenerator; import org.eclipse.jdt.core.IType; import org.junit.Before; import org.junit.Ignore; @@ -169,7 +169,7 @@ public void testInnerTypeDeclaration() throws Exception { "\n" + " ExChannelCloser(java.nio.file.Path arg0, java.nio.channels.SeekableByteChannel " + "arg1, java.util.Set arg2) { /* compiled code */ }\n" + - "\n"+ + "\n" + " }"); } @@ -186,8 +186,8 @@ public void testInterfaceMethodDeclaration() throws Exception { IType interfaceType = project.findType("java.lang.CharSequence"); String source = new SourcesFromBytecodeGenerator().generateSource(interfaceType); assertThat(source).contains(" public int length();").contains(" public char charAt(int arg0);") - .contains(" public java.lang.CharSequence subSequence(int arg0, int arg1);") - .contains(" public java.lang.String toString();"); + .contains(" public java.lang.CharSequence subSequence(int arg0, int arg1);") + .contains(" public java.lang.String toString();"); } @Test @@ -217,12 +217,12 @@ public void testGenericInterface() throws Exception { IType interfaceType = project.findType("com.google.gwt.user.client.rpc.AsyncCallback"); String source = new SourcesFromBytecodeGenerator().generateSource(interfaceType); assertThat(source).contains("public interface AsyncCallback {\n" + - "\n" + - " public void onFailure(java.lang.Throwable arg0);\n" + - "\n" + - " public void onSuccess(T arg0);\n" + - "\n" + - "}"); + "\n" + + " public void onFailure(java.lang.Throwable arg0);\n" + + "\n" + + " public void onSuccess(T arg0);\n" + + "\n" + + "}"); } @Test @@ -244,7 +244,7 @@ public void testAnnotationsOnAnnotation() throws Exception { IType interfaceType = project.findType("com.google.gwt.core.client.SingleJsoImpl"); String source = new SourcesFromBytecodeGenerator().generateSource(interfaceType); assertThat(source).contains("@java.lang.annotation.Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)\n") - .contains("@java.lang.annotation.Target(value=java.lang.annotation.ElementType.TYPE)\n"); + .contains("@java.lang.annotation.Target(value=java.lang.annotation.ElementType.TYPE)\n"); } @Test public void testAnnotationsOnMethod() throws Exception { diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/Utils.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/Utils.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/Utils.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/Utils.java index c116c9b3ff5..1729716b401 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/ide/ext/java/Utils.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/che/Utils.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.ext.java; +package org.eclipse.che.plugin.java.server.che; import org.eclipse.jdt.core.compiler.IProblem; import org.eclipse.jdt.internal.compiler.problem.DefaultProblem; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/CompletionJavadocTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/CompletionJavadocTest.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/CompletionJavadocTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/CompletionJavadocTest.java index 713b4b3e8cd..a9007620a9d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/CompletionJavadocTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/CompletionJavadocTest.java @@ -9,15 +9,15 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt; +package org.eclipse.che.plugin.java.server.jdt; import org.eclipse.che.commons.env.EnvironmentContext; import org.eclipse.che.commons.subject.SubjectImpl; import org.eclipse.che.jdt.javaeditor.TextViewer; -import org.eclipse.che.jdt.quickfix.QuickFixTest; -import org.eclipse.che.jdt.testplugin.Java18ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.quickfix.QuickFixTest; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java18ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; import org.eclipse.che.jface.text.contentassist.ICompletionProposal; import org.eclipse.che.jface.text.contentassist.ICompletionProposalExtension5; import org.eclipse.jdt.core.IBuffer; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/core/CoreTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/core/CoreTests.java similarity index 90% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/core/CoreTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/core/CoreTests.java index 0a63d7f7dbb..027b08ac638 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/core/CoreTests.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/core/CoreTests.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.core; +package org.eclipse.che.plugin.java.server.jdt.core; -import org.eclipse.che.ide.ext.java.BaseTest; -import org.eclipse.che.jdt.testplugin.*; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.che.BaseTest; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.StringAsserts; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.dom.CompilationUnit; @@ -28,7 +28,7 @@ public class CoreTests extends BaseTest { - private org.eclipse.che.jdt.testplugin.ProjectTestSetup setup; + private ProjectTestSetup setup; public CoreTests(ProjectTestSetup setup) { this.setup = setup; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/core/ImportOrganizeTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/core/ImportOrganizeTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/core/ImportOrganizeTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/core/ImportOrganizeTest.java index f22c1975386..33961726340 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/core/ImportOrganizeTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/core/ImportOrganizeTest.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.core; +package org.eclipse.che.plugin.java.server.jdt.core; -import org.eclipse.che.jdt.search.JUnitSourceSetup; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.search.JUnitSourceSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -50,7 +50,7 @@ public class ImportOrganizeTest extends CoreTests { private IJavaProject fJProject1; public ImportOrganizeTest() { - super(new org.eclipse.che.jdt.testplugin.ProjectTestSetup()); + super(new ProjectTestSetup()); } @Before diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest.java index 3e375e0da01..845b5ce1af9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest.java @@ -12,11 +12,11 @@ * new local with casted type applied more than once * Billy Huang - [quick assist] concatenate/merge string literals - https://bugs.eclipse.org/77632 *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest17.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest17.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest17.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest17.java index c8df61ca8b4..904e403eae4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest17.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest17.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.Java17ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java17ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest18.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest18.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest18.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest18.java index f793ace4235..9b21d3715e3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AdvancedQuickAssistTest18.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AdvancedQuickAssistTest18.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.Java18ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java18ProjectTestSetup; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; @@ -23,8 +23,8 @@ import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.text.correction.AssistContext; import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.junit.After; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest.java index 84249266f3f..4c4fec44f5b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest.java @@ -11,11 +11,11 @@ * Lukas Hanke - Bug 241696 [quick fix] quickfix to iterate over a collection - https://bugs.eclipse.org/bugs/show_bug.cgi?id=241696 * Lukas Hanke - Bug 430818 [1.8][quick fix] Quick fix for "for loop" is not shown for bare local variable/argument/field - https://bugs.eclipse.org/bugs/show_bug.cgi?id=430818 *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest17.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest17.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest17.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest17.java index cfa9bf818a8..a538ccb2b04 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest17.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest17.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.Java17ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java17ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest18.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest18.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest18.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest18.java index 6347d921f68..b5ba9ce57cc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/AssistQuickFixTest18.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/AssistQuickFixTest18.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.Java18ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java18ProjectTestSetup; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; @@ -24,8 +24,8 @@ import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.text.correction.AssistContext; import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.junit.After; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ConvertForLoopQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ConvertForLoopQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ConvertForLoopQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ConvertForLoopQuickFixTest.java index ddc147fa08e..a08c1345f9d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ConvertForLoopQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ConvertForLoopQuickFixTest.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ConvertIterableLoopQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ConvertIterableLoopQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ConvertIterableLoopQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ConvertIterableLoopQuickFixTest.java index 54dd7d2c9ca..289f4dc369f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ConvertIterableLoopQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ConvertIterableLoopQuickFixTest.java @@ -8,10 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; @@ -23,8 +25,6 @@ import org.eclipse.jdt.internal.ui.text.correction.AssistContext; import org.eclipse.jdt.internal.ui.text.correction.QuickAssistProcessor; import org.eclipse.jdt.internal.ui.text.correction.proposals.FixCorrectionProposal; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.junit.After; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest.java index c8837214ab8..6053ba0544c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest.java @@ -11,11 +11,11 @@ * Lukas Hanke - Bug 241696 [quick fix] quickfix to iterate over a collection - https://bugs.eclipse.org/bugs/show_bug.cgi?id=241696 * Lukas Hanke - Bug 430818 [1.8][quick fix] Quick fix for "for loop" is not shown for bare local variable/argument/field - https://bugs.eclipse.org/bugs/show_bug.cgi?id=430818 *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest17.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest17.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest17.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest17.java index e898d41c9a6..a49205b49d3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest17.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest17.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.Java17ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java17ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest18.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest18.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest18.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest18.java index 7e373316113..9ba03524c4f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/LocalCorrectionsQuickFixTest18.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/LocalCorrectionsQuickFixTest18.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.Java18ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java18ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ModifierCorrectionsQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ModifierCorrectionsQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ModifierCorrectionsQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ModifierCorrectionsQuickFixTest.java index 998f65e95e1..e729598565c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ModifierCorrectionsQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ModifierCorrectionsQuickFixTest.java @@ -11,10 +11,12 @@ * Benjamin Muskalla - [quick fix] Quick fix for missing synchronized modifier - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245250 * Rabea Gransberger - [quick fix] Fix several visibility issues - https://bugs.eclipse.org/394692 *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; @@ -26,8 +28,6 @@ import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType; import org.eclipse.jdt.internal.ui.JavaPlugin; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ModifierCorrectionsQuickFixTest17.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ModifierCorrectionsQuickFixTest17.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ModifierCorrectionsQuickFixTest17.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ModifierCorrectionsQuickFixTest17.java index d3099265ba9..80312ea6ca0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ModifierCorrectionsQuickFixTest17.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ModifierCorrectionsQuickFixTest17.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.Java17ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.Java17ProjectTestSetup; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; @@ -23,8 +23,8 @@ import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.junit.After; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/QuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/QuickFixTest.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/QuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/QuickFixTest.java index 133998139a6..fbe1c6ee9ec 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/QuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/QuickFixTest.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.ide.ext.java.BaseTest; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.StringAsserts; import org.eclipse.che.jface.text.contentassist.ICompletionProposal; +import org.eclipse.che.plugin.java.server.che.BaseTest; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.StringAsserts; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.core.IBuffer; @@ -58,7 +58,7 @@ /** */ -public class QuickFixTest extends BaseTest { +public class QuickFixTest extends BaseTest { static { DefaultWorkingCopyOwner.setPrimaryBufferProvider(new WorkingCopyOwner() { diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ReorgQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ReorgQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ReorgQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ReorgQuickFixTest.java index 546b9da0fb0..e17f89e5f1e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ReorgQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ReorgQuickFixTest.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaModelMarker; import org.eclipse.jdt.core.IJavaProject; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ReturnTypeQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ReturnTypeQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ReturnTypeQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ReturnTypeQuickFixTest.java index fc0d67428c4..10acf1caaad 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/ReturnTypeQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/ReturnTypeQuickFixTest.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/TypeMismatchQuickFixTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/TypeMismatchQuickFixTests.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/TypeMismatchQuickFixTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/TypeMismatchQuickFixTests.java index 53ef7dde930..b214934ffa0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/TypeMismatchQuickFixTests.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/TypeMismatchQuickFixTests.java @@ -10,15 +10,15 @@ * Benjamin Muskalla - [quick fix] proposes wrong cast from Object to primitive int - https://bugs.eclipse.org/bugs/show_bug.cgi?id=100593 * Benjamin Muskalla - [quick fix] "Add exceptions to..." quickfix does nothing - https://bugs.eclipse.org/bugs/show_bug.cgi?id=107924 *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; -import org.eclipse.che.jdt.testplugin.TestOptions; import org.eclipse.che.jdt.util.JavaModelUtil; import org.eclipse.che.jface.text.contentassist.ICompletionProposal; -import org.eclipse.che.text.test.Accessor; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.test.Accessor; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/UnresolvedTypesQuickFixTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/UnresolvedTypesQuickFixTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/UnresolvedTypesQuickFixTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/UnresolvedTypesQuickFixTest.java index f0177912324..9a1c6018152 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/quickfix/UnresolvedTypesQuickFixTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/quickfix/UnresolvedTypesQuickFixTest.java @@ -9,10 +9,10 @@ * IBM Corporation - initial API and implementation * Rabea Gransberger - [quick fix] Fix several visibility issues - https://bugs.eclipse.org/394692 *******************************************************************************/ -package org.eclipse.che.jdt.quickfix; +package org.eclipse.che.plugin.java.server.jdt.quickfix; -import org.eclipse.che.jdt.testplugin.ProjectTestSetup; +import org.eclipse.che.plugin.java.server.jdt.testplugin.ProjectTestSetup; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; @@ -24,8 +24,8 @@ import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType; import org.eclipse.jdt.internal.ui.JavaPlugin; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/AbstractRefactoringTestSetup.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/AbstractRefactoringTestSetup.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/AbstractRefactoringTestSetup.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/AbstractRefactoringTestSetup.java index a226be17089..a9d079b183d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/AbstractRefactoringTestSetup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/AbstractRefactoringTestSetup.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/Java18Setup.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/Java18Setup.java similarity index 88% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/Java18Setup.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/Java18Setup.java index 5266e28a37d..54025c4b94d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/Java18Setup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/Java18Setup.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragmentRoot; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/MoveRefactoringSessionTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/MoveRefactoringSessionTest.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/MoveRefactoringSessionTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/MoveRefactoringSessionTest.java index bb05a3490d7..65562bcd084 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/MoveRefactoringSessionTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/MoveRefactoringSessionTest.java @@ -9,9 +9,8 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; -import org.eclipse.che.plugin.java.server.dto.DtoServerImpls; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeCreationResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangePreview; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.MoveSettings; @@ -19,6 +18,8 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringPreview; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ReorgDestination; +import org.eclipse.che.plugin.java.server.dto.DtoServerImpls; +import org.eclipse.che.plugin.java.server.refactoring.RefactoringManager; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; @@ -38,7 +39,7 @@ public class MoveRefactoringSessionTest extends RefactoringTest { private final RefactoringTestSetup setup; - private RefactoringManager manager; + private RefactoringManager manager; private IPackageFragment p1; public MoveRefactoringSessionTest() { diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/ParticipantTesting.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/ParticipantTesting.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/ParticipantTesting.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/ParticipantTesting.java index 5fc9d0ea216..f17c6a1356a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/ParticipantTesting.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/ParticipantTesting.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.che.ltk.core.refactoring.participants.CheRefactoringParticipantsRegistry; import org.eclipse.core.resources.IResource; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RefactoringTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RefactoringTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RefactoringTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RefactoringTest.java index e3c23d14bfe..fdc5dd4380b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RefactoringTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RefactoringTest.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; -import org.eclipse.che.ide.ext.java.BaseTest; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.che.BaseTest; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RefactoringTestSetup.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RefactoringTestSetup.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RefactoringTestSetup.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RefactoringTestSetup.java index 66db8ade4c3..49bc83777b3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RefactoringTestSetup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RefactoringTestSetup.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/Rename18Test.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/Rename18Test.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/Rename18Test.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/Rename18Test.java index bbc64b6d572..e852396cc8a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/Rename18Test.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/Rename18Test.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.runtime.NullProgressMonitor; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameMethodInInterfaceTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameMethodInInterfaceTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameMethodInInterfaceTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameMethodInInterfaceTest.java index 7763fb00941..05e5a91f47a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameMethodInInterfaceTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameMethodInInterfaceTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameNonPrivateFieldTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameNonPrivateFieldTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameNonPrivateFieldTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameNonPrivateFieldTest.java index 9eb8a340b58..126afe4fdbe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameNonPrivateFieldTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameNonPrivateFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePackageTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePackageTest.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePackageTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePackageTest.java index da912305b04..e2685455585 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePackageTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePackageTest.java @@ -8,9 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; +import junit.framework.TestCase; + +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -219,7 +221,7 @@ private RenamePackageProcessor helper2(String[] packageNames, String[][] package setFilePatterns(descriptor); Refactoring refactoring = createRefactoring(descriptor); RefactoringStatus result = performRefactoring(refactoring); - assertEquals("preconditions were supposed to pass", null, result); + TestCase.assertEquals("preconditions were supposed to pass", null, result); if (isRename) { ParticipantTesting.testRename(renameHandles, @@ -323,7 +325,7 @@ private void helperMultiProjects(IPackageFragmentRoot[] roots, String[][] packag setFilePatterns(descriptor); descriptor.setUpdateHierarchy(fRenameSubpackages); RefactoringStatus result = performRefactoring(descriptor); - assertEquals("preconditions were supposed to pass", null, result); + TestCase.assertEquals("preconditions were supposed to pass", null, result); assertTrue("package not renamed", !roots[0].getPackageFragment(packageNames[0][0]).exists()); IPackageFragment newPackage = roots[0].getPackageFragment(newPackageName); @@ -414,11 +416,11 @@ private void checkMappingUnchanged(IJavaElementMapper jm, IResourceMapper rm, Ob if (resOrJE instanceof IJavaElement) { IJavaElement javaElement = (IJavaElement)resOrJE; resOrJE = javaElement.getResource(); - assertEquals(javaElement, jm.getRefactoredJavaElement(javaElement)); + TestCase.assertEquals(javaElement, jm.getRefactoredJavaElement(javaElement)); } if (resOrJE instanceof IResource) { IResource resource = (IResource)resOrJE; - assertEquals(resource, rm.getRefactoredResource(resource)); + TestCase.assertEquals(resource, rm.getRefactoredResource(resource)); } } } @@ -430,13 +432,13 @@ private void checkMappingChanged(IJavaElementMapper jm, IResourceMapper rm, Obje Object changed = resOrJeToChanged[1]; if (resOrJE instanceof IJavaElement) { IJavaElement javaElement = (IJavaElement)resOrJE; - assertEquals(changed, jm.getRefactoredJavaElement(javaElement)); + TestCase.assertEquals(changed, jm.getRefactoredJavaElement(javaElement)); resOrJE = javaElement.getResource(); changed = ((IJavaElement)resOrJeToChanged[1]).getResource(); } if (resOrJE instanceof IResource) { IResource resource = (IResource)resOrJE; - assertEquals(changed, rm.getRefactoredResource(resource)); + TestCase.assertEquals(changed, rm.getRefactoredResource(resource)); } } } @@ -1160,7 +1162,7 @@ public void testReadOnly() throws Exception { if (attributes != null) attributes.setReadOnly(true); RefactoringStatus result = performRefactoring(createRefactoringDescriptor(thisPackage, newPackageName)); - assertEquals("preconditions were supposed to pass", null, result); + TestCase.assertEquals("preconditions were supposed to pass", null, result); assertTrue("package not renamed", !getRoot().getPackageFragment(packageNames[0]).exists()); IPackageFragment newPackage = getRoot().getPackageFragment(newPackageName); @@ -1425,9 +1427,9 @@ public void createAndPerform(int expectedSeverity) throws CoreException, Excepti descriptor.setUpdateHierarchy(fRenameSubpackages); RefactoringStatus result = performRefactoring(descriptor); if (expectedSeverity == RefactoringStatus.OK) - assertEquals("preconditions were supposed to pass", null, result); + TestCase.assertEquals("preconditions were supposed to pass", null, result); else - assertEquals(expectedSeverity, result.getSeverity()); + TestCase.assertEquals(expectedSeverity, result.getSeverity()); } public void execute() throws Exception { @@ -1509,11 +1511,11 @@ public void checkOriginalState() throws Exception { private void assertEqualSets(Collection expected, Collection actual) { HashSet expectedSet = new HashSet(expected); expectedSet.removeAll(actual); - assertEquals("not all expected in actual", "[]", expectedSet.toString()); + TestCase.assertEquals("not all expected in actual", "[]", expectedSet.toString()); HashSet actualSet = new HashSet(actual); actualSet.removeAll(expected); - assertEquals("not all actual in expected", "[]", actualSet.toString()); + TestCase.assertEquals("not all actual in expected", "[]", actualSet.toString()); } } } diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameParametersTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameParametersTest.java similarity index 94% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameParametersTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameParametersTest.java index 2d1169898e4..1aa6a60c8e9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameParametersTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameParametersTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IMethod; @@ -21,6 +21,7 @@ import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -28,10 +29,6 @@ import java.util.Iterator; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - public class RenameParametersTest extends RefactoringTest { private static final String REFACTORING_PATH = "RenameParameters/"; @@ -79,7 +76,7 @@ private void helper1(String[] newNames, String[] signature) throws Exception { ICompilationUnit cu = createCUfromTestFile(getPackageP(), true, true); IType classA = getType(cu, "A"); IMethod method = classA.getMethod("m", signature); - assertTrue("refactoring not available", RefactoringAvailabilityTester.isChangeSignatureAvailable(method)); + Assert.assertTrue("refactoring not available", RefactoringAvailabilityTester.isChangeSignatureAvailable(method)); ChangeSignatureProcessor processor = new ChangeSignatureProcessor(method); Refactoring ref = new ProcessorBasedRefactoring(processor); //ref.setUpdateReferences(updateReferences); @@ -88,13 +85,13 @@ private void helper1(String[] newNames, String[] signature) throws Exception { modifyInfos(processor.getParameterInfos(), newNames); RefactoringStatus result = performRefactoring(ref); - assertEquals("precondition was supposed to pass", null, result); + Assert.assertEquals("precondition was supposed to pass", null, result); IPackageFragment pack = (IPackageFragment)cu.getParent(); String newCuName = getSimpleTestFileName(true, true); ICompilationUnit newcu = pack.getCompilationUnit(newCuName); - assertTrue(newCuName + " does not exist", newcu.exists()); - assertEquals("invalid renaming", getFileContents(getTestFileName(true, false)).length(), newcu.getSource().length()); + Assert.assertTrue(newCuName + " does not exist", newcu.exists()); + Assert.assertEquals("invalid renaming", getFileContents(getTestFileName(true, false)).length(), newcu.getSource().length()); assertEqualLines("invalid renaming", getFileContents(getTestFileName(true, false)), newcu.getSource()); } @@ -102,13 +99,13 @@ private void helper2(String[] newNames, String[] signature) throws Exception { IType classA = getType(createCUfromTestFile(getPackageP(), false, false), "A"); //DebugUtils.dump("classA" + classA); IMethod method = classA.getMethod("m", signature); - assertTrue("refactoring not available", RefactoringAvailabilityTester.isChangeSignatureAvailable(method)); + Assert.assertTrue("refactoring not available", RefactoringAvailabilityTester.isChangeSignatureAvailable(method)); ChangeSignatureProcessor processor = new ChangeSignatureProcessor(method); Refactoring ref = new ProcessorBasedRefactoring(processor); modifyInfos(processor.getParameterInfos(), newNames); RefactoringStatus result = performRefactoring(ref); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } private void modifyInfos(List list, String[] newNames) { diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePrivateFieldTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePrivateFieldTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePrivateFieldTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePrivateFieldTest.java index 38ba89017fe..024e958d100 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePrivateFieldTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePrivateFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePrivateMethodTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePrivateMethodTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePrivateMethodTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePrivateMethodTest.java index bf37ba703d2..5b8f514d453 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenamePrivateMethodTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenamePrivateMethodTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameRefactoringTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameRefactoringTest.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameRefactoringTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameRefactoringTest.java index 5abc850fdb1..168dd26d0f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameRefactoringTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameRefactoringTest.java @@ -9,9 +9,8 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; -import org.eclipse.che.plugin.java.server.dto.DtoServerImpls; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeCreationResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangePreview; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.LinkedRenameRefactoringApply; @@ -21,6 +20,8 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameRefactoringSession; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameSettings; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ValidateNewName; +import org.eclipse.che.plugin.java.server.dto.DtoServerImpls; +import org.eclipse.che.plugin.java.server.refactoring.RefactoringManager; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; @@ -38,7 +39,7 @@ public class RenameRefactoringTest extends RefactoringTest { private final RefactoringTestSetup setup; - private RefactoringManager manager; + private RefactoringManager manager; public RenameRefactoringTest() { this.setup = new RefactoringTestSetup(); } diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameStaticMethodTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameStaticMethodTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameStaticMethodTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameStaticMethodTest.java index b8a90a94b36..603a385aba2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameStaticMethodTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameStaticMethodTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameTypeParameterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameTypeParameterTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameTypeParameterTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameTypeParameterTest.java index 2f9300da4f3..a9053a71906 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameTypeParameterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameTypeParameterTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameTypeTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameTypeTest.java similarity index 95% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameTypeTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameTypeTest.java index a49e528a869..af6b2bffa82 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameTypeTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameTypeTest.java @@ -8,11 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; + +import junit.framework.TestCase; import org.eclipse.che.api.project.server.notification.ProjectItemModifiedEvent; -import org.eclipse.che.ide.ext.java.BaseTest; import org.eclipse.che.jdt.core.resources.ResourceChangedEvent; +import org.eclipse.che.plugin.java.server.che.BaseTest; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -42,6 +44,7 @@ import org.eclipse.ltk.core.refactoring.participants.RenameArguments; import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; @@ -54,11 +57,7 @@ import java.util.ArrayList; import java.util.List; -import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; @Ignore public class RenameTypeTest extends RefactoringTest { @@ -106,7 +105,7 @@ private RenameJavaElementDescriptor createRefactoringDescriptor(IType type, Stri private void helper1_0(String className, String newName) throws Exception { IType classA= getClassFromTestFile(getPackageP(), className); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, newName)); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); if (fIsVerbose) { // DebugUtils.dump("result: " + result); } @@ -134,12 +133,12 @@ private String[] helperWithTextual(String oldCuName, String oldName, String newN Refactoring refactoring= createRefactoring(descriptor); assertEquals("was supposed to pass", null, performRefactoring(refactoring)); ICompilationUnit newcu= pack.getCompilationUnit(newCUName + ".java"); - assertTrue("cu " + newcu.getElementName()+ " does not exist", newcu.exists()); + TestCase.assertTrue("cu " + newcu.getElementName() + " does not exist", newcu.exists()); assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName(newCUName)), newcu.getSource()); INameUpdating nameUpdating= ((INameUpdating)refactoring.getAdapter(INameUpdating.class)); IType newElement = (IType) nameUpdating.getNewElement(); - assertTrue("new element does not exist:\n" + newElement.toString(), newElement.exists()); + TestCase.assertTrue("new element does not exist:\n" + newElement.toString(), newElement.exists()); checkMappers(refactoring, classA, newCUName + ".java", classAMembers); @@ -183,7 +182,7 @@ private void helper3(String oldName, String newName, boolean updateRef, boolean RefactoringDescriptor descriptor= initWithAllOptions(oldName, oldName, newName, updateRef, updateTextual, updateSimilar, nonJavaFiles, RenamingNameSuggestor.STRATEGY_EMBEDDED); Refactoring ref= createRefactoring(descriptor); RefactoringStatus status= performRefactoring(ref); - assertNull("was supposed to pass", status); + Assert.assertNull("was supposed to pass", status); checkResultInClass(newName); checkMappedSimilarElementsExist(ref); } @@ -193,7 +192,7 @@ private void helper3_inner(String oldName, String oldInnerName, String newName, CoreException, IOException, Exception { RefactoringDescriptor descriptor= initWithAllOptions(oldName, oldInnerName, innerNewName, updateRef, updateTextual, updateSimilar, nonJavaFiles, RenamingNameSuggestor.STRATEGY_EMBEDDED); Refactoring ref= createRefactoring(descriptor); - assertNull("was supposed to pass", performRefactoring(ref)); + Assert.assertNull("was supposed to pass", performRefactoring(ref)); checkResultInClass(newName); checkMappedSimilarElementsExist(ref); } @@ -208,8 +207,8 @@ private void checkMappedSimilarElementsExist(Refactoring ref) { IJavaElement element= similarElements[i]; if (! (element instanceof ILocalVariable)) { IJavaElement newElement= mapper.getRefactoredJavaElement(element); - assertTrue(newElement.exists()); - assertFalse(element.exists()); + TestCase.assertTrue(newElement.exists()); + Assert.assertFalse(element.exists()); } } @@ -219,14 +218,14 @@ private void helper3_fail(String oldName, String newName, boolean updateSimilar, JavaModelException, CoreException, IOException, Exception { RefactoringDescriptor descriptor= initWithAllOptions(oldName, oldName, newName, updateRef, updateTextual, updateSimilar, null, matchStrategy); - assertNotNull("was supposed to fail", performRefactoring(descriptor)); + Assert.assertNotNull("was supposed to fail", performRefactoring(descriptor)); } private void helper3_fail(String oldName, String newName, boolean updateSimilar, boolean updateTextual, boolean updateRef) throws JavaModelException, CoreException, IOException, Exception { RefactoringDescriptor descriptor= initWithAllOptions(oldName, oldName, newName, updateRef, updateTextual, updateSimilar, null, RenamingNameSuggestor.STRATEGY_SUFFIX); - assertNotNull("was supposed to fail", performRefactoring(descriptor)); + Assert.assertNotNull("was supposed to fail", performRefactoring(descriptor)); } private RefactoringDescriptor initWithAllOptions(String oldName, String innerOldName, String innerNewName, boolean updateReferences, boolean updateTextualMatches, boolean updateSimilar, String nonJavaFiles, int matchStrategy) throws Exception, @@ -252,7 +251,7 @@ private void setTheOptions(RenameJavaElementDescriptor descriptor, boolean updat private void checkResultInClass(String typeName) throws JavaModelException, IOException { ICompilationUnit newcu= getPackageP().getCompilationUnit(typeName + ".java"); - assertTrue("cu " + newcu.getElementName()+ " does not exist", newcu.exists()); + TestCase.assertTrue("cu " + newcu.getElementName() + " does not exist", newcu.exists()); assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName(typeName)), newcu.getSource()); } @@ -343,7 +342,7 @@ public void testWrongArg1() throws Exception { } catch (IllegalArgumentException exception) { result= exception; } - assertNotNull("empty name was supposed to trigger IAE", result); + Assert.assertNotNull("empty name was supposed to trigger IAE", result); } @Test @@ -370,7 +369,7 @@ public void testFail4() throws Exception { IType classA= getClassFromTestFile(getPackageP(), "A"); getClassFromTestFile(getPackageP(), "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -380,7 +379,7 @@ public void testFail5() throws Exception { getClassFromTestFile(getPackageP(), "C"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -390,7 +389,7 @@ public void testFail6() throws Exception { getClassFromTestFile(getPackageP(), "C"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -404,7 +403,7 @@ public void testFail8() throws Exception { getClassFromTestFile(getPackageP(), "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -456,7 +455,7 @@ public void testFail20() throws Exception { getClassFromTestFile(packageP2, "AA"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -465,7 +464,7 @@ public void testFail22() throws Exception { getClassFromTestFile(getPackageP(), "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -479,7 +478,7 @@ public void testFail23() throws Exception { getClassFromTestFile(packageP2, "Bogus"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -491,7 +490,7 @@ public void testFail24() throws Exception { getClassFromTestFile(packageP2, "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -503,7 +502,7 @@ public void testFail25() throws Exception { getClassFromTestFile(packageP2, "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -515,7 +514,7 @@ public void testFail26() throws Exception { getClassFromTestFile(packageP2, "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -527,7 +526,7 @@ public void testFail27() throws Exception { getClassFromTestFile(packageP2, "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -559,7 +558,7 @@ public void testFail31() throws Exception { getClassFromTestFile(packageP3, "C"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -569,7 +568,7 @@ public void testFail32() throws Exception { getClassFromTestFile(packageP1, "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -601,7 +600,7 @@ public void testFail37() throws Exception { getClassFromTestFile(getPackageP(), "B"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -916,7 +915,7 @@ public void testFail96() throws Exception { getClassFromTestFile(packageP2, "C"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "C")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -950,7 +949,7 @@ public void testFailRegression1GCRKMQ() throws Exception { IType myClass= getClassFromTestFile(myPackage, "Blinky"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(myClass, "B")); - assertNotNull("precondition was supposed to fail", result); + Assert.assertNotNull("precondition was supposed to fail", result); } @Test @@ -1354,7 +1353,7 @@ public void test65() throws Exception { IType classC= getClassFromTestFile(packageP2, "C"); RefactoringStatus result= performRefactoring(createRefactoringDescriptor(classA, "C")); - assertEquals("was supposed to pass", null, result); + Assert.assertEquals("was supposed to pass", null, result); assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("NewC")), packageP1.getCompilationUnit("C.java").getSource()); assertEqualLines("invalid renaming in B", getFileContents(getOutputTestFileName("B")), classB.getCompilationUnit().getSource()); @@ -1417,7 +1416,7 @@ private void helperQualifiedName(String oldName, String newName, String textFile IFile file= project.getFile(textFileName); file.create(new ByteArrayInputStream(content.getBytes()), true, null); ResourceChangedEvent - event = new ResourceChangedEvent(new File(BaseTest.class.getResource("/projects").getFile()),new ProjectItemModifiedEvent( + event = new ResourceChangedEvent(new File(BaseTest.class.getResource("/projects").getFile()), new ProjectItemModifiedEvent( ProjectItemModifiedEvent.EventType.CREATED, "projects",fProject.getElementName(),file.getFullPath().toOSString(), false)); JavaModelManager.getJavaModelManager().deltaState.resourceChanged(event); @@ -1677,7 +1676,7 @@ public void testSimilarElements11() throws Exception { RenameJavaElementDescriptor descriptor= createRefactoringDescriptor(someClass, newName); setTheOptions(descriptor, true, false, true, null, RenamingNameSuggestor.STRATEGY_EMBEDDED); RefactoringStatus status= performRefactoring(descriptor); - assertNull("was supposed to pass", status); + Assert.assertNull("was supposed to pass", status); checkResultInClass(newName); checkResultInClass("SomeOtherClass"); @@ -1788,7 +1787,7 @@ public void testSimilarElements22() throws Exception { RenameJavaElementDescriptor descriptor= createRefactoringDescriptor(someClass, newName); setTheOptions(descriptor, true, false, true, null, RenamingNameSuggestor.STRATEGY_EMBEDDED); RefactoringStatus status= performRefactoring(descriptor); - assertNull("was supposed to pass", status); + Assert.assertNull("was supposed to pass", status); checkResultInClass(newName); @@ -1840,7 +1839,7 @@ public void testSimilarElements23() throws Exception { RenameJavaElementDescriptor descriptor= createRefactoringDescriptor(someClass, newName); setTheOptions(descriptor, true, false, true, null, RenamingNameSuggestor.STRATEGY_EMBEDDED); RefactoringStatus status= performRefactoring(descriptor); - assertNull("was supposed to pass", status); + Assert.assertNull("was supposed to pass", status); checkResultInClass(newName); @@ -1861,7 +1860,7 @@ public void testSimilarElements24() throws Exception { setTheOptions(descriptor, true, false, true, null, RenamingNameSuggestor.STRATEGY_EMBEDDED); Refactoring ref= createRefactoring(descriptor); RefactoringStatus status= performRefactoring(ref); - assertNull("was supposed to pass", status); + Assert.assertNull("was supposed to pass", status); checkResultInClass("SomeNewClass"); @@ -1872,31 +1871,31 @@ private void checkMappers(Refactoring refactoring, IType type, String newCUName, RenameTypeProcessor rtp= (RenameTypeProcessor)((RenameRefactoring) refactoring).getProcessor(); ICompilationUnit newUnit= (ICompilationUnit)rtp.getRefactoredJavaElement(type.getCompilationUnit()); - assertTrue(newUnit.exists()); - assertTrue(newUnit.getElementName().equals(newCUName)); + TestCase.assertTrue(newUnit.exists()); + TestCase.assertTrue(newUnit.getElementName().equals(newCUName)); IFile newFile= (IFile)rtp.getRefactoredResource(type.getResource()); - assertTrue(newFile.exists()); - assertTrue(newFile.getName().equals(newCUName)); + TestCase.assertTrue(newFile.exists()); + TestCase.assertTrue(newFile.getName().equals(newCUName)); if ((type.getParent().getElementType() == IJavaElement.COMPILATION_UNIT) && type.getCompilationUnit().getElementName().equals(type.getElementName() + ".java")) { - assertFalse(type.getCompilationUnit().exists()); - assertFalse(type.getResource().exists()); + Assert.assertFalse(type.getCompilationUnit().exists()); + Assert.assertFalse(type.getResource().exists()); } IPackageFragment oldPackage= (IPackageFragment)type.getCompilationUnit().getParent(); IPackageFragment newPackage= (IPackageFragment)rtp.getRefactoredJavaElement(oldPackage); - assertEquals(oldPackage, newPackage); + Assert.assertEquals(oldPackage, newPackage); for (int i= 0; i < someClassMembers.length; i++) { IMember member= (IMember) someClassMembers[i]; IJavaElement refactoredMember= rtp.getRefactoredJavaElement(member); if (member instanceof IMethod && member.getElementName().equals(type.getElementName())) continue; // constructor - assertTrue(refactoredMember.exists()); - assertEquals(member.getElementName(), refactoredMember.getElementName()); - assertFalse(refactoredMember.equals(member)); + TestCase.assertTrue(refactoredMember.exists()); + Assert.assertEquals(member.getElementName(), refactoredMember.getElementName()); + Assert.assertFalse(refactoredMember.equals(member)); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameVirtualMethodInClassTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameVirtualMethodInClassTest.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameVirtualMethodInClassTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameVirtualMethodInClassTest.java index ab859340a3f..0b5c4ab323c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/RenameVirtualMethodInClassTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/RenameVirtualMethodInClassTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestCreateParticipantShared.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestCreateParticipantShared.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestCreateParticipantShared.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestCreateParticipantShared.java index 0db663be5a9..b2d29a9d3e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestCreateParticipantShared.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestCreateParticipantShared.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestCreateParticipantSingle.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestCreateParticipantSingle.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestCreateParticipantSingle.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestCreateParticipantSingle.java index f0381f2ab06..605396b5a49 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestCreateParticipantSingle.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestCreateParticipantSingle.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestDeleteParticipantShared.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestDeleteParticipantShared.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestDeleteParticipantShared.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestDeleteParticipantShared.java index 9dc0fc69c81..1148d5f714a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestDeleteParticipantShared.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestDeleteParticipantShared.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestDeleteParticipantSingle.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestDeleteParticipantSingle.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestDeleteParticipantSingle.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestDeleteParticipantSingle.java index cfde1d78b6e..9819333343d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestDeleteParticipantSingle.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestDeleteParticipantSingle.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestModelProvider.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestModelProvider.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestModelProvider.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestModelProvider.java index f72f6c10987..2cba16f618e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestModelProvider.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestModelProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestMoveParticipantShared.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestMoveParticipantShared.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestMoveParticipantShared.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestMoveParticipantShared.java index 04ed7c6c75b..915aa380579 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestMoveParticipantShared.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestMoveParticipantShared.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestMoveParticipantSingle.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestMoveParticipantSingle.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestMoveParticipantSingle.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestMoveParticipantSingle.java index c1fa4374ade..9ec44641d81 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestMoveParticipantSingle.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestMoveParticipantSingle.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestRenameParticipantShared.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestRenameParticipantShared.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestRenameParticipantShared.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestRenameParticipantShared.java index 0ab4ac29055..066ad7bbcf1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestRenameParticipantShared.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestRenameParticipantShared.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestRenameParticipantSingle.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestRenameParticipantSingle.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestRenameParticipantSingle.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestRenameParticipantSingle.java index 7e5addc8eeb..19006952381 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/TestRenameParticipantSingle.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/TestRenameParticipantSingle.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring; +package org.eclipse.che.plugin.java.server.jdt.refactoring; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/ccp/MockReorgQueries.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/ccp/MockReorgQueries.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/ccp/MockReorgQueries.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/ccp/MockReorgQueries.java index 99459c85fd2..a38d1c43b49 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/refactoring/ccp/MockReorgQueries.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/refactoring/ccp/MockReorgQueries.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.refactoring.ccp; +package org.eclipse.che.plugin.java.server.jdt.refactoring.ccp; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.OperationCanceledException; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/FindReferencesTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/FindReferencesTest.java similarity index 76% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/FindReferencesTest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/FindReferencesTest.java index 5a2b1925b3d..0869b4db021 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/FindReferencesTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/FindReferencesTest.java @@ -9,13 +9,15 @@ * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.search; +package org.eclipse.che.plugin.java.server.jdt.search; -import org.eclipse.che.ide.ext.java.BaseTest; import org.eclipse.che.ide.ext.java.shared.dto.model.CompilationUnit; import org.eclipse.che.ide.ext.java.shared.dto.model.PackageFragment; import org.eclipse.che.ide.ext.java.shared.dto.model.PackageFragmentRoot; import org.eclipse.che.ide.ext.java.shared.dto.search.FindUsagesResponse; +import org.eclipse.che.plugin.java.server.che.BaseTest; +import org.eclipse.che.plugin.java.server.search.SearchException; +import org.eclipse.che.plugin.java.server.search.SearchManager; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; @@ -25,14 +27,13 @@ import org.eclipse.jdt.internal.ui.search.JavaSearchQuery; import org.eclipse.jdt.internal.ui.search.JavaSearchResult; import org.eclipse.search.ui.ISearchResult; +import org.fest.assertions.Assertions; import org.junit.After; import org.junit.Before; import org.junit.Test; import java.util.List; -import static org.fest.assertions.Assertions.assertThat; - /** * @author Evgen Vidolob */ @@ -60,7 +61,7 @@ public void testFind() throws Exception { JavaSearchQuery query = SearchTestHelper.runMethodRefQuery("junit.framework.Test", "countTestCases", new String[0]); ISearchResult result = query.getSearchResult(); JavaSearchResult javaResult = ((JavaSearchResult)result); - assertThat(javaResult.getElements()).hasSize(9); + Assertions.assertThat(javaResult.getElements()).hasSize(9); } @Test @@ -87,7 +88,7 @@ public void testFind2() throws Exception { JavaSearchQuery query = SearchTestHelper.runTypeRefQuery("che.A"); ISearchResult result = query.getSearchResult(); JavaSearchResult javaResult = ((JavaSearchResult)result); - assertThat(javaResult.getElements()).hasSize(2); + Assertions.assertThat(javaResult.getElements()).hasSize(2); } @Test(expected = SearchException.class) @@ -139,35 +140,35 @@ public void testSearchManagerFindUsage() throws Exception { SearchManager manager = new SearchManager(); FindUsagesResponse response = manager.findUsage(aProject, "che.A", 26); - assertThat(response.getSearchElementLabel()).isEqualTo("A"); + Assertions.assertThat(response.getSearchElementLabel()).isEqualTo("A"); List projects = response.getProjects(); - assertThat(projects).isNotNull().isNotEmpty().hasSize(1); + Assertions.assertThat(projects).isNotNull().isNotEmpty().hasSize(1); String expectedProjectPath = JUnitSourceSetup.getProject().getPath().toOSString(); org.eclipse.che.ide.ext.java.shared.dto.model.JavaProject project = projects.get(0); - assertThat(project.getName()).isEqualTo(JUnitSourceSetup.PROJECT_NAME); - assertThat(project.getPath()).isEqualTo(expectedProjectPath); - assertThat(project.getPackageFragmentRoots()).isNotNull().isNotEmpty().hasSize(1); + Assertions.assertThat(project.getName()).isEqualTo(JUnitSourceSetup.PROJECT_NAME); + Assertions.assertThat(project.getPath()).isEqualTo(expectedProjectPath); + Assertions.assertThat(project.getPackageFragmentRoots()).isNotNull().isNotEmpty().hasSize(1); PackageFragmentRoot fragmentRoot = project.getPackageFragmentRoots().get(0); - assertThat(fragmentRoot.getElementName()).isEqualTo(JUnitSourceSetup.SRC_CONTAINER); - assertThat(fragmentRoot.getProjectPath()).isEqualTo(expectedProjectPath); - assertThat(fragmentRoot.getPackageFragments()).isNotNull().isNotEmpty().hasSize(1); + Assertions.assertThat(fragmentRoot.getElementName()).isEqualTo(JUnitSourceSetup.SRC_CONTAINER); + Assertions.assertThat(fragmentRoot.getProjectPath()).isEqualTo(expectedProjectPath); + Assertions.assertThat(fragmentRoot.getPackageFragments()).isNotNull().isNotEmpty().hasSize(1); PackageFragment fragment = fragmentRoot.getPackageFragments().get(0); - assertThat(fragment.getElementName()).isEqualTo("che"); - assertThat(fragment.getProjectPath()).isEqualTo(expectedProjectPath); - assertThat(fragment.getPath()).isEqualTo(expectedProjectPath + "/" + JUnitSourceSetup.SRC_CONTAINER + "/che"); - assertThat(fragment.getClassFiles()).isNotNull().isEmpty(); - assertThat(fragment.getCompilationUnits()).isNotNull().isNotEmpty().hasSize(1); + Assertions.assertThat(fragment.getElementName()).isEqualTo("che"); + Assertions.assertThat(fragment.getProjectPath()).isEqualTo(expectedProjectPath); + Assertions.assertThat(fragment.getPath()).isEqualTo(expectedProjectPath + "/" + JUnitSourceSetup.SRC_CONTAINER + "/che"); + Assertions.assertThat(fragment.getClassFiles()).isNotNull().isEmpty(); + Assertions.assertThat(fragment.getCompilationUnits()).isNotNull().isNotEmpty().hasSize(1); CompilationUnit compilationUnit = fragment.getCompilationUnits().get(0); - assertThat(compilationUnit.getElementName()).isEqualTo("B.java"); - assertThat(compilationUnit.getPath()).isEqualTo(expectedProjectPath + "/" + JUnitSourceSetup.SRC_CONTAINER + "/che/B.java"); - assertThat(compilationUnit.getImports()).hasSize(1); - assertThat(compilationUnit.getTypes()).hasSize(2); + Assertions.assertThat(compilationUnit.getElementName()).isEqualTo("B.java"); + Assertions.assertThat(compilationUnit.getPath()).isEqualTo(expectedProjectPath + "/" + JUnitSourceSetup.SRC_CONTAINER + "/che/B.java"); + Assertions.assertThat(compilationUnit.getImports()).hasSize(1); + Assertions.assertThat(compilationUnit.getTypes()).hasSize(2); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/JUnitSourceSetup.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/JUnitSourceSetup.java similarity index 93% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/JUnitSourceSetup.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/JUnitSourceSetup.java index 113173437bc..f1fd09a9861 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/JUnitSourceSetup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/JUnitSourceSetup.java @@ -8,10 +8,10 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.search; +package org.eclipse.che.plugin.java.server.jdt.search; -import org.eclipse.che.jdt.testplugin.JavaProjectHelper; -import org.eclipse.che.jdt.testplugin.TestOptions; +import org.eclipse.che.plugin.java.server.jdt.testplugin.JavaProjectHelper; +import org.eclipse.che.plugin.java.server.jdt.testplugin.TestOptions; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jdt.core.IJavaProject; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/SearchTestHelper.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/SearchTestHelper.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/SearchTestHelper.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/SearchTestHelper.java index 9b362337105..87ed48db85f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/search/SearchTestHelper.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/search/SearchTestHelper.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.search; +package org.eclipse.che.plugin.java.server.jdt.search; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IMethod; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/Java17ProjectTestSetup.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/Java17ProjectTestSetup.java similarity index 96% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/Java17ProjectTestSetup.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/Java17ProjectTestSetup.java index 93b75733732..3b0de732649 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/Java17ProjectTestSetup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/Java17ProjectTestSetup.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.testplugin; +package org.eclipse.che.plugin.java.server.jdt.testplugin; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.IProject; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/Java18ProjectTestSetup.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/Java18ProjectTestSetup.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/Java18ProjectTestSetup.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/Java18ProjectTestSetup.java index df2949b7c48..a2f9ef1f36c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/Java18ProjectTestSetup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/Java18ProjectTestSetup.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.testplugin; +package org.eclipse.che.plugin.java.server.jdt.testplugin; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.IProject; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/JavaProjectHelper.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/JavaProjectHelper.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/JavaProjectHelper.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/JavaProjectHelper.java index 8e36770c63c..6484b880a39 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/JavaProjectHelper.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/JavaProjectHelper.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation * Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 83258 [jar exporter] Deploy java application as executable jar *******************************************************************************/ -package org.eclipse.che.jdt.testplugin; +package org.eclipse.che.plugin.java.server.jdt.testplugin; import junit.framework.TestCase; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/ProjectTestSetup.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/ProjectTestSetup.java similarity index 97% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/ProjectTestSetup.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/ProjectTestSetup.java index 81ed3f258ed..c8832706f09 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/ProjectTestSetup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/ProjectTestSetup.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.testplugin; +package org.eclipse.che.plugin.java.server.jdt.testplugin; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jdt.core.JavaCore; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/StringAsserts.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/StringAsserts.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/StringAsserts.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/StringAsserts.java index 725302f4b6c..220b4d01f20 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/StringAsserts.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/StringAsserts.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.testplugin; +package org.eclipse.che.plugin.java.server.jdt.testplugin; import org.junit.Assert; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/TestOptions.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/TestOptions.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/TestOptions.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/TestOptions.java index 4bee756ff9b..b948391e24a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/TestOptions.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/TestOptions.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.testplugin; +package org.eclipse.che.plugin.java.server.jdt.testplugin; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/ZipFileStructureProvider.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/ZipFileStructureProvider.java similarity index 98% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/ZipFileStructureProvider.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/ZipFileStructureProvider.java index e38da7c86a8..db836d25c04 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/jdt/testplugin/ZipFileStructureProvider.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/jdt/testplugin/ZipFileStructureProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.jdt.testplugin; +package org.eclipse.che.plugin.java.server.jdt.testplugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/text/test/Accessor.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/test/Accessor.java similarity index 99% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/text/test/Accessor.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/test/Accessor.java index a1201b3a875..6836e8c41d7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/java/org/eclipse/che/text/test/Accessor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/java/org/eclipse/che/plugin/java/server/test/Accessor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.text.test; +package org.eclipse.che.plugin.java.server.test; import org.eclipse.core.runtime.Assert; diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test10/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test11/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test12/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test14/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test14/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test14/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test15/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test16/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test16/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test17/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test18/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test19/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test19/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test19/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test19/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test19/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test19/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test19/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test20/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test21/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test21/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test21/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test22/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test22/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test22/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test24/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test24/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test24/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test25/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test25/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test25/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test26/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test26/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test26/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test27/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test27/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test27/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test27/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test27/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test27/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test27/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test28/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test28/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test28/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test29/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test29/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test29/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test30/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test30/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test30/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test31/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test31/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test31/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test32/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test32/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test32/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test33/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test33/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test33/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test34/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test34/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test34/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test35/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test35/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test35/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test36/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test36/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test36/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test37/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test37/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test37/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test38/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test38/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test38/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test39/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test39/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test39/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test40/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test40/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test40/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test41/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test41/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test41/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test42/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test42/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test42/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test42/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test43/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test43/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test43/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test43/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test44/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test44/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test44/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test44/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test45/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test45/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test45/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test46/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test46/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test46/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test46/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test47/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test47/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test47/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test47/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test47/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test47/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test47/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test47/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test5/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test6/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/test7/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate02/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate02/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate02/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate02/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate02/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate02/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testDelegate02/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testDelegate02/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail16/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail16/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail16/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail19/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail19/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail19/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail21/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail21/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail21/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail22/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail22/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail22/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail23/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail23/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail23/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail24/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail24/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail24/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail25/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail25/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail25/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail26/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail26/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail26/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail27/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail27/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail27/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail28/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail28/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail28/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail29/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail29/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail29/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail30/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail30/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail30/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail31/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail31/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail31/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail32/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail32/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail32/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail33/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail33/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail33/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail34/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail34/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail34/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail35/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail35/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail35/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail36/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail36/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail36/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail37/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail37/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail37/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail38/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail38/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail38/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail39/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail39/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail39/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail40/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail40/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail40/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail41/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail41/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail41/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail42/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail42/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail42/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail42/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail43/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail43/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail43/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail43/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail44/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail44/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail44/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail44/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail45/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail45/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail45/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testFail9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testGenerics01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testGenerics01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testGenerics01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testGenerics01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testGenerics01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testGenerics01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameMethodInInterface/testGenerics01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testGenerics01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test10/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test11/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test12/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test13/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test14/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test15/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test16/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test16/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test17/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test18/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test19/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test19/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test19/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test20/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test21/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test21/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test21/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test22/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test22/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test22/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test23/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test23/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test23/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test5/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test6/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test7/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test8/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/test9/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testAnnotation2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testBug5821/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testBug5821/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testBug5821/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testBug5821/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testBug5821/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testBug5821/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testBug5821/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testBug5821/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate02/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate02/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate02/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate02/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate02/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate02/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate02/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate02/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate03/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate03/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate03/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate03/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate03/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate03/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testDelegate03/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testDelegate03/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumConst/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumConst/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testFail9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testGenerics4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/messages.properties b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/messages.properties similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/messages.properties rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/messages.properties diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/messages.properties b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/messages.properties similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/messages.properties rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/messages.properties diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameNonPrivateField/testStaticImport/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testStaticImport/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test0/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test0/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test0/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/out/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test0/out/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/out/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test1/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test1/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test1/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/out/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test1/out/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/out/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/in/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/fred/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/in/fred/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/fred/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/out/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/fred/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/out/fred/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/fred/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test2/out/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/in/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/fred/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/in/fred/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/fred/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/in/r/r/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/r/r/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/in/r/r/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/r/r/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/out/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/out/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/out/r/r/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/r/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test3/out/r/r/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/r/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/in/Textfile.txt b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/Textfile.txt similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/in/Textfile.txt rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/Textfile.txt diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/in/r/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/out/Textfile.txt b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/Textfile.txt similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/out/Textfile.txt rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/Textfile.txt diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/out/q/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/q/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/out/q/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/q/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/out/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test4/out/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test5/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test5/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test5/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/out/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test5/out/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/out/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test6/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test6/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test6/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/out/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test6/out/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/out/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/in/r/s/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/s/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/in/r/s/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/s/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/out/q/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/q/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/out/q/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/q/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/out/r/s/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/r/s/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test7/out/r/s/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/r/s/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test8/in/java/lang/reflect/Klass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test8/in/java/lang/reflect/Klass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test8/in/java/lang/reflect/Klass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test8/in/java/lang/reflect/Klass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test8/out/nonjava/Klass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test8/out/nonjava/Klass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/test8/out/nonjava/Klass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test8/out/nonjava/Klass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail0/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail0/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail0/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail0/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail10/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail10/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail3/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail3/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail3/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail3/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail4/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail4/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail4/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail4/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail5/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail5/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail5/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail5/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail6/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail6/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail6/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail6/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail7/in/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail7/in/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail7/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail7/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail8/in/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail8/in/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail8/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail8/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail9/in/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail9/in/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail9/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testFail9/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/in/my/MyA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/in/my/MyA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/in/my/MyA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/in/my/MyA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/in/my/a/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/in/my/a/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/in/my/a/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/in/my/a/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/in/my/b/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/in/my/b/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/in/my/b/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/in/my/b/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/out/your/MyA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/out/your/MyA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/out/your/MyA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/out/your/MyA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/out/your/a/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/out/your/a/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/out/your/a/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/out/your/a/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/out/your/b/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/out/your/b/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical01/out/your/b/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical01/out/your/b/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testPackageRenameWithResource3/in/my/pack/Textfile.txt b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testPackageRenameWithResource3/in/my/pack/Textfile.txt similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testPackageRenameWithResource3/in/my/pack/Textfile.txt rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testPackageRenameWithResource3/in/my/pack/Textfile.txt diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testPackageRenameWithResource3/out/my/Textfile.txt b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testPackageRenameWithResource3/out/my/Textfile.txt similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testPackageRenameWithResource3/out/my/Textfile.txt rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testPackageRenameWithResource3/out/my/Textfile.txt diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testReadOnly/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/in/r/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testReadOnly/in/r/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/in/r/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/in/s1/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/in/s1/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/in/s1/j/l/S.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/j/l/S.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/in/s1/j/l/S.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/j/l/S.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/out/s1/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/out/s1/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/out/s1/java/lang/S.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/java/lang/S.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStatic1/out/s1/java/lang/S.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/java/lang/S.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcPrg/p/p/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcPrg/p/p/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcPrg/p/p/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcPrg/p/p/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/tests/AllTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/tests/AllTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/tests/AllTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/in/srcTest/tests/AllTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcPrg/q/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcPrg/q/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcPrg/q/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcPrg/q/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/p/p/ATest.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/p/p/ATest.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/p/p/ATest.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/p/p/ATest.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStaticMultiRoots1/out/srcTest/tests/AllTests.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test0_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test0_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test0_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test0_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test10_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test10_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test10_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test10_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test11_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test11_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test11_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test11_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test12_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test12_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test12_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test12_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test13_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test13_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test13_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test13_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test14_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test14_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test14_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test14_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test15_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test15_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test15_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test15_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test16_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test16_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test16_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test16_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test17_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test17_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test17_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test17_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test18_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test18_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test18_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test18_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test19_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test19_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test19_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test19_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test1_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test1_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test1_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test1_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test20_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test20_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test20_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test20_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test21_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test21_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test21_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test21_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test22_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test22_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test22_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test22_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test23_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test23_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test23_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test23_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test24_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test24_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test24_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test24_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test25_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test25_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test25_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test25_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test26_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test26_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test26_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test26_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test27_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test27_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test27_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test27_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test28_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test28_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test28_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test28_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test29_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test29_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test29_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test29_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test2_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test2_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test2_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test2_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test30_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test30_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test30_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test30_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test31_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test31_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test31_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test31_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test32_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test32_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test32_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test32_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test33_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test33_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test33_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test33_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test34_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test34_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test34_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test34_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test35_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test35_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test35_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test35_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test36_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test36_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test36_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test36_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test3_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test3_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test3_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test3_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test4_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test4_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test4_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test4_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test5_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test5_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test5_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test5_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test6_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test6_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test6_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test6_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test7_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test7_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test7_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test7_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test8_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test8_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test8_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test8_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test9_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_in.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test9_in.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_in.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test9_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_out.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/canRename/A_test9_out.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_out.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail0.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail0.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail0.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail0.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail1.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail1.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail1.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail1.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail10.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail10.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail10.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail10.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail11.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail11.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail11.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail11.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail12.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail12.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail12.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail12.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail13.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail13.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail13.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail13.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail14.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail14.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail14.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail14.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail15.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail15.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail15.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail15.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail16.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail16.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail16.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail16.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail17.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail17.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail17.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail17.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail18.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail18.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail18.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail18.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail19.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail19.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail19.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail19.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail20.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail20.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail20.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail20.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail21.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail21.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail21.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail21.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail3.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail3.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail3.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail3.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail4.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail4.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail4.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail4.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail5.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail5.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail5.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail5.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail6.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail6.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail6.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail6.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail7.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail7.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail7.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail7.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail8.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail8.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail8.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail8.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail9.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail9.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/A_testFail9.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail9.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/a.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/a.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameParameters/cannotRename/a.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/a.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test10/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test10/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test10/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test11/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test11/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test11/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test5/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test6/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test7/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test8/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/test9/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testFail9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testUnicode01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testUnicode01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testUnicode01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateField/testUnicode01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test10/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test11/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test12/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test13/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test14/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test15/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test16/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test16/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test17/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test18/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test20/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test23/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test23/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test23/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test24/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test24/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test24/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test25/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test25/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test25/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test25/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test25/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test25/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test25/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test26/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test26/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test26/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test27/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test27/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/test27/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testDelegate01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testDelegate01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testDelegate01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testDelegate01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testDelegate01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testDelegate01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testDelegate01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testDelegate01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenamePrivateMethod/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test10/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test11/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test5/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test5/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test5/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test6/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test7/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test8/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/test9/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testDelegate01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testDelegate01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testDelegate01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testDelegate01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testDelegate01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testDelegate01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testDelegate01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testDelegate01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testFail8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport1/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport2/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport2/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testUnicode01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testUnicode01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testUnicode01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testUnicode01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testUnicode01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testUnicode01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameStaticMethod/testUnicode01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testUnicode01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testLambda3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethod2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethodReference0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethodReference0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethodReference0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTests18/testMethodReference0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test0/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test0/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test1/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test10/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test10/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/in/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/AA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/in/AA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/AA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/out/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/AA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/out/AA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/AA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test11/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test12/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test12/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test13/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test13/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test14/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test14/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test15/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test15/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test16/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test16/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test16/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test17/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test17/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test18/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test18/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test19/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test19/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test19/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test19/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test19/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test19/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test19/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test2/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test2/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test20/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test20/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test20/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test20/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test21/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test21/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test21/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test21/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test21/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test21/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test21/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test22/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test22/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test22/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test22/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test22/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test22/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test22/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test23/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test23/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test23/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test23/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test23/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test23/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test23/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test24/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test24/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test24/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test24/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test24/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test24/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test24/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test25/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test25/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test25/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test25/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test25/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test25/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test25/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test26/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test26/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test26/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test27/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test27/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test27/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test27/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test27/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test27/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test27/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test28/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test28/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test28/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test28/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test28/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test28/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test28/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test29/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test3/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test3/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/in/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/AA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/in/AA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/AA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/out/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/AA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/out/AA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/AA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test30/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/in/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/AA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/in/AA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/AA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/out/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/AA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/out/AA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/AA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test31/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test32/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test32/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test32/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test33/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test33/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test33/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test33/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test33/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test33/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test33/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test34/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test34/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test34/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test35/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test35/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test35/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test36/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test36/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test36/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test37/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test37/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test37/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test38/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test38/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test38/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test39/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test39/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test39/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test4/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test4/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test4/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test4/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test40/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test40/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test40/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test41/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test41/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test41/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test42/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test42/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test42/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test42/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test43/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test43/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test43/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test43/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test44/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test44/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test44/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test44/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test45/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test45/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test45/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test46/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test47/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test47/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test47/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test47/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test48/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test48/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test48/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test48/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test49/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test49/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test49/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test49/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test5/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test5/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test50/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test50/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test50/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test50/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test51/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test52/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test52/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test52/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test52/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test53/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test53/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test53/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test53/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test54/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test54/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test54/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test54/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test55/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test55/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test55/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test55/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/in/default/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/default/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/in/default/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/default/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/out/default/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/default/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test56/out/default/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/default/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test57/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test57/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test57/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test57/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test57/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test57/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test57/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test57/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test58/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test58/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test58/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test58/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test59/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test59/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test59/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test59/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test6/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test6/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test60/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test60/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test60/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test60/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test60/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test60/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test60/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test60/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test61/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test61/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test61/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test61/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test61/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test61/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test61/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test61/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test62/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test62/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test62/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test62/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test62/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test62/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test62/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test62/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/in/anotherp/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/in/anotherp/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/in/anotherp/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/in/anotherp/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/out/anotherp/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/out/anotherp/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test63/out/anotherp/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test63/out/anotherp/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/in/p2/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/in/p2/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/in/p2/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/in/p2/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/out/p2/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/out/p2/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test64/out/p2/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test64/out/p2/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/out/NewC.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/out/NewC.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test65/out/NewC.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test65/out/NewC.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test66/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test66/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test66/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test66/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test66/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test66/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test66/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test66/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test7/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test7/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test8/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test8/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test9/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/test9/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation1/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation2/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation2/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testAnnotation3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/in/p2/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/p2/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/in/p2/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/p2/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/out/p2/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/p2/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum1/out/p2/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/p2/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum2/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum2/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum2/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum2/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/in/Enumbered.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/in/Enumbered.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/in/Enumbered.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/in/Enumbered.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/out/Enumbered.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/out/Enumbered.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum3/out/Enumbered.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum3/out/Enumbered.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum5/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum5/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testEnum5/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum5/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail00/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail00/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail00/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail00/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail02/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail02/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail02/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail02/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail03/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail03/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail03/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail03/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail04/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail04/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail04/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail04/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail16/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail16/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail16/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail19/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail19/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail19/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail20/in/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/AA.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail20/in/AA.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/AA.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail21/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail21/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail21/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail22/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail22/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail22/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail23/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail23/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail23/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail23/in/Bogus.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/Bogus.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail23/in/Bogus.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/Bogus.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail24/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail24/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail24/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail25/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail25/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail25/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail26/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail26/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail26/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail27/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail27/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail27/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail28/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail28/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail28/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail29/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail29/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail29/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail30/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail30/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail30/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail31/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail31/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail31/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail31/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail31/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail32/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail32/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail32/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail33/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail33/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail33/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail34/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail34/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail34/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail35/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail35/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail35/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail36/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail36/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail36/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail37/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail37/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail37/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail38/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail38/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail38/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail39/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail39/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail39/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail4/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail4/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail40/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail40/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail40/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail41/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail41/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail41/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail42/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail42/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail42/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail42/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail43/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail43/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail43/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail43/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail44/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail44/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail44/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail44/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail45/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail45/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail45/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail46/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail46/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail46/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail46/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail47/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail47/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail47/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail47/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail48/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail48/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail48/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail48/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail49/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail49/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail49/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail49/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail5/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail5/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail5/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail5/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail50/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail50/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail50/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail50/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail51/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail51/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail51/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail51/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail52/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail52/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail52/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail52/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail53/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail53/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail53/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail53/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail54/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail54/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail54/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail54/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail55/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail55/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail55/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail55/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail56/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail56/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail56/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail56/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail57/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail57/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail57/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail57/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail58/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail58/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail58/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail58/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail59/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail59/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail59/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail59/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail6/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail6/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail6/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail6/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail60/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail60/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail60/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail60/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail61/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail61/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail61/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail61/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail62/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail62/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail62/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail62/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail63/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail63/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail63/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail63/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail64/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail64/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail64/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail64/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail65/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail65/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail65/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail65/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail66/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail66/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail66/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail66/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail67/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail67/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail67/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail67/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail68/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail68/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail68/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail68/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail69/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail69/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail69/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail69/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail70/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail70/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail70/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail70/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail71/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail71/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail71/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail71/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail72/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail72/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail72/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail72/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail73/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail73/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail73/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail73/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail74/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail74/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail74/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail74/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail75/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail75/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail75/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail75/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail76/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail76/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail76/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail76/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail77/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail77/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail77/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail77/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail78/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail78/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail78/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail78/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail79/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail79/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail79/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail79/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail8/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail8/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail80/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail80/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail80/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail80/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail81/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail81/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail81/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail81/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail82/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail82/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail82/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail82/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail83/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail83/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail83/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail83/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail84/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail84/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail84/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail84/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail85/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail85/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail85/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail85/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail86/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail86/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail86/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail86/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail87/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail87/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail87/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail87/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail88/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail88/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail88/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail88/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail89/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail89/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail89/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail89/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail90/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail90/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail90/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail90/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail91/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail91/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail91/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail91/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail92/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail92/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail92/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail92/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail93/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail93/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail93/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail93/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail94/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail94/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail94/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail94/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail95/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail95/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail95/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail95/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail96/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail96/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail96/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail96/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail96/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail96/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail96/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail96/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail96/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail96/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFail96/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail96/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics1/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics1/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics1/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics2/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics2/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics2/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics2/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics3/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics3/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics3/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics3/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics4/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics4/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testGenerics4/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testGenerics4/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalInnerClass/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalInnerClass/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalInnerClass/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalInnerClass/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testIllegalTypeName9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testNoOp/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testNoOp/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testNoOp/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testNoOp/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/in/build.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/build.xml similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/in/build.xml rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/build.xml diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/out/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/out/build.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/build.xml similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName1/out/build.xml rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/build.xml diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/in/Transient.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/Transient.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/in/Transient.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/Transient.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/in/mapping.hbm.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/mapping.hbm.xml similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/in/mapping.hbm.xml rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/mapping.hbm.xml diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/out/mapping.hbm.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/mapping.hbm.xml similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testQualifiedName2/out/mapping.hbm.xml rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/mapping.hbm.xml diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements00/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements00/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements00/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements00/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements00/out/SomeClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements00/out/SomeClass2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements00/out/SomeClass2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements00/out/SomeClass2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements01/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements01/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements01/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements01/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements02/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements02/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements02/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements02/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements03/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements03/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements03/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements03/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements03/out/SomeClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements03/out/SomeClass2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements03/out/SomeClass2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements03/out/SomeClass2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/in/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/in/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/in/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/in/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/out/SomeClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/out/SomeClass2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/out/SomeClass2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/out/SomeClass2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/out/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/out/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements04/out/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements04/out/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/in/test.html b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/in/test.html similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/in/test.html rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/in/test.html diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/out/SomeDifferentClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/out/SomeDifferentClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/out/SomeDifferentClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/out/SomeDifferentClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/out/test.html b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/out/test.html similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements05/out/test.html rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements05/out/test.html diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/in/SomeNearlyIdenticalClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/in/SomeNearlyIdenticalClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/in/SomeNearlyIdenticalClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/in/SomeNearlyIdenticalClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/out/SomeNearlyIdenticalClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/out/SomeNearlyIdenticalClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/out/SomeNearlyIdenticalClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/out/SomeNearlyIdenticalClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/out/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/out/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements06/out/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements06/out/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements07/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements07/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements07/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements07/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements07/out/SomeDiffClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements07/out/SomeDiffClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements07/out/SomeDiffClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements07/out/SomeDiffClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements08/in/ISomeIf.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements08/in/ISomeIf.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements08/in/ISomeIf.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements08/in/ISomeIf.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements08/out/ISomeIf2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements08/out/ISomeIf2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements08/out/ISomeIf2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements08/out/ISomeIf2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/in/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/in/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/in/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/in/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/out/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/out/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/out/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/out/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/out/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/out/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements09/out/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements09/out/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/in/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/in/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/in/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/in/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/out/SomeClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/out/SomeClass2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/out/SomeClass2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/out/SomeClass2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/out/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/out/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements10/out/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements10/out/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/in/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/in/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/in/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/in/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/out/SomeNewClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/out/SomeNewClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/out/SomeNewClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/out/SomeNewClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/out/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/out/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements11/out/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements11/out/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements12/in/SomeFieldClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements12/in/SomeFieldClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements12/in/SomeFieldClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements12/in/SomeFieldClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements12/out/SomeOtherFieldClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements12/out/SomeOtherFieldClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements12/out/SomeOtherFieldClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements12/out/SomeOtherFieldClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements13/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements13/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements13/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements13/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements13/out/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements13/out/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements13/out/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements13/out/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements14/in/SomeClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements14/in/SomeClass2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements14/in/SomeClass2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements14/in/SomeClass2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements14/out/SomeOtherClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements14/out/SomeOtherClass2.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements14/out/SomeOtherClass2.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements14/out/SomeOtherClass2.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements15/in/SomeClass3.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements15/in/SomeClass3.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements15/in/SomeClass3.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements15/in/SomeClass3.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements15/out/SomeOtherClass3.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements15/out/SomeOtherClass3.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements15/out/SomeOtherClass3.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements15/out/SomeOtherClass3.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements16/in/SomeClass4.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements16/in/SomeClass4.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements16/in/SomeClass4.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements16/in/SomeClass4.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements16/out/SomeOtherClass4.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements16/out/SomeOtherClass4.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements16/out/SomeOtherClass4.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements16/out/SomeOtherClass4.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements17/in/SomeClass6.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements17/in/SomeClass6.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements17/in/SomeClass6.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements17/in/SomeClass6.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements18/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements18/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements18/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements18/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements18/out/SomeOtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements18/out/SomeOtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements18/out/SomeOtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements18/out/SomeOtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements19/in/ThreeHunkClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements19/in/ThreeHunkClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements19/in/ThreeHunkClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements19/in/ThreeHunkClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/in/OtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/in/OtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/in/OtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/in/OtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/in/OverriddenMethodClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/in/OverriddenMethodClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/in/OverriddenMethodClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/in/OverriddenMethodClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/out/OtherClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/out/OtherClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/out/OtherClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/out/OtherClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/out/ThirdClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/out/ThirdClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements20/out/ThirdClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements20/out/ThirdClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/in/SomeClassSecond.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/in/SomeClassSecond.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/in/SomeClassSecond.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/in/SomeClassSecond.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/out/SomeClassSecond.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/out/SomeClassSecond.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/out/SomeClassSecond.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/out/SomeClassSecond.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/out/SomeNewClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/out/SomeNewClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements21/out/SomeNewClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements21/out/SomeNewClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements22/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements22/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements22/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements22/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements22/out/SomeNewClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements22/out/SomeNewClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements22/out/SomeNewClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements22/out/SomeNewClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements23/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements23/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements23/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements23/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements23/out/SomeNewClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements23/out/SomeNewClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements23/out/SomeNewClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements23/out/SomeNewClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements24/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements24/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements24/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements24/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements24/out/SomeNewClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements24/out/SomeNewClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements24/out/SomeNewClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements24/out/SomeNewClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements25/in/ScrewUp.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements25/in/ScrewUp.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements25/in/ScrewUp.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements25/in/ScrewUp.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements25/out/ScrewDown.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements25/out/ScrewDown.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements25/out/ScrewDown.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements25/out/ScrewDown.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements26/in/ScrewUp.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements26/in/ScrewUp.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements26/in/ScrewUp.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements26/in/ScrewUp.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements26/out/ScrewDown.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements26/out/ScrewDown.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements26/out/ScrewDown.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements26/out/ScrewDown.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements27/in/ScrewUp.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements27/in/ScrewUp.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements27/in/ScrewUp.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements27/in/ScrewUp.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements27/out/ScrewDown.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements27/out/ScrewDown.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements27/out/ScrewDown.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements27/out/ScrewDown.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements28/in/ScrewUp.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements28/in/ScrewUp.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements28/in/ScrewUp.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements28/in/ScrewUp.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements28/out/ScrewDown.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements28/out/ScrewDown.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements28/out/ScrewDown.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements28/out/ScrewDown.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements29/in/ScrewUp.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements29/in/ScrewUp.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements29/in/ScrewUp.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements29/in/ScrewUp.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements29/out/ScrewDown.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements29/out/ScrewDown.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements29/out/ScrewDown.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements29/out/ScrewDown.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements30/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements30/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements30/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements30/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements30/out/SomeNewClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements30/out/SomeNewClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements30/out/SomeNewClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements30/out/SomeNewClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements31/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements31/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements31/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements31/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements31/out/SomeDiffClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements31/out/SomeDiffClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements31/out/SomeDiffClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements31/out/SomeDiffClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements32/in/SomeClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements32/in/SomeClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements32/in/SomeClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements32/in/SomeClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements33/in/Why.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements33/in/Why.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements33/in/Why.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements33/in/Why.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements33/out/WhyNot.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements33/out/WhyNot.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements33/out/WhyNot.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements33/out/WhyNot.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements34/in/Try.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/in/Try.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements34/in/Try.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/in/Try.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements34/out/Bla.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/out/Bla.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testSimilarElements34/out/Bla.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/out/Bla.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testUnicode01/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testUnicode01/in/B.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testUnicode01/in/B.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testUnicode01/in/B.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testUnicode01/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testUnicode01/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testUnicode01/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testUnicode01/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameType/testWrongArg4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test10/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test11/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test12/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test13/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test14/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test14/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test14/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test15/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test15/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test15/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test5/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test6/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test7/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test8/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/test9/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameTypeParameter/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test38/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test38/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test38/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test38/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test38/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test38/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test38/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test40/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test40/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test40/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test40/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test40/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/test40/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test40/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate01/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate01/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate01/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate01/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate01/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate01/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate02/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate02/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate02/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate02/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate02/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate02/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate02/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate02/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate03/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate03/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate03/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate03/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate03/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate03/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testDelegate03/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testDelegate03/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnum3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnum3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnumFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnumFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testEnumFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testEnumFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail21/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail21/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail21/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail30/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail30/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail30/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail38/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail38/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail38/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail39/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail39/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail39/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics5/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics5/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics5/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics5/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testGenerics5/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics5/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testLocal0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testLocal0/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testLocal0/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testLocal0/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testLocal0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testLocal0/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testLocal0/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testLocal0/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs1/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs1/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs1/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs1/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs1/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs1/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/.codenvy/project.json b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/.codenvy/project.json similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/.codenvy/project.json rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/.codenvy/project.json diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/.codenvy/classpath b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/.codenvy/classpath similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/.codenvy/classpath rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/.codenvy/classpath diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/.codenvy/project.json b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/.codenvy/project.json similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/.codenvy/project.json rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/.codenvy/project.json diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/pom.xml similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/pom.xml rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/pom.xml diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/.codenvy/classpath b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/.codenvy/classpath similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/.codenvy/classpath rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/.codenvy/classpath diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/.codenvy/project.json b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/.codenvy/project.json similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/.codenvy/project.json rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/.codenvy/project.json diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/pom.xml similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/pom.xml rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/pom.xml diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/.codenvy/classpath b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/.codenvy/classpath similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/.codenvy/classpath rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/.codenvy/classpath diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/.codenvy/classpath.maven b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/.codenvy/classpath.maven similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/.codenvy/classpath.maven rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/.codenvy/classpath.maven diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/.codenvy/project.json b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/.codenvy/project.json similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/.codenvy/project.json rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/.codenvy/project.json diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/pom.xml similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/pom.xml rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/pom.xml diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/p1/X.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/p1/X.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/p1/X.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/p1/X.java diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/zzz/Z.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/zzz/Z.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/projects/test/src/main/java/zzz/Z.java rename to plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/zzz/Z.java diff --git a/plugins/pom.xml b/plugins/pom.xml index 9db12eb5d18..653d4939d70 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -31,9 +31,9 @@ plugin-web plugin-machine plugin-debugger - plugin-maven plugin-java plugin-java-debugger + plugin-maven plugin-gdb plugin-sdk plugin-orion diff --git a/pom.xml b/pom.xml index 8a7fce2bbd0..60dce021582 100644 --- a/pom.xml +++ b/pom.xml @@ -323,11 +323,6 @@ zip linux_arm7 - - org.eclipse.che.plugin - che-jdt-ext-machine - ${project.version} - org.eclipse.che.plugin che-plugin-cpp-lang-ide